2020-02-11 16:39:00

1 files changed, 32 insertions, 74 deletions

diff --git a/tex/context/base/mkiv/l-table.lua b/tex/context/base/mkiv/l-table.lua
index 98b377bdc..c20bd4733 100644
--- a/tex/context/base/mkiv/l-table.lua
+++ b/tex/context/base/mkiv/l-table.lua
@@ -525,84 +525,15 @@ function table.fromhash(t)
     return hsh
 end
 
-local noquotes, hexify, handle, compact, inline, functions, metacheck
+local noquotes, hexify, handle, compact, inline, functions, metacheck, accurate
 
 local reserved = table.tohash { -- intercept a language inconvenience: no reserved words as key
     'and', 'break', 'do', 'else', 'elseif', 'end', 'false', 'for', 'function', 'if',
     'in', 'local', 'nil', 'not', 'or', 'repeat', 'return', 'then', 'true', 'until', 'while',
-    'NaN', 'goto',
+    'NaN', 'goto', 'const',
 }
 
--- local function is_simple_table(t)
---     if #t > 0 then
---         local n = 0
---         for _,v in next, t do
---             n = n + 1
---         end
---         if n == #t then
---             local tt, nt = { }, 0
---             for i=1,#t do
---                 local v = t[i]
---                 local tv = type(v)
---                 if tv == "number" then
---                     nt = nt + 1
---                     if hexify then
---                         tt[nt] = format("0x%X",v)
---                     else
---                         tt[nt] = tostring(v) -- tostring not needed
---                     end
---                 elseif tv == "string" then
---                     nt = nt + 1
---                     tt[nt] = format("%q",v)
---                 elseif tv == "boolean" then
---                     nt = nt + 1
---                     tt[nt] = v and "true" or "false"
---                 else
---                     return nil
---                 end
---             end
---             return tt
---         end
---     end
---     return nil
--- end
-
--- local function is_simple_table(t)
---     local nt = #t
---     if nt > 0 then
---         local n = 0
---         for _,v in next, t do
---             n = n + 1
---          -- if type(v) == "table" then
---          --     return nil
---          -- end
---         end
---         if n == nt then
---             local tt = { }
---             for i=1,nt do
---                 local v = t[i]
---                 local tv = type(v)
---                 if tv == "number" then
---                     if hexify then
---                         tt[i] = format("0x%X",v)
---                     else
---                         tt[i] = tostring(v) -- tostring not needed
---                     end
---                 elseif tv == "string" then
---                     tt[i] = format("%q",v)
---                 elseif tv == "boolean" then
---                     tt[i] = v and "true" or "false"
---                 else
---                     return nil
---                 end
---             end
---             return tt
---         end
---     end
---     return nil
--- end
-
-local function is_simple_table(t,hexify) -- also used in util-tab so maybe public
+local function is_simple_table(t,hexify,accurate) -- also used in util-tab so maybe public
     local nt = #t
     if nt > 0 then
         local n = 0
@@ -623,6 +554,8 @@ local function is_simple_table(t,hexify) -- also used in util-tab so maybe publi
                  -- tt[i] = v -- not needed tostring(v)
                     if hexify then
                         tt[i] = format("0x%X",v)
+                    elseif accurate then
+                        tt[i] = format("%q",v)
                     else
                         tt[i] = v -- not needed tostring(v)
                     end
@@ -644,6 +577,8 @@ local function is_simple_table(t,hexify) -- also used in util-tab so maybe publi
                  -- tt[i+1] = v -- not needed tostring(v)
                     if hexify then
                         tt[i+1] = format("0x%X",v)
+                    elseif accurate then
+                        tt[i+1] = format("%q",v)
                     else
                         tt[i+1] = v -- not needed tostring(v)
                     end
@@ -738,6 +673,8 @@ local function do_serialize(root,name,depth,level,indexed)
                 if tv == "number" then
                     if hexify then
                         handle(format("%s 0x%X,",depth,v))
+                    elseif accurate then
+                        handle(format("%s %q,",depth,v))
                     else
                         handle(format("%s %s,",depth,v)) -- %.99g
                     end
@@ -747,7 +684,7 @@ local function do_serialize(root,name,depth,level,indexed)
                     if next(v) == nil then
                         handle(format("%s {},",depth))
                     elseif inline then -- and #t > 0
-                        local st = is_simple_table(v,hexify)
+                        local st = is_simple_table(v,hexify,accurate)
                         if st then
                             handle(format("%s { %s },",depth,concat(st,", ")))
                         else
@@ -775,12 +712,16 @@ local function do_serialize(root,name,depth,level,indexed)
                 if tk == "number" then
                     if hexify then
                         handle(format("%s [0x%X]=0x%X,",depth,k,v))
+                    elseif accurate then
+                        handle(format("%s [%s]=%q,",depth,k,v))
                     else
                         handle(format("%s [%s]=%s,",depth,k,v)) -- %.99g
                     end
                 elseif tk == "boolean" then
                     if hexify then
                         handle(format("%s [%s]=0x%X,",depth,k and "true" or "false",v))
+                    elseif accurate then
+                        handle(format("%s [%s]=%q,",depth,k and "true" or "false",v))
                     else
                         handle(format("%s [%s]=%s,",depth,k and "true" or "false",v)) -- %.99g
                     end
@@ -789,12 +730,16 @@ local function do_serialize(root,name,depth,level,indexed)
                 elseif noquotes and not reserved[k] and lpegmatch(propername,k) then
                     if hexify then
                         handle(format("%s %s=0x%X,",depth,k,v))
+                    elseif accurate then
+                        handle(format("%s %s=%q,",depth,k,v))
                     else
                         handle(format("%s %s=%s,",depth,k,v)) -- %.99g
                     end
                 else
                     if hexify then
                         handle(format("%s [%q]=0x%X,",depth,k,v))
+                    elseif accurate then
+                        handle(format("%s [%q]=%q,",depth,k,v))
                     else
                         handle(format("%s [%q]=%s,",depth,k,v)) -- %.99g
                     end
@@ -803,6 +748,8 @@ local function do_serialize(root,name,depth,level,indexed)
                 if tk == "number" then
                     if hexify then
                         handle(format("%s [0x%X]=%q,",depth,k,v))
+                    elseif accurate then
+                        handle(format("%s [%q]=%q,",depth,k,v))
                     else
                         handle(format("%s [%s]=%q,",depth,k,v))
                     end
@@ -820,6 +767,8 @@ local function do_serialize(root,name,depth,level,indexed)
                     if tk == "number" then
                         if hexify then
                             handle(format("%s [0x%X]={},",depth,k))
+                        elseif accurate then
+                            handle(format("%s [%q]={},",depth,k))
                         else
                             handle(format("%s [%s]={},",depth,k))
                         end
@@ -833,11 +782,13 @@ local function do_serialize(root,name,depth,level,indexed)
                         handle(format("%s [%q]={},",depth,k))
                     end
                 elseif inline then
-                    local st = is_simple_table(v,hexify)
+                    local st = is_simple_table(v,hexify,accurate)
                     if st then
                         if tk == "number" then
                             if hexify then
                                 handle(format("%s [0x%X]={ %s },",depth,k,concat(st,", ")))
+                            elseif accurate then
+                                handle(format("%s [%q]={ %s },",depth,k,concat(st,", ")))
                             else
                                 handle(format("%s [%s]={ %s },",depth,k,concat(st,", ")))
                             end
@@ -860,6 +811,8 @@ local function do_serialize(root,name,depth,level,indexed)
                 if tk == "number" then
                     if hexify then
                         handle(format("%s [0x%X]=%s,",depth,k,v and "true" or "false"))
+                    elseif accurate then
+                        handle(format("%s [%q]=%s,",depth,k,v and "true" or "false"))
                     else
                         handle(format("%s [%s]=%s,",depth,k,v and "true" or "false"))
                     end
@@ -881,6 +834,8 @@ local function do_serialize(root,name,depth,level,indexed)
                         if tk == "number" then
                             if hexify then
                                 handle(format("%s [0x%X]=load(%q),",depth,k,f))
+                            elseif accurate then
+                                handle(format("%s [%q]=load(%q),",depth,k,f))
                             else
                                 handle(format("%s [%s]=load(%q),",depth,k,f))
                             end
@@ -899,6 +854,8 @@ local function do_serialize(root,name,depth,level,indexed)
                 if tk == "number" then
                     if hexify then
                         handle(format("%s [0x%X]=%q,",depth,k,tostring(v)))
+                    elseif accurate then
+                        handle(format("%s [%q]=%q,",depth,k,tostring(v)))
                     else
                         handle(format("%s [%s]=%q,",depth,k,tostring(v)))
                     end
@@ -927,6 +884,7 @@ local function serialize(_handle,root,name,specification) -- handle wins
     if type(specification) == "table" then
         noquotes  = specification.noquotes
         hexify    = specification.hexify
+        accurate  = specification.accurate
         handle    = _handle or specification.handle or print
         functions = specification.functions
         compact   = specification.compact