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

Modify pegs.nim such that no match will return nil

Browse source 
An empty match will return ""
A zero-length match will return nil

Add test cases

Add news information
This commit is contained in:
Flaviu Tamas 2014-10-21 16:49:29 -04:00
commit bc3464ede7
2 changed files with 19 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

18
lib/pure/pegs.nim
View file

@ -737,7 +737,12 @@ proc rawMatch*(s: string, p: Peg, start: int, c: var Captures): int {.
template fillMatches(s, caps, c: expr) =
for k in 0..c.ml-1:
caps[k] = substr(s, c.matches[k][0], c.matches[k][1])
let startIdx = c.matches[k][0]
let endIdx = c.matches[k][1]
if startIdx != -1:
caps[k] = substr(s, startIdx, endIdx)
else:
caps[k] = nil
proc match*(s: string, pattern: Peg, matches: var openArray[string],
start = 0): bool {.nosideEffect, rtl, extern: "npegs$1Capture".} =
@ -1767,3 +1772,14 @@ when isMainModule:
assert match("prefix/start", peg"^start$", 7)
if "foo" =~ peg"{'a'}?.*":
assert matches[0] == nil
else: assert false
if "foo" =~ peg"{''}.*":
assert matches[0] == ""
else: assert false
if "foo" =~ peg"{'foo'}":
assert matches[0] == "foo"
else: assert false