From 44ba990b30247a129dbb8b12e8c8154e37b5eb33 Mon Sep 17 00:00:00 2001
From: Philipp Gesang <phg42.2a@gmail.com>
Date: Mon, 4 Nov 2013 15:19:10 +0100
Subject: sync with Context as of 2013-11-04

---
 lualibs-util-prs.lua | 36 ++++++++++++++++++++++++++++++++++--
 lualibs-util-str.lua | 12 +++++++++++-
 2 files changed, 45 insertions(+), 3 deletions(-)

diff --git a/lualibs-util-prs.lua b/lualibs-util-prs.lua
index 7a8c3ce..29a57e0 100644
--- a/lualibs-util-prs.lua
+++ b/lualibs-util-prs.lua
@@ -40,8 +40,8 @@ local newline     = lpegpatterns.newline
 local anything    = lpegpatterns.anything
 local endofstring = lpegpatterns.endofstring
 
-local nobrace     = 1 - ( lbrace  + rbrace )
-local noparent    = 1 - ( lparent + rparent)
+local nobrace     = 1 - (lbrace  + rbrace )
+local noparent    = 1 - (lparent + rparent)
 
 -- we could use a Cf Cg construct
 
@@ -189,6 +189,38 @@ function parsers.settings_to_array(str,strict)
     end
 end
 
+-- this one also strips end spaces before separators
+--
+-- "{123} , 456  " -> "123" "456"
+
+local separator = space^0 * comma * space^0
+local value     = P(lbrace * C((nobrace + nestedbraces)^0) * rbrace)
+                + C((nestedbraces + (1-(space^0*(comma+P(-1)))))^0)
+local withvalue = Carg(1) * value / function(f,s) return f(s) end
+local pattern_a = spaces * Ct(value*(separator*value)^0)
+local pattern_b = spaces * withvalue * (separator*withvalue)^0
+
+function parsers.stripped_settings_to_array(str)
+    if not str or str == "" then
+        return { }
+    else
+        return lpegmatch(pattern_a,str)
+    end
+end
+
+function parsers.process_stripped_settings(str,action)
+    if not str or str == "" then
+        return { }
+    else
+        return lpegmatch(pattern_b,str,1,action)
+    end
+end
+
+-- parsers.process_stripped_settings("{123} , 456  ",function(s) print("["..s.."]") end)
+-- parsers.process_stripped_settings("123 , 456  ",function(s) print("["..s.."]") end)
+
+--
+
 local function set(t,v)
     t[#t+1] = v
 end
diff --git a/lualibs-util-str.lua b/lualibs-util-str.lua
index 09fa26f..24a3f6e 100644
--- a/lualibs-util-str.lua
+++ b/lualibs-util-str.lua
@@ -614,6 +614,13 @@ end
 
 --
 
+local format_z = function(f)
+    n = n + (tonumber(f) or 1)
+    return "''" -- okay, not that efficient to append '' but a special case anyway
+end
+
+--
+
 local format_rest = function(s)
     return format("%q",s) -- catches " and \n and such
 end
@@ -671,6 +678,7 @@ local builder = Cs { "start",
               + V("A") -- new
               + V("j") + V("J") -- stripped e E
               + V("m") + V("M") -- new
+              + V("z") -- new
               --
               + V("*") -- ignores probably messed up %
             )
@@ -720,6 +728,8 @@ local builder = Cs { "start",
     ["m"] = (prefix_tab * P("m")) / format_m, -- %m => xxx.xxx.xxx,xx (optional prefix instead of .)
     ["M"] = (prefix_tab * P("M")) / format_M, -- %M => xxx,xxx,xxx.xx (optional prefix instead of ,)
     --
+    ["z"] = (prefix_any * P("z")) / format_z, -- %M => xxx,xxx,xxx.xx (optional prefix instead of ,)
+    --
     ["a"] = (prefix_any * P("a")) / format_a, -- %a => '...' (forces tostring)
     ["A"] = (prefix_any * P("A")) / format_A, -- %A => "..." (forces tostring)
     --
@@ -750,7 +760,7 @@ local function make(t,str)
         p = lpegmatch(builder,str,1,"..",t._extensions_) -- after this we know n
         if n > 0 then
             p = format(template,preamble,t._preamble_,arguments[n],p)
---                 print("builder>",p)
+--         print("builder>",p)
             f = loadstripped(p)()
         else
             f = function() return str end
-- 
cgit v1.2.3