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

Revert 7f49364fd0 for nre

Browse source
This commit is contained in:
Flaviu Tamas 2018-11-18 20:25:59 -05:00
commit 22b3e9df27
No known key found for this signature in database
GPG key ID: D6BF32C876496756
4 changed files with 16 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

12
lib/impure/nre.nim
View file

@ -289,7 +289,7 @@ proc `[]`*(pattern: Captures, i: int): string =
let bounds = bounds.get
return pattern.str.substr(bounds.a, bounds.b)
else:
return ""
return nil
proc match*(pattern: RegexMatch): string =
return pattern.captures[-1]
@ -313,9 +313,9 @@ template toTableImpl(cond: untyped) {.dirty.} =
else:
result[key] = nextVal
proc toTable*(pattern: Captures, default: string = ""): Table[string, string] =
proc toTable*(pattern: Captures, default: string = nil): Table[string, string] =
result = initTable[string, string]()
toTableImpl(nextVal.len == 0)
toTableImpl(nextVal == nil)
proc toTable*(pattern: CaptureBounds, default = none(HSlice[int, int])):
Table[string, Option[HSlice[int, int]]] =
@ -334,13 +334,13 @@ template itemsImpl(cond: untyped) {.dirty.} =
iterator items*(pattern: CaptureBounds, default = none(HSlice[int, int])): Option[HSlice[int, int]] =
itemsImpl(nextVal.isNone)
iterator items*(pattern: Captures, default: string = ""): string =
itemsImpl(nextVal.len == 0)
iterator items*(pattern: Captures, default: string = nil): string =
itemsImpl(nextVal == nil)
proc toSeq*(pattern: CaptureBounds, default = none(HSlice[int, int])): seq[Option[HSlice[int, int]]] =
accumulateResult(pattern.items(default))
proc toSeq*(pattern: Captures, default: string = ""): seq[string] =
proc toSeq*(pattern: Captures, default: string = nil): seq[string] =
accumulateResult(pattern.items(default))
proc `$`*(pattern: RegexMatch): string =