2017-03-23 17:26:00

4 files changed, 48 insertions, 36 deletions

diff --git a/scripts/context/lua/mtxrun.lua b/scripts/context/lua/mtxrun.lua
index ba5970a51..2c0c8bfa4 100644
--- a/scripts/context/lua/mtxrun.lua
+++ b/scripts/context/lua/mtxrun.lua
@@ -19648,7 +19648,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["util-lib"] = package.loaded["util-lib"] or true
 
--- original size: 13373, stripped down to: 7334
+-- original size: 13452, stripped down to: 7398
 
 if not modules then modules={} end modules ['util-lib']={
   version=1.001,
@@ -19682,14 +19682,14 @@ local function locate(required,version,trace,report,action)
     report("requiring library %a with version %a",required,version or "any")
   end
   local found_library=nil
+  local required_full=gsub(required,"%.","/") 
+  local required_path=pathpart(required_full)
+  local required_base=nameonly(required_full)
   if qualifiedpath(required) then
     if isfile(required) then
       found_library=required
     end
   else
-    local required_full=gsub(required,"%.","/") 
-    local required_path=pathpart(required_full)
-    local required_base=nameonly(required_full)
     local required_name=required_base.."."..os.libsuffix
     local version=type(version)=="string" and version~="" and version or false
     local engine=environment.ownmain or false
@@ -19803,15 +19803,18 @@ do
   local trace_swiglib=false
   local savedrequire=require
   local loadedlibs={}
+  local loadlib=package.loadlib
+  local pushdir=dir.push
+  local popdir=dir.pop
   trackers.register("resolvers.swiglib",function(v) trace_swiglib=v end)
   function requireswiglib(required,version)
     local library=loadedlibs[library]
     if library==nil then
       local trace_swiglib=trace_swiglib or package.helpers.trace
       library=locate(required,version,trace_swiglib,report_swiglib,function(name,base)
-        dir.push(pathpart(name))
+        pushdir(pathpart(name))
         local opener="luaopen_"..base
-        local library,message=package.loadlib(name,opener)
+        local library,message=loadlib(name,opener)
         local libtype=type(library)
         if libtype=="function" then
           library=library()
@@ -19820,7 +19823,7 @@ do
           report_swiglib("load error: %a returns %a, message %a, library %a",opener,libtype,(string.gsub(message or "no message","[%s]+$","")),found_library or "no library")
           library=false
         end
-        dir.pop()
+        popdir()
         return message,library
       end)
       loadedlibs[required]=library or false
@@ -20233,8 +20236,8 @@ end -- of closure
 
 -- used libraries    : l-lua.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-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 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    : 836098
--- stripped bytes    : 304131
+-- original bytes    : 836177
+-- stripped bytes    : 304146
 
 -- end library merge
 
diff --git a/scripts/context/stubs/mswin/mtxrun.lua b/scripts/context/stubs/mswin/mtxrun.lua
index ba5970a51..2c0c8bfa4 100644
--- a/scripts/context/stubs/mswin/mtxrun.lua
+++ b/scripts/context/stubs/mswin/mtxrun.lua
@@ -19648,7 +19648,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["util-lib"] = package.loaded["util-lib"] or true
 
--- original size: 13373, stripped down to: 7334
+-- original size: 13452, stripped down to: 7398
 
 if not modules then modules={} end modules ['util-lib']={
   version=1.001,
@@ -19682,14 +19682,14 @@ local function locate(required,version,trace,report,action)
     report("requiring library %a with version %a",required,version or "any")
   end
   local found_library=nil
+  local required_full=gsub(required,"%.","/") 
+  local required_path=pathpart(required_full)
+  local required_base=nameonly(required_full)
   if qualifiedpath(required) then
     if isfile(required) then
       found_library=required
     end
   else
-    local required_full=gsub(required,"%.","/") 
-    local required_path=pathpart(required_full)
-    local required_base=nameonly(required_full)
     local required_name=required_base.."."..os.libsuffix
     local version=type(version)=="string" and version~="" and version or false
     local engine=environment.ownmain or false
@@ -19803,15 +19803,18 @@ do
   local trace_swiglib=false
   local savedrequire=require
   local loadedlibs={}
+  local loadlib=package.loadlib
+  local pushdir=dir.push
+  local popdir=dir.pop
   trackers.register("resolvers.swiglib",function(v) trace_swiglib=v end)
   function requireswiglib(required,version)
     local library=loadedlibs[library]
     if library==nil then
       local trace_swiglib=trace_swiglib or package.helpers.trace
       library=locate(required,version,trace_swiglib,report_swiglib,function(name,base)
-        dir.push(pathpart(name))
+        pushdir(pathpart(name))
         local opener="luaopen_"..base
-        local library,message=package.loadlib(name,opener)
+        local library,message=loadlib(name,opener)
         local libtype=type(library)
         if libtype=="function" then
           library=library()
@@ -19820,7 +19823,7 @@ do
           report_swiglib("load error: %a returns %a, message %a, library %a",opener,libtype,(string.gsub(message or "no message","[%s]+$","")),found_library or "no library")
           library=false
         end
-        dir.pop()
+        popdir()
         return message,library
       end)
       loadedlibs[required]=library or false
@@ -20233,8 +20236,8 @@ end -- of closure
 
 -- used libraries    : l-lua.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-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 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    : 836098
--- stripped bytes    : 304131
+-- original bytes    : 836177
+-- stripped bytes    : 304146
 
 -- end library merge
 
diff --git a/scripts/context/stubs/unix/mtxrun b/scripts/context/stubs/unix/mtxrun
index ba5970a51..2c0c8bfa4 100644
--- a/scripts/context/stubs/unix/mtxrun
+++ b/scripts/context/stubs/unix/mtxrun
@@ -19648,7 +19648,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["util-lib"] = package.loaded["util-lib"] or true
 
--- original size: 13373, stripped down to: 7334
+-- original size: 13452, stripped down to: 7398
 
 if not modules then modules={} end modules ['util-lib']={
   version=1.001,
@@ -19682,14 +19682,14 @@ local function locate(required,version,trace,report,action)
     report("requiring library %a with version %a",required,version or "any")
   end
   local found_library=nil
+  local required_full=gsub(required,"%.","/") 
+  local required_path=pathpart(required_full)
+  local required_base=nameonly(required_full)
   if qualifiedpath(required) then
     if isfile(required) then
       found_library=required
     end
   else
-    local required_full=gsub(required,"%.","/") 
-    local required_path=pathpart(required_full)
-    local required_base=nameonly(required_full)
     local required_name=required_base.."."..os.libsuffix
     local version=type(version)=="string" and version~="" and version or false
     local engine=environment.ownmain or false
@@ -19803,15 +19803,18 @@ do
   local trace_swiglib=false
   local savedrequire=require
   local loadedlibs={}
+  local loadlib=package.loadlib
+  local pushdir=dir.push
+  local popdir=dir.pop
   trackers.register("resolvers.swiglib",function(v) trace_swiglib=v end)
   function requireswiglib(required,version)
     local library=loadedlibs[library]
     if library==nil then
       local trace_swiglib=trace_swiglib or package.helpers.trace
       library=locate(required,version,trace_swiglib,report_swiglib,function(name,base)
-        dir.push(pathpart(name))
+        pushdir(pathpart(name))
         local opener="luaopen_"..base
-        local library,message=package.loadlib(name,opener)
+        local library,message=loadlib(name,opener)
         local libtype=type(library)
         if libtype=="function" then
           library=library()
@@ -19820,7 +19823,7 @@ do
           report_swiglib("load error: %a returns %a, message %a, library %a",opener,libtype,(string.gsub(message or "no message","[%s]+$","")),found_library or "no library")
           library=false
         end
-        dir.pop()
+        popdir()
         return message,library
       end)
       loadedlibs[required]=library or false
@@ -20233,8 +20236,8 @@ end -- of closure
 
 -- used libraries    : l-lua.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-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 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    : 836098
--- stripped bytes    : 304131
+-- original bytes    : 836177
+-- stripped bytes    : 304146
 
 -- end library merge
 
diff --git a/scripts/context/stubs/win64/mtxrun.lua b/scripts/context/stubs/win64/mtxrun.lua
index ba5970a51..2c0c8bfa4 100644
--- a/scripts/context/stubs/win64/mtxrun.lua
+++ b/scripts/context/stubs/win64/mtxrun.lua
@@ -19648,7 +19648,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["util-lib"] = package.loaded["util-lib"] or true
 
--- original size: 13373, stripped down to: 7334
+-- original size: 13452, stripped down to: 7398
 
 if not modules then modules={} end modules ['util-lib']={
   version=1.001,
@@ -19682,14 +19682,14 @@ local function locate(required,version,trace,report,action)
     report("requiring library %a with version %a",required,version or "any")
   end
   local found_library=nil
+  local required_full=gsub(required,"%.","/") 
+  local required_path=pathpart(required_full)
+  local required_base=nameonly(required_full)
   if qualifiedpath(required) then
     if isfile(required) then
       found_library=required
     end
   else
-    local required_full=gsub(required,"%.","/") 
-    local required_path=pathpart(required_full)
-    local required_base=nameonly(required_full)
     local required_name=required_base.."."..os.libsuffix
     local version=type(version)=="string" and version~="" and version or false
     local engine=environment.ownmain or false
@@ -19803,15 +19803,18 @@ do
   local trace_swiglib=false
   local savedrequire=require
   local loadedlibs={}
+  local loadlib=package.loadlib
+  local pushdir=dir.push
+  local popdir=dir.pop
   trackers.register("resolvers.swiglib",function(v) trace_swiglib=v end)
   function requireswiglib(required,version)
     local library=loadedlibs[library]
     if library==nil then
       local trace_swiglib=trace_swiglib or package.helpers.trace
       library=locate(required,version,trace_swiglib,report_swiglib,function(name,base)
-        dir.push(pathpart(name))
+        pushdir(pathpart(name))
         local opener="luaopen_"..base
-        local library,message=package.loadlib(name,opener)
+        local library,message=loadlib(name,opener)
         local libtype=type(library)
         if libtype=="function" then
           library=library()
@@ -19820,7 +19823,7 @@ do
           report_swiglib("load error: %a returns %a, message %a, library %a",opener,libtype,(string.gsub(message or "no message","[%s]+$","")),found_library or "no library")
           library=false
         end
-        dir.pop()
+        popdir()
         return message,library
       end)
       loadedlibs[required]=library or false
@@ -20233,8 +20236,8 @@ end -- of closure
 
 -- used libraries    : l-lua.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-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 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    : 836098
--- stripped bytes    : 304131
+-- original bytes    : 836177
+-- stripped bytes    : 304146
 
 -- end library merge