2018-12-28 11:09:00

4 files changed, 40 insertions, 24 deletions

diff --git a/scripts/context/lua/mtxrun.lua b/scripts/context/lua/mtxrun.lua
index 9b47c6805..16f745a10 100644
--- a/scripts/context/lua/mtxrun.lua
+++ b/scripts/context/lua/mtxrun.lua
@@ -192,7 +192,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["l-macro"] = package.loaded["l-macro"] or true
 
--- original size: 9974, stripped down to: 6204
+-- original size: 10131, stripped down to: 6337
 
 if not modules then modules={} end modules ['l-macros']={
   version=1.001,
@@ -208,8 +208,10 @@ local format,sub,match=string.format,string.sub,string.match
 local next,load,type=next,load,type
 local newline=S("\n\r")^1
 local continue=P("\\")*newline
+local whitespace=S(" \t\n\r")
 local spaces=S(" \t")+continue
-local name=R("az","AZ","__","09")^1
+local nametoken=R("az","AZ","__","09")
+local name=nametoken^1
 local body=((continue/""+1)-newline)^1
 local lparent=P("(")
 local rparent=P(")")
@@ -234,7 +236,8 @@ local report_lua=function(...)
     print(format(...))
   end
 end
-resolve=C(C(name)*arguments^-1)/function(raw,s,a)
+local safeguard=P("local")*whitespace^1*name*(whitespace+P("="))
+resolve=safeguard+C(C(name)*(arguments^-1))/function(raw,s,a)
   local d=definitions[s]
   if d then
     if a then
@@ -13756,7 +13759,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["util-lua"] = package.loaded["util-lua"] or true
 
--- original size: 6621, stripped down to: 4764
+-- original size: 6664, stripped down to: 4800
 
 if not modules then modules={} end modules ['util-lua']={
   version=1.001,
@@ -13833,6 +13836,7 @@ function luautilities.loadedluacode(fullname,forcestrip,name,macros)
     code()
   else
     report_lua("loading of file %a failed:\n\t%s",fullname,message or "no message")
+    code,message=loadfile(fullname)
   end
   if forcestrip and luautilities.stripcode then
     if type(forcestrip)=="function" then
@@ -24743,8 +24747,8 @@ end -- of closure
 
 -- used libraries    : l-lua.lua l-macro.lua l-sandbox.lua l-package.lua l-lpeg.lua l-function.lua l-string.lua l-table.lua l-io.lua l-number.lua l-set.lua l-os.lua l-file.lua l-gzip.lua l-md5.lua l-sha.lua l-url.lua l-dir.lua l-boolean.lua l-unicode.lua l-math.lua util-str.lua util-tab.lua util-fil.lua util-sac.lua util-sto.lua util-prs.lua util-fmt.lua util-soc-imp-reset.lua util-soc-imp-socket.lua util-soc-imp-copas.lua util-soc-imp-ltn12.lua util-soc-imp-mime.lua util-soc-imp-url.lua util-soc-imp-headers.lua util-soc-imp-tp.lua util-soc-imp-http.lua util-soc-imp-ftp.lua util-soc-imp-smtp.lua trac-set.lua trac-log.lua trac-inf.lua trac-pro.lua util-lua.lua util-deb.lua util-tpl.lua util-sbx.lua util-mrg.lua util-env.lua luat-env.lua lxml-tab.lua lxml-lpt.lua lxml-mis.lua lxml-aux.lua lxml-xml.lua trac-xml.lua data-ini.lua data-exp.lua data-env.lua data-tmp.lua data-met.lua data-res.lua data-pre.lua data-inp.lua data-out.lua data-fil.lua data-con.lua data-use.lua data-zip.lua data-tre.lua data-sch.lua data-lua.lua data-aux.lua data-tmf.lua data-lst.lua util-lib.lua luat-sta.lua luat-fmt.lua
 -- skipped libraries : -
--- original bytes    : 987788
--- stripped bytes    : 348923
+-- original bytes    : 987988
+-- stripped bytes    : 348954
 
 -- end library merge
 
diff --git a/scripts/context/stubs/mswin/mtxrun.lua b/scripts/context/stubs/mswin/mtxrun.lua
index 9b47c6805..16f745a10 100644
--- a/scripts/context/stubs/mswin/mtxrun.lua
+++ b/scripts/context/stubs/mswin/mtxrun.lua
@@ -192,7 +192,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["l-macro"] = package.loaded["l-macro"] or true
 
--- original size: 9974, stripped down to: 6204
+-- original size: 10131, stripped down to: 6337
 
 if not modules then modules={} end modules ['l-macros']={
   version=1.001,
@@ -208,8 +208,10 @@ local format,sub,match=string.format,string.sub,string.match
 local next,load,type=next,load,type
 local newline=S("\n\r")^1
 local continue=P("\\")*newline
+local whitespace=S(" \t\n\r")
 local spaces=S(" \t")+continue
-local name=R("az","AZ","__","09")^1
+local nametoken=R("az","AZ","__","09")
+local name=nametoken^1
 local body=((continue/""+1)-newline)^1
 local lparent=P("(")
 local rparent=P(")")
@@ -234,7 +236,8 @@ local report_lua=function(...)
     print(format(...))
   end
 end
-resolve=C(C(name)*arguments^-1)/function(raw,s,a)
+local safeguard=P("local")*whitespace^1*name*(whitespace+P("="))
+resolve=safeguard+C(C(name)*(arguments^-1))/function(raw,s,a)
   local d=definitions[s]
   if d then
     if a then
@@ -13756,7 +13759,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["util-lua"] = package.loaded["util-lua"] or true
 
--- original size: 6621, stripped down to: 4764
+-- original size: 6664, stripped down to: 4800
 
 if not modules then modules={} end modules ['util-lua']={
   version=1.001,
@@ -13833,6 +13836,7 @@ function luautilities.loadedluacode(fullname,forcestrip,name,macros)
     code()
   else
     report_lua("loading of file %a failed:\n\t%s",fullname,message or "no message")
+    code,message=loadfile(fullname)
   end
   if forcestrip and luautilities.stripcode then
     if type(forcestrip)=="function" then
@@ -24743,8 +24747,8 @@ end -- of closure
 
 -- used libraries    : l-lua.lua l-macro.lua l-sandbox.lua l-package.lua l-lpeg.lua l-function.lua l-string.lua l-table.lua l-io.lua l-number.lua l-set.lua l-os.lua l-file.lua l-gzip.lua l-md5.lua l-sha.lua l-url.lua l-dir.lua l-boolean.lua l-unicode.lua l-math.lua util-str.lua util-tab.lua util-fil.lua util-sac.lua util-sto.lua util-prs.lua util-fmt.lua util-soc-imp-reset.lua util-soc-imp-socket.lua util-soc-imp-copas.lua util-soc-imp-ltn12.lua util-soc-imp-mime.lua util-soc-imp-url.lua util-soc-imp-headers.lua util-soc-imp-tp.lua util-soc-imp-http.lua util-soc-imp-ftp.lua util-soc-imp-smtp.lua trac-set.lua trac-log.lua trac-inf.lua trac-pro.lua util-lua.lua util-deb.lua util-tpl.lua util-sbx.lua util-mrg.lua util-env.lua luat-env.lua lxml-tab.lua lxml-lpt.lua lxml-mis.lua lxml-aux.lua lxml-xml.lua trac-xml.lua data-ini.lua data-exp.lua data-env.lua data-tmp.lua data-met.lua data-res.lua data-pre.lua data-inp.lua data-out.lua data-fil.lua data-con.lua data-use.lua data-zip.lua data-tre.lua data-sch.lua data-lua.lua data-aux.lua data-tmf.lua data-lst.lua util-lib.lua luat-sta.lua luat-fmt.lua
 -- skipped libraries : -
--- original bytes    : 987788
--- stripped bytes    : 348923
+-- original bytes    : 987988
+-- stripped bytes    : 348954
 
 -- end library merge
 
diff --git a/scripts/context/stubs/unix/mtxrun b/scripts/context/stubs/unix/mtxrun
index 9b47c6805..16f745a10 100644
--- a/scripts/context/stubs/unix/mtxrun
+++ b/scripts/context/stubs/unix/mtxrun
@@ -192,7 +192,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["l-macro"] = package.loaded["l-macro"] or true
 
--- original size: 9974, stripped down to: 6204
+-- original size: 10131, stripped down to: 6337
 
 if not modules then modules={} end modules ['l-macros']={
   version=1.001,
@@ -208,8 +208,10 @@ local format,sub,match=string.format,string.sub,string.match
 local next,load,type=next,load,type
 local newline=S("\n\r")^1
 local continue=P("\\")*newline
+local whitespace=S(" \t\n\r")
 local spaces=S(" \t")+continue
-local name=R("az","AZ","__","09")^1
+local nametoken=R("az","AZ","__","09")
+local name=nametoken^1
 local body=((continue/""+1)-newline)^1
 local lparent=P("(")
 local rparent=P(")")
@@ -234,7 +236,8 @@ local report_lua=function(...)
     print(format(...))
   end
 end
-resolve=C(C(name)*arguments^-1)/function(raw,s,a)
+local safeguard=P("local")*whitespace^1*name*(whitespace+P("="))
+resolve=safeguard+C(C(name)*(arguments^-1))/function(raw,s,a)
   local d=definitions[s]
   if d then
     if a then
@@ -13756,7 +13759,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["util-lua"] = package.loaded["util-lua"] or true
 
--- original size: 6621, stripped down to: 4764
+-- original size: 6664, stripped down to: 4800
 
 if not modules then modules={} end modules ['util-lua']={
   version=1.001,
@@ -13833,6 +13836,7 @@ function luautilities.loadedluacode(fullname,forcestrip,name,macros)
     code()
   else
     report_lua("loading of file %a failed:\n\t%s",fullname,message or "no message")
+    code,message=loadfile(fullname)
   end
   if forcestrip and luautilities.stripcode then
     if type(forcestrip)=="function" then
@@ -24743,8 +24747,8 @@ end -- of closure
 
 -- used libraries    : l-lua.lua l-macro.lua l-sandbox.lua l-package.lua l-lpeg.lua l-function.lua l-string.lua l-table.lua l-io.lua l-number.lua l-set.lua l-os.lua l-file.lua l-gzip.lua l-md5.lua l-sha.lua l-url.lua l-dir.lua l-boolean.lua l-unicode.lua l-math.lua util-str.lua util-tab.lua util-fil.lua util-sac.lua util-sto.lua util-prs.lua util-fmt.lua util-soc-imp-reset.lua util-soc-imp-socket.lua util-soc-imp-copas.lua util-soc-imp-ltn12.lua util-soc-imp-mime.lua util-soc-imp-url.lua util-soc-imp-headers.lua util-soc-imp-tp.lua util-soc-imp-http.lua util-soc-imp-ftp.lua util-soc-imp-smtp.lua trac-set.lua trac-log.lua trac-inf.lua trac-pro.lua util-lua.lua util-deb.lua util-tpl.lua util-sbx.lua util-mrg.lua util-env.lua luat-env.lua lxml-tab.lua lxml-lpt.lua lxml-mis.lua lxml-aux.lua lxml-xml.lua trac-xml.lua data-ini.lua data-exp.lua data-env.lua data-tmp.lua data-met.lua data-res.lua data-pre.lua data-inp.lua data-out.lua data-fil.lua data-con.lua data-use.lua data-zip.lua data-tre.lua data-sch.lua data-lua.lua data-aux.lua data-tmf.lua data-lst.lua util-lib.lua luat-sta.lua luat-fmt.lua
 -- skipped libraries : -
--- original bytes    : 987788
--- stripped bytes    : 348923
+-- original bytes    : 987988
+-- stripped bytes    : 348954
 
 -- end library merge
 
diff --git a/scripts/context/stubs/win64/mtxrun.lua b/scripts/context/stubs/win64/mtxrun.lua
index 9b47c6805..16f745a10 100644
--- a/scripts/context/stubs/win64/mtxrun.lua
+++ b/scripts/context/stubs/win64/mtxrun.lua
@@ -192,7 +192,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["l-macro"] = package.loaded["l-macro"] or true
 
--- original size: 9974, stripped down to: 6204
+-- original size: 10131, stripped down to: 6337
 
 if not modules then modules={} end modules ['l-macros']={
   version=1.001,
@@ -208,8 +208,10 @@ local format,sub,match=string.format,string.sub,string.match
 local next,load,type=next,load,type
 local newline=S("\n\r")^1
 local continue=P("\\")*newline
+local whitespace=S(" \t\n\r")
 local spaces=S(" \t")+continue
-local name=R("az","AZ","__","09")^1
+local nametoken=R("az","AZ","__","09")
+local name=nametoken^1
 local body=((continue/""+1)-newline)^1
 local lparent=P("(")
 local rparent=P(")")
@@ -234,7 +236,8 @@ local report_lua=function(...)
     print(format(...))
   end
 end
-resolve=C(C(name)*arguments^-1)/function(raw,s,a)
+local safeguard=P("local")*whitespace^1*name*(whitespace+P("="))
+resolve=safeguard+C(C(name)*(arguments^-1))/function(raw,s,a)
   local d=definitions[s]
   if d then
     if a then
@@ -13756,7 +13759,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["util-lua"] = package.loaded["util-lua"] or true
 
--- original size: 6621, stripped down to: 4764
+-- original size: 6664, stripped down to: 4800
 
 if not modules then modules={} end modules ['util-lua']={
   version=1.001,
@@ -13833,6 +13836,7 @@ function luautilities.loadedluacode(fullname,forcestrip,name,macros)
     code()
   else
     report_lua("loading of file %a failed:\n\t%s",fullname,message or "no message")
+    code,message=loadfile(fullname)
   end
   if forcestrip and luautilities.stripcode then
     if type(forcestrip)=="function" then
@@ -24743,8 +24747,8 @@ end -- of closure
 
 -- used libraries    : l-lua.lua l-macro.lua l-sandbox.lua l-package.lua l-lpeg.lua l-function.lua l-string.lua l-table.lua l-io.lua l-number.lua l-set.lua l-os.lua l-file.lua l-gzip.lua l-md5.lua l-sha.lua l-url.lua l-dir.lua l-boolean.lua l-unicode.lua l-math.lua util-str.lua util-tab.lua util-fil.lua util-sac.lua util-sto.lua util-prs.lua util-fmt.lua util-soc-imp-reset.lua util-soc-imp-socket.lua util-soc-imp-copas.lua util-soc-imp-ltn12.lua util-soc-imp-mime.lua util-soc-imp-url.lua util-soc-imp-headers.lua util-soc-imp-tp.lua util-soc-imp-http.lua util-soc-imp-ftp.lua util-soc-imp-smtp.lua trac-set.lua trac-log.lua trac-inf.lua trac-pro.lua util-lua.lua util-deb.lua util-tpl.lua util-sbx.lua util-mrg.lua util-env.lua luat-env.lua lxml-tab.lua lxml-lpt.lua lxml-mis.lua lxml-aux.lua lxml-xml.lua trac-xml.lua data-ini.lua data-exp.lua data-env.lua data-tmp.lua data-met.lua data-res.lua data-pre.lua data-inp.lua data-out.lua data-fil.lua data-con.lua data-use.lua data-zip.lua data-tre.lua data-sch.lua data-lua.lua data-aux.lua data-tmf.lua data-lst.lua util-lib.lua luat-sta.lua luat-fmt.lua
 -- skipped libraries : -
--- original bytes    : 987788
--- stripped bytes    : 348923
+-- original bytes    : 987988
+-- stripped bytes    : 348954
 
 -- end library merge