sync with Context as of 2014-12-11

1 files changed, 17 insertions, 7 deletions

diff --git a/lualibs-util-prs.lua b/lualibs-util-prs.lua
index f51f6fc..642968c 100644
--- a/lualibs-util-prs.lua
+++ b/lualibs-util-prs.lua
@@ -275,15 +275,25 @@ function parsers.array_to_string(a,separator)
     end
 end
 
-function parsers.settings_to_set(str,t) -- tohash? -- todo: lpeg -- duplicate anyway
-    t = t or { }
---  for s in gmatch(str,"%s*([^, ]+)") do -- space added
-    for s in gmatch(str,"[^, ]+") do -- space added
-        t[s] = true
-    end
-    return t
+-- function parsers.settings_to_set(str,t) -- tohash? -- todo: lpeg -- duplicate anyway
+--     if str then
+--         t = t or { }
+--         for s in gmatch(str,"[^, ]+") do -- space added
+--             t[s] = true
+--         end
+--         return t
+--     else
+--         return { }
+--     end
+-- end
+
+local pattern = Cf(Ct("") * Cg(C((1-S(", "))^1) * S(", ")^0 * Cc(true))^1,rawset)
+
+function utilities.parsers.settings_to_set(str,t)
+    return str and lpegmatch(pattern,str) or { }
 end
 
+
 function parsers.simple_hash_to_string(h, separator)
     local t, tn = { }, 0
     for k, v in sortedhash(h) do