jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Pegs: fixes edge case

Browse source
This commit is contained in:
Andreas Rumpf 2016-05-12 01:36:23 +02:00
commit c02963bcea
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/pure/pegs.nim
View file

@ -659,7 +659,7 @@ proc rawMatch*(s: string, p: Peg, start: int, c: var Captures): int {.
of pkSearch: of pkSearch:
var oldMl = c.ml var oldMl = c.ml
result = 0 result = 0
while start+result < s.len: while start+result <= s.len:
var x = rawMatch(s, p.sons[0], start+result, c) var x = rawMatch(s, p.sons[0], start+result, c)
if x >= 0: if x >= 0:
inc(result, x) inc(result, x)
@ -671,7 +671,7 @@ proc rawMatch*(s: string, p: Peg, start: int, c: var Captures): int {.
var idx = c.ml # reserve a slot for the subpattern var idx = c.ml # reserve a slot for the subpattern
inc(c.ml) inc(c.ml)
result = 0 result = 0
while start+result < s.len: while start+result <= s.len:
var x = rawMatch(s, p.sons[0], start+result, c) var x = rawMatch(s, p.sons[0], start+result, c)
if x >= 0: if x >= 0:
if idx < MaxSubpatterns: if idx < MaxSubpatterns:
@ -1848,3 +1848,7 @@ when isMainModule:
assert("Var1=key1;var2=Key2; VAR3". assert("Var1=key1;var2=Key2; VAR3".
replace(peg"{\ident}('='{\ident})* ';'* \s*", replace(peg"{\ident}('='{\ident})* ';'* \s*",
handleMatches)=="var1: 'key1', var2: 'Key2', var3: ''") handleMatches)=="var1: 'key1', var2: 'Key2', var3: ''")
doAssert "test1".match(peg"""{@}$""")
doAssert "test2".match(peg"""{(!$ .)*} $""")