diff options
| author | Hans Hagen <pragma@wxs.nl> | 2012-09-25 21:44:00 +0200 |
|---|---|---|
| committer | Hans Hagen <pragma@wxs.nl> | 2012-09-25 21:44:00 +0200 |
| commit | 55ce9de27314a53bb5583cf482a2c4c64e3d1f76 (patch) | |
| tree | 54918f8483de1304d9d908ff9961399b4850fcad /scripts | |
| parent | bd88b34201a32e8c936f518336016f0abae49a09 (diff) | |
| download | context-55ce9de27314a53bb5583cf482a2c4c64e3d1f76.tar.gz | |
beta 2012.09.25 21:44
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/context/lua/mtxrun.lua | 7 | ||||
| -rw-r--r-- | scripts/context/stubs/mswin/mtxrun.lua | 7 | ||||
| -rwxr-xr-x | scripts/context/stubs/unix/mtxrun | 7 |
3 files changed, 18 insertions, 3 deletions
diff --git a/scripts/context/lua/mtxrun.lua b/scripts/context/lua/mtxrun.lua index 360a99fdc..0d8f3ac50 100644 --- a/scripts/context/lua/mtxrun.lua +++ b/scripts/context/lua/mtxrun.lua @@ -4133,7 +4133,9 @@ function boolean.tonumber(b) end function toboolean(str,tolerant) - if tolerant then + if str == true or str == false then + return str + elseif tolerant then local tstr = type(str) if tstr == "string" then return str == "true" or str == "yes" or str == "on" or str == "1" or str == "t" @@ -4894,6 +4896,9 @@ function table.fastserialize(t,prefix) end function table.deserialize(str) + if not str or str == "" then + return + end local code = loadstring(str) if not code then return diff --git a/scripts/context/stubs/mswin/mtxrun.lua b/scripts/context/stubs/mswin/mtxrun.lua index 360a99fdc..0d8f3ac50 100644 --- a/scripts/context/stubs/mswin/mtxrun.lua +++ b/scripts/context/stubs/mswin/mtxrun.lua @@ -4133,7 +4133,9 @@ function boolean.tonumber(b) end function toboolean(str,tolerant) - if tolerant then + if str == true or str == false then + return str + elseif tolerant then local tstr = type(str) if tstr == "string" then return str == "true" or str == "yes" or str == "on" or str == "1" or str == "t" @@ -4894,6 +4896,9 @@ function table.fastserialize(t,prefix) end function table.deserialize(str) + if not str or str == "" then + return + end local code = loadstring(str) if not code then return diff --git a/scripts/context/stubs/unix/mtxrun b/scripts/context/stubs/unix/mtxrun index 360a99fdc..0d8f3ac50 100755 --- a/scripts/context/stubs/unix/mtxrun +++ b/scripts/context/stubs/unix/mtxrun @@ -4133,7 +4133,9 @@ function boolean.tonumber(b) end function toboolean(str,tolerant) - if tolerant then + if str == true or str == false then + return str + elseif tolerant then local tstr = type(str) if tstr == "string" then return str == "true" or str == "yes" or str == "on" or str == "1" or str == "t" @@ -4894,6 +4896,9 @@ function table.fastserialize(t,prefix) end function table.deserialize(str) + if not str or str == "" then + return + end local code = loadstring(str) if not code then return |