sync with Context as of 2013-06-04

5 files changed, 93 insertions, 269 deletions

diff --git a/lualibs-dir.lua b/lualibs-dir.lua
index 3d0576e..e47de60 100644
--- a/lualibs-dir.lua
+++ b/lualibs-dir.lua
@@ -273,9 +273,8 @@ if onwindows then
                 str = str .. "/" .. s
             end
         end
-        local first, middle, last
         local drive = false
-        first, middle, last = match(str,"^(//)(//*)(.*)$")
+        local first, middle, last = match(str,"^(//)(//*)(.*)$")
         if first then
             -- empty network path == local path
         else
diff --git a/lualibs-lpeg.lua b/lualibs-lpeg.lua
index 323c73b..99b4bbb 100644
--- a/lualibs-lpeg.lua
+++ b/lualibs-lpeg.lua
@@ -137,7 +137,7 @@ patterns.nonwhitespace = nonwhitespace
 
 local stripper         = spacer^0 * C((spacer^0     * nonspacer^1)^0) -- from example by roberto
 
------ collapser        = Cs(spacer^0/"" * ((spacer^1 * P(-1) / "") + (spacer^1/" ") + P(1))^0)
+----- collapser        = Cs(spacer^0/"" * ((spacer^1 * endofstring / "") + (spacer^1/" ") + P(1))^0)
 local collapser        = Cs(spacer^0/"" * nonspacer^0 * ((spacer^0/" " * nonspacer^1)^0))
 
 patterns.stripper      = stripper
@@ -187,7 +187,7 @@ patterns.singlequoted  = squote * patterns.nosquote * squote
 patterns.doublequoted  = dquote * patterns.nodquote * dquote
 patterns.quoted        = patterns.doublequoted + patterns.singlequoted
 
-patterns.propername    = R("AZ","az","__") * R("09","AZ","az", "__")^0 * P(-1)
+patterns.propername    = R("AZ","az","__") * R("09","AZ","az", "__")^0 * endofstring
 
 patterns.somecontent   = (anything - newline - space)^1 -- (utf8char - newline - space)^1
 patterns.beginline     = #(1-newline)
@@ -421,7 +421,7 @@ function lpeg.replacer(one,two,makefunction,isutf) -- in principle we should sor
     end
 end
 
-function lpeg.finder(lst,makefunction)
+function lpeg.finder(lst,makefunction) -- beware: slower than find with 'patternless finds'
     local pattern
     if type(lst) == "table" then
         pattern = P(false)
@@ -456,8 +456,8 @@ local splitters_f, splitters_s = { }, { }
 function lpeg.firstofsplit(separator) -- always return value
     local splitter = splitters_f[separator]
     if not splitter then
-        separator = P(separator)
-        splitter = C((1 - separator)^0)
+        local pattern = P(separator)
+        splitter = C((1 - pattern)^0)
         splitters_f[separator] = splitter
     end
     return splitter
@@ -466,13 +466,35 @@ end
 function lpeg.secondofsplit(separator) -- nil if not split
     local splitter = splitters_s[separator]
     if not splitter then
-        separator = P(separator)
-        splitter = (1 - separator)^0 * separator * C(anything^0)
+        local pattern = P(separator)
+        splitter = (1 - pattern)^0 * pattern * C(anything^0)
         splitters_s[separator] = splitter
     end
     return splitter
 end
 
+local splitters_s, splitters_p = { }, { }
+
+function lpeg.beforesuffix(separator) -- nil if nothing but empty is ok
+    local splitter = splitters_s[separator]
+    if not splitter then
+        local pattern = P(separator)
+        splitter = C((1 - pattern)^0) * pattern * endofstring
+        splitters_s[separator] = splitter
+    end
+    return splitter
+end
+
+function lpeg.afterprefix(separator) -- nil if nothing but empty is ok
+    local splitter = splitters_p[separator]
+    if not splitter then
+        local pattern = P(separator)
+        splitter = pattern * C(anything^0)
+        splitters_p[separator] = splitter
+    end
+    return splitter
+end
+
 function lpeg.balancer(left,right)
     left, right = P(left), P(right)
     return P { left * ((1 - left - right) + V(1))^0 * right }
diff --git a/lualibs-string.lua b/lualibs-string.lua
index 77c076c..9b079b0 100644
--- a/lualibs-string.lua
+++ b/lualibs-string.lua
@@ -91,6 +91,8 @@ end
 
 local pattern = P(" ")^0 * P(-1)
 
+-- patterns.onlyspaces = pattern
+
 function string.is_empty(str)
     if str == "" then
         return true
diff --git a/lualibs-util-lua.lua b/lualibs-util-lua.lua
index f3be9dc..61d1190 100644
--- a/lualibs-util-lua.lua
+++ b/lualibs-util-lua.lua
@@ -41,291 +41,92 @@ luautilities.suffixes = {
 
 -- environment.loadpreprocessedfile can be set to a preprocessor
 
-if jit or status.luatex_version >= 74 then
-
-    local function register(name)
-        if tracestripping then
-            report_lua("stripped bytecode from %a",name or "unknown")
-        end
-        strippedchunks[#strippedchunks+1] = name
-        luautilities.nofstrippedchunks = luautilities.nofstrippedchunks + 1
-    end
-
-    local function stupidcompile(luafile,lucfile,strip)
-        local code = io.loaddata(luafile)
-        if code and code ~= "" then
-            code = load(code)
-            if code then
-                code = dump(code,strip and luautilities.stripcode or luautilities.alwaysstripcode)
-                if code and code ~= "" then
-                    register(name)
-                    io.savedata(lucfile,code)
-                    return true, 0
-                end
-            else
-                report_lua("fatal error %a in file %a",1,luafile)
-            end
-        else
-            report_lua("fatal error %a in file %a",2,luafile)
-        end
-        return false, 0
+local function register(name)
+    if tracestripping then
+        report_lua("stripped bytecode from %a",name or "unknown")
     end
+    strippedchunks[#strippedchunks+1] = name
+    luautilities.nofstrippedchunks = luautilities.nofstrippedchunks + 1
+end
 
-    -- quite subtle ... doing this wrong incidentally can give more bytes
-
-    function luautilities.loadedluacode(fullname,forcestrip,name)
-        -- quite subtle ... doing this wrong incidentally can give more bytes
-        name = name or fullname
-        local code = environment.loadpreprocessedfile and environment.loadpreprocessedfile(fullname) or loadfile(fullname)
+local function stupidcompile(luafile,lucfile,strip)
+    local code = io.loaddata(luafile)
+    if code and code ~= "" then
+        code = load(code)
         if code then
-            code()
-        end
-        if forcestrip and luautilities.stripcode then
-            if type(forcestrip) == "function" then
-                forcestrip = forcestrip(fullname)
-            end
-            if forcestrip or luautilities.alwaysstripcode then
+            code = dump(code,strip and luautilities.stripcode or luautilities.alwaysstripcode)
+            if code and code ~= "" then
                 register(name)
-                return load(dump(code,true)), 0
-            else
-                return code, 0
+                io.savedata(lucfile,code)
+                return true, 0
             end
-        elseif luautilities.alwaysstripcode then
-            register(name)
-            return load(dump(code,true)), 0
         else
-            return code, 0
-        end
-    end
-
-    function luautilities.strippedloadstring(code,forcestrip,name) -- not executed
-        if forcestrip and luautilities.stripcode or luautilities.alwaysstripcode then
-            code = load(code)
-            if not code then
-                report_lua("fatal error %a in file %a",3,name)
-            end
-            register(name)
-            code = dump(code,true)
-        end
-        return load(code), 0
-    end
-
-    function luautilities.compile(luafile,lucfile,cleanup,strip,fallback) -- defaults: cleanup=false strip=true
-        report_lua("compiling %a into %a",luafile,lucfile)
-        os.remove(lucfile)
-        local done = stupidcompile(luafile,lucfile,strip ~= false)
-        if done then
-            report_lua("dumping %a into %a stripped",luafile,lucfile)
-            if cleanup == true and lfs.isfile(lucfile) and lfs.isfile(luafile) then
-                report_lua("removing %a",luafile)
-                os.remove(luafile)
-            end
-        end
-        return done
-    end
-
-    function luautilities.loadstripped(...)
-        local l = load(...)
-        if l then
-            return load(dump(l,true))
-        end
-    end
-
-else
-
-    -- The next function was posted by Peter Cawley on the lua list and strips line
-    -- number information etc. from the bytecode data blob. We only apply this trick
-    -- when we store data tables. Stripping makes the compressed format file about
-    -- 1MB smaller (and uncompressed we save at least 6MB).
-    --
-    -- You can consider this feature an experiment, so it might disappear. There is
-    -- no noticeable gain in runtime although the memory footprint should be somewhat
-    -- smaller (and the file system has a bit less to deal with).
-    --
-    -- Begin of borrowed code ... works for Lua 5.1 which LuaTeX currently uses ...
-
-    local function register(name,before,after)
-        local delta = before - after
-        if tracestripping then
-            report_lua("bytecodes stripped from %a, # before %s, # after %s, delta %s",name,before,after,delta)
-        end
-        strippedchunks[#strippedchunks+1] = name
-        luautilities.nofstrippedchunks = luautilities.nofstrippedchunks + 1
-        luautilities.nofstrippedbytes  = luautilities.nofstrippedbytes  + delta
-        return delta
-    end
-
-    local strip_code_pc
-
-    if _MAJORVERSION == 5 and _MINORVERSION == 1 then
-
-        strip_code_pc = function(dump,name)
-            local before = #dump
-            local version, format, endian, int, size, ins, num = byte(dump,5,11)
-            local subint
-            if endian == 1 then
-                subint = function(dump, i, l)
-                    local val = 0
-                    for n = l, 1, -1 do
-                        val = val * 256 + byte(dump,i + n - 1)
-                    end
-                    return val, i + l
-                end
-            else
-                subint = function(dump, i, l)
-                    local val = 0
-                    for n = 1, l, 1 do
-                        val = val * 256 + byte(dump,i + n - 1)
-                    end
-                    return val, i + l
-                end
-            end
-            local strip_function
-            strip_function = function(dump)
-                local count, offset = subint(dump, 1, size)
-                local stripped, dirty = rep("\0", size), offset + count
-                offset = offset + count + int * 2 + 4
-                offset = offset + int + subint(dump, offset, int) * ins
-                count, offset = subint(dump, offset, int)
-                for n = 1, count do
-                    local t
-                    t, offset = subint(dump, offset, 1)
-                    if t == 1 then
-                        offset = offset + 1
-                    elseif t == 4 then
-                        offset = offset + size + subint(dump, offset, size)
-                    elseif t == 3 then
-                        offset = offset + num
-                    end
-                end
-                count, offset = subint(dump, offset, int)
-                stripped = stripped .. sub(dump,dirty, offset - 1)
-                for n = 1, count do
-                    local proto, off = strip_function(sub(dump,offset, -1))
-                    stripped, offset = stripped .. proto, offset + off - 1
-                end
-                offset = offset + subint(dump, offset, int) * int + int
-                count, offset = subint(dump, offset, int)
-                for n = 1, count do
-                    offset = offset + subint(dump, offset, size) + size + int * 2
-                end
-                count, offset = subint(dump, offset, int)
-                for n = 1, count do
-                    offset = offset + subint(dump, offset, size) + size
-                end
-                stripped = stripped .. rep("\0", int * 3)
-                return stripped, offset
-            end
-            dump = sub(dump,1,12) .. strip_function(sub(dump,13,-1))
-            local after = #dump
-            local delta = register(name,before,after)
-            return dump, delta
+            report_lua("fatal error %a in file %a",1,luafile)
         end
-
     else
-
-        strip_code_pc = function(dump,name)
-            return dump, 0
-        end
-
+        report_lua("fatal error %a in file %a",2,luafile)
     end
+    return false, 0
+end
 
-    -- ... end of borrowed code.
+-- quite subtle ... doing this wrong incidentally can give more bytes
 
+function luautilities.loadedluacode(fullname,forcestrip,name)
     -- quite subtle ... doing this wrong incidentally can give more bytes
-
-    function luautilities.loadedluacode(fullname,forcestrip,name)
-        -- quite subtle ... doing this wrong incidentally can give more bytes
-        local code = environment.loadpreprocessedfile and environment.preprocessedloadfile(fullname) or loadfile(fullname)
-        if code then
-            code()
+    name = name or fullname
+    local code = environment.loadpreprocessedfile and environment.loadpreprocessedfile(fullname) or loadfile(fullname)
+    if code then
+        code()
+    end
+    if forcestrip and luautilities.stripcode then
+        if type(forcestrip) == "function" then
+            forcestrip = forcestrip(fullname)
         end
-        if forcestrip and luautilities.stripcode then
-            if type(forcestrip) == "function" then
-                forcestrip = forcestrip(fullname)
-            end
-            if forcestrip then
-                local code, n = strip_code_pc(dump(code),name)
-                return load(code), n
-            elseif luautilities.alwaysstripcode then
-                return load(strip_code_pc(dump(code),name))
-            else
-                return code, 0
-            end
-        elseif luautilities.alwaysstripcode then
-            return load(strip_code_pc(dump(code),name))
+        if forcestrip or luautilities.alwaysstripcode then
+            register(name)
+            return load(dump(code,true)), 0
         else
             return code, 0
         end
+    elseif luautilities.alwaysstripcode then
+        register(name)
+        return load(dump(code,true)), 0
+    else
+        return code, 0
     end
+end
 
-    function luautilities.strippedloadstring(code,forcestrip,name) -- not executed
-        local n = 0
-        if (forcestrip and luautilities.stripcode) or luautilities.alwaysstripcode then
-            code = load(code)
-            if not code then
-                report_lua("fatal error in file %a",name)
-            end
-            code, n = strip_code_pc(dump(code),name)
-        end
-        return load(code), n
-    end
-
-    local function stupidcompile(luafile,lucfile,strip)
-        local code = io.loaddata(luafile)
-        local n = 0
-        if code and code ~= "" then
-            code = load(code)
-            if not code then
-                report_lua("fatal error in file %a",luafile)
-            end
-            code = dump(code)
-            if strip then
-                code, n = strip_code_pc(code,luautilities.stripcode or luautilities.alwaysstripcode,luafile) -- last one is reported
-            end
-            if code and code ~= "" then
-                io.savedata(lucfile,code)
-            end
+function luautilities.strippedloadstring(code,forcestrip,name) -- not executed
+    if forcestrip and luautilities.stripcode or luautilities.alwaysstripcode then
+        code = load(code)
+        if not code then
+            report_lua("fatal error %a in file %a",3,name)
         end
-        return n
+        register(name)
+        code = dump(code,true)
     end
+    return load(code), 0
+end
 
-    local luac_normal = "texluac -o %q %q"
-    local luac_strip  = "texluac -s -o %q %q"
-
-    function luautilities.compile(luafile,lucfile,cleanup,strip,fallback) -- defaults: cleanup=false strip=true
-        report_lua("compiling %a into %a",luafile,lucfile)
-        os.remove(lucfile)
-        local done = false
-        if strip ~= false then
-            strip = true
-        end
-        if forcestupidcompile then
-            fallback = true
-        elseif strip then
-            done = os.spawn(format(luac_strip, lucfile,luafile)) == 0
-        else
-            done = os.spawn(format(luac_normal,lucfile,luafile)) == 0
-        end
-        if not done and fallback then
-            local n = stupidcompile(luafile,lucfile,strip)
-            if n > 0 then
-                report_lua("%a dumped into %a (%i bytes stripped)",luafile,lucfile,n)
-            else
-                report_lua("%a dumped into %a (unstripped)",luafile,lucfile)
-            end
-            cleanup = false -- better see how bad it is
-            done = true -- hm
-        end
-        if done and cleanup == true and lfs.isfile(lucfile) and lfs.isfile(luafile) then
+function luautilities.compile(luafile,lucfile,cleanup,strip,fallback) -- defaults: cleanup=false strip=true
+    report_lua("compiling %a into %a",luafile,lucfile)
+    os.remove(lucfile)
+    local done = stupidcompile(luafile,lucfile,strip ~= false)
+    if done then
+        report_lua("dumping %a into %a stripped",luafile,lucfile)
+        if cleanup == true and lfs.isfile(lucfile) and lfs.isfile(luafile) then
             report_lua("removing %a",luafile)
             os.remove(luafile)
         end
-        return done
     end
+    return done
+end
 
-    luautilities.loadstripped = loadstring
-
+function luautilities.loadstripped(...)
+    local l = load(...)
+    if l then
+        return load(dump(l,true))
+    end
 end
 
 -- local getmetatable, type = getmetatable, type
diff --git a/lualibs-util-str.lua b/lualibs-util-str.lua
index 4890a11..6389957 100644
--- a/lualibs-util-str.lua
+++ b/lualibs-util-str.lua
@@ -618,7 +618,7 @@ local builder = Cs { "start",
     ["a"] = (prefix_any * P("a")) / format_a, -- %a => '...' (forces tostring)
     ["A"] = (prefix_any * P("A")) / format_A, -- %A => "..." (forces tostring)
     --
-    ["*"] = Cs(((1-P("%"))^1 + P("%%")/"%%%%")^1) / format_rest, -- rest (including %%)
+    ["*"] = Cs(((1-P("%"))^1 + P("%%")/"%%")^1) / format_rest, -- rest (including %%)
     --
     ["!"] = Carg(2) * prefix_any * P("!") * C((1-P("!"))^1) * P("!") / format_extension,
 }