diff options
| author | Marius <mariausol@gmail.com> | 2012-12-11 00:40:14 +0200 |
|---|---|---|
| committer | Marius <mariausol@gmail.com> | 2012-12-11 00:40:14 +0200 |
| commit | 1c36d2cc9c25d74a806ee74c0ee28da32d5e84ba (patch) | |
| tree | fe67fa0cb5d1434cd2f2f1341cc3130de1bcb3ff /tex/context/base/l-lpeg.lua | |
| parent | 45aa3c0c4dd2d875264c93fade53a7a28f76bac7 (diff) | |
| download | context-1c36d2cc9c25d74a806ee74c0ee28da32d5e84ba.tar.gz | |
beta 2012.12.10 23:20
Diffstat (limited to 'tex/context/base/l-lpeg.lua')
| -rw-r--r-- | tex/context/base/l-lpeg.lua | 26 |
1 files changed, 24 insertions, 2 deletions
diff --git a/tex/context/base/l-lpeg.lua b/tex/context/base/l-lpeg.lua index c461df1ce..a5fdec765 100644 --- a/tex/context/base/l-lpeg.lua +++ b/tex/context/base/l-lpeg.lua @@ -443,7 +443,8 @@ function lpeg.replacer(one,two,makefunction) elseif no == 1 then local o = one[1] one, two = P(o[1]), o[2] - pattern = Cs(((1-one)^1 + one/two)^0) + -- pattern = Cs(((1-one)^1 + one/two)^0) + pattern = Cs((one/two + 1)^0) else for i=1,no do local o = one[i] @@ -454,7 +455,28 @@ function lpeg.replacer(one,two,makefunction) else one = P(one) two = two or "" - pattern = Cs(((1-one)^1 + one/two)^0) + -- pattern = Cs(((1-one)^1 + one/two)^0) + pattern = Cs((one/two +1)^0) + end + if makefunction then + return function(str) + return lpegmatch(pattern,str) + end + else + return pattern + end +end + +function lpeg.finder(lst,makefunction) + local pattern + if type(lst) == "table" then + local p = P(false) + for i=1,#lst do + p = p + P(lst[i]) + end + pattern = (p + 1)^0 + else + pattern = (P(lst) + 1)^0 end if makefunction then return function(str) |