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

Get rid of deprecation warnings in pegs

Browse source
This commit is contained in:
def 2015-01-16 00:23:33 +01:00
commit aae3c6c8b7
3 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/pure/pegs.nim
View file

@ -513,7 +513,7 @@ proc bounds*(c: Captures,
when not useUnicode: when not useUnicode:
type type
TRune = char Rune = char
template fastRuneAt(s, i, ch: expr) = template fastRuneAt(s, i, ch: expr) =
ch = s[i] ch = s[i]
inc(i) inc(i)

2
lib/pure/pegs.nimfix
View file

@ -514,7 +514,7 @@ proc bounds*(c: Captures,
when not useUnicode: when not useUnicode:
type type
TRune = char Rune = char
template fastRuneAt(s, i, ch: expr) = template fastRuneAt(s, i, ch: expr) =
ch = s[i] ch = s[i]
inc(i) inc(i)

26
tests/stdlib/tpegs.nim
View file

@ -533,7 +533,7 @@ proc bounds*(c: TCaptures,
when not useUnicode: when not useUnicode:
type type
TRune = char Rune = char
template fastRuneAt(s, i, ch: expr) = template fastRuneAt(s, i, ch: expr) =
ch = s[i] ch = s[i]
inc(i) inc(i)
@ -563,7 +563,7 @@ proc rawMatch*(s: string, p: TPeg, start: int, c: var TCaptures): int {.
result = -1 result = -1
of pkLetter: of pkLetter:
if s[start] != '\0': if s[start] != '\0':
var a: TRune var a: Rune
result = start result = start
fastRuneAt(s, result, a) fastRuneAt(s, result, a)
if isAlpha(a): dec(result, start) if isAlpha(a): dec(result, start)
@ -572,7 +572,7 @@ proc rawMatch*(s: string, p: TPeg, start: int, c: var TCaptures): int {.
result = -1 result = -1
of pkLower: of pkLower:
if s[start] != '\0': if s[start] != '\0':
var a: TRune var a: Rune
result = start result = start
fastRuneAt(s, result, a) fastRuneAt(s, result, a)
if isLower(a): dec(result, start) if isLower(a): dec(result, start)
@ -581,7 +581,7 @@ proc rawMatch*(s: string, p: TPeg, start: int, c: var TCaptures): int {.
result = -1 result = -1
of pkUpper: of pkUpper:
if s[start] != '\0': if s[start] != '\0':
var a: TRune var a: Rune
result = start result = start
fastRuneAt(s, result, a) fastRuneAt(s, result, a)
if isUpper(a): dec(result, start) if isUpper(a): dec(result, start)
@ -590,7 +590,7 @@ proc rawMatch*(s: string, p: TPeg, start: int, c: var TCaptures): int {.
result = -1 result = -1
of pkTitle: of pkTitle:
if s[start] != '\0': if s[start] != '\0':
var a: TRune var a: Rune
result = start result = start
fastRuneAt(s, result, a) fastRuneAt(s, result, a)
if isTitle(a): dec(result, start) if isTitle(a): dec(result, start)
@ -599,7 +599,7 @@ proc rawMatch*(s: string, p: TPeg, start: int, c: var TCaptures): int {.
result = -1 result = -1
of pkWhitespace: of pkWhitespace:
if s[start] != '\0': if s[start] != '\0':
var a: TRune var a: Rune
result = start result = start
fastRuneAt(s, result, a) fastRuneAt(s, result, a)
if isWhitespace(a): dec(result, start) if isWhitespace(a): dec(result, start)
@ -623,7 +623,7 @@ proc rawMatch*(s: string, p: TPeg, start: int, c: var TCaptures): int {.
of pkTerminalIgnoreCase: of pkTerminalIgnoreCase:
var var
i = 0 i = 0
a, b: TRune a, b: Rune
result = start result = start
while i < len(p.term): while i < len(p.term):
fastRuneAt(p.term, i, a) fastRuneAt(p.term, i, a)
@ -635,15 +635,15 @@ proc rawMatch*(s: string, p: TPeg, start: int, c: var TCaptures): int {.
of pkTerminalIgnoreStyle: of pkTerminalIgnoreStyle:
var var
i = 0 i = 0
a, b: TRune a, b: Rune
result = start result = start
while i < len(p.term): while i < len(p.term):
while true: while true:
fastRuneAt(p.term, i, a) fastRuneAt(p.term, i, a)
if a != TRune('_'): break if a != Rune('_'): break
while true: while true:
fastRuneAt(s, result, b) fastRuneAt(s, result, b)
if b != TRune('_'): break if b != Rune('_'): break
if toLower(a) != toLower(b): if toLower(a) != toLower(b):
result = -1 result = -1
break break
@ -865,7 +865,7 @@ template `=~`*(s: string, pattern: TPeg): expr =
## else: ## else:
## echo("syntax error") ## echo("syntax error")
## ##
when not definedInScope(matches): when not declaredInScope(matches):
var matches {.inject.}: array[0..MaxSubpatterns-1, string] var matches {.inject.}: array[0..MaxSubpatterns-1, string]
match(s, pattern, matches) match(s, pattern, matches)
@ -964,7 +964,7 @@ proc transformFile*(infile, outfile: string,
## error occurs. This is supposed to be used for quick scripting. ## error occurs. This is supposed to be used for quick scripting.
var x = readFile(infile) var x = readFile(infile)
if not isNil(x): if not isNil(x):
var f: TFile var f: File
if open(f, outfile, fmWrite): if open(f, outfile, fmWrite):
write(f, x.parallelReplace(subs)) write(f, x.parallelReplace(subs))
close(f) close(f)
@ -1404,7 +1404,7 @@ proc arrowIsNextTok(c: TPegLexer): bool =
# ----------------------------- parser ---------------------------------------- # ----------------------------- parser ----------------------------------------
type type
EInvalidPeg* = object of EInvalidValue ## raised if an invalid EInvalidPeg* = object of ValueError ## raised if an invalid
## PEG has been detected ## PEG has been detected
TPegParser = object of TPegLexer ## the PEG parser object TPegParser = object of TPegLexer ## the PEG parser object
tok: TToken tok: TToken