beta 2013.09.19 19:21

1 files changed, 32 insertions, 15 deletions

diff --git a/scripts/context/lua/mtxrun.lua b/scripts/context/lua/mtxrun.lua
index 69293450c..f1edc5b0d 100644
--- a/scripts/context/lua/mtxrun.lua
+++ b/scripts/context/lua/mtxrun.lua
@@ -5285,7 +5285,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["util-tab"] = package.loaded["util-tab"] or true
 
--- original size: 22787, stripped down to: 15432
+-- original size: 23803, stripped down to: 15979
 
 if not modules then modules={} end modules ['util-tab']={
   version=1.001,
@@ -5512,10 +5512,13 @@ local f_hashed_string=formatters["[%q]=%q,"]
 local f_hashed_number=formatters["[%q]=%s,"]
 local f_hashed_boolean=formatters["[%q]=%l,"]
 local f_hashed_table=formatters["[%q]="]
-local f_indexed_string=formatters["%q,"]
-local f_indexed_number=formatters["%s,"]
-local f_indexed_boolean=formatters["%l,"]
-function table.fastserialize(t,prefix) 
+local f_indexed_string=formatters["[%s]=%q,"]
+local f_indexed_number=formatters["[%s]=%s,"]
+local f_indexed_boolean=formatters["[%s]=%l,"]
+local f_ordered_string=formatters["%q,"]
+local f_ordered_number=formatters["%s,"]
+local f_ordered_boolean=formatters["%l,"]
+function table.fastserialize(t,prefix)
   local r={ prefix or "return" }
   local m=1
   local function fastserialize(t,outer) 
@@ -5523,22 +5526,36 @@ function table.fastserialize(t,prefix)
     m=m+1
     r[m]="{"
     if n>0 then
-      for i=1,n do
+      for i=0,n do
         local v=t[i]
         local tv=type(v)
         if tv=="string" then
-          m=m+1 r[m]=f_indexed_string(v)
+          m=m+1 r[m]=f_ordered_string(v)
         elseif tv=="number" then
-          m=m+1 r[m]=f_indexed_number(v)
+          m=m+1 r[m]=f_ordered_number(v)
         elseif tv=="table" then
           fastserialize(v)
         elseif tv=="boolean" then
-          m=m+1 r[m]=f_indexed_boolean(v)
+          m=m+1 r[m]=f_ordered_boolean(v)
         end
       end
-    else
-      for k,v in next,t do
-        local tv=type(v)
+    end
+    for k,v in next,t do
+      local tk=type(k)
+      local tv=type(v)
+      if tk=="number" then
+        if k>n or k<0 then
+          if tv=="string" then
+            m=m+1 r[m]=f_indexed_string(k,v)
+          elseif tv=="number" then
+            m=m+1 r[m]=f_indexed_number(k,v)
+          elseif tv=="table" then
+            fastserialize(v)
+          elseif tv=="boolean" then
+            m=m+1 r[m]=f_indexed_boolean(k,v)
+          end
+        end
+      else
         if tv=="string" then
           m=m+1 r[m]=f_hashed_string(k,v)
         elseif tv=="number" then
@@ -5689,7 +5706,7 @@ local f_table_direct=formatters["{"]
 local f_table_entry=formatters["[%q]={"]
 local f_table_finish=formatters["}"]
 local spaces=utilities.strings.newrepeater(" ")
-local serialize=table.serialize 
+local serialize=table.serialize
 function table.serialize(root,name,specification)
   if type(specification)=="table" then
     return serialize(root,name,specification) 
@@ -16521,8 +16538,8 @@ end -- of closure
 
 -- used libraries    : l-lua.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-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-mrg.lua util-tpl.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    : 678007
--- stripped bytes    : 239807
+-- original bytes    : 679023
+-- stripped bytes    : 240276
 
 -- end library merge