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

c2nim, pas2nim compile again

Browse source
This commit is contained in:
Araq 2013-05-07 17:19:36 +02:00
commit d97504d6ef
2 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

16
compiler/c2nim/clex.nim
View file

@ -13,7 +13,7 @@
import import
options, msgs, strutils, platform, lexbase, llstream options, msgs, strutils, platform, nimlexbase, llstream
const const
MaxLineLength* = 80 # lines longer than this lead to a warning MaxLineLength* = 80 # lines longer than this lead to a warning
@ -338,8 +338,8 @@ proc getNumber(L: var TLexer, tok: var TToken) =
proc HandleCRLF(L: var TLexer, pos: int): int = proc HandleCRLF(L: var TLexer, pos: int): int =
case L.buf[pos] case L.buf[pos]
of CR: result = lexbase.HandleCR(L, pos) of CR: result = nimlexbase.HandleCR(L, pos)
of LF: result = lexbase.HandleLF(L, pos) of LF: result = nimlexbase.HandleLF(L, pos)
else: result = pos else: result = pos
proc escape(L: var TLexer, tok: var TToken, allowEmpty=false) = proc escape(L: var TLexer, tok: var TToken, allowEmpty=false) =
@ -405,10 +405,10 @@ proc getString(L: var TLexer, tok: var TToken) =
Inc(pos) Inc(pos)
break break
of CR: of CR:
pos = lexbase.HandleCR(L, pos) pos = nimlexbase.HandleCR(L, pos)
buf = L.buf buf = L.buf
of LF: of LF:
pos = lexbase.HandleLF(L, pos) pos = nimlexbase.HandleLF(L, pos)
buf = L.buf buf = L.buf
of lexbase.EndOfFile: of lexbase.EndOfFile:
var line2 = L.linenumber var line2 = L.linenumber
@ -449,7 +449,7 @@ proc scanLineComment(L: var TLexer, tok: var TToken) =
while true: while true:
inc(pos, 2) # skip // inc(pos, 2) # skip //
add(tok.s, '#') add(tok.s, '#')
while not (buf[pos] in {CR, LF, lexbase.EndOfFile}): while not (buf[pos] in {CR, LF, nimlexbase.EndOfFile}):
add(tok.s, buf[pos]) add(tok.s, buf[pos])
inc(pos) inc(pos)
pos = handleCRLF(L, pos) pos = handleCRLF(L, pos)
@ -490,7 +490,7 @@ proc scanStarComment(L: var TLexer, tok: var TToken) =
break break
else: else:
add(tok.s, '*') add(tok.s, '*')
of lexbase.EndOfFile: of nimlexbase.EndOfFile:
lexMessage(L, errTokenExpected, "*/") lexMessage(L, errTokenExpected, "*/")
else: else:
add(tok.s, buf[pos]) add(tok.s, buf[pos])
@ -743,7 +743,7 @@ proc getTok(L: var TLexer, tok: var TToken) =
getDirective(L, tok) getDirective(L, tok)
of '"': getString(L, tok) of '"': getString(L, tok)
of '\'': getCharLit(L, tok) of '\'': getCharLit(L, tok)
of lexbase.EndOfFile: of nimlexbase.EndOfFile:
tok.xkind = pxEof tok.xkind = pxEof
else: else:
tok.s = $c tok.s = $c

16
compiler/pas2nim/paslex.nim
View file

@ -11,7 +11,7 @@
# the scanner module. # the scanner module.
import import
hashes, options, msgs, strutils, platform, idents, lexbase, llstream hashes, options, msgs, strutils, platform, idents, nimlexbase, llstream
const const
MaxLineLength* = 80 # lines longer than this lead to a warning MaxLineLength* = 80 # lines longer than this lead to a warning
@ -273,8 +273,8 @@ proc getNumber10(L: var TLexer, tok: var TToken) =
proc HandleCRLF(L: var TLexer, pos: int): int = proc HandleCRLF(L: var TLexer, pos: int): int =
case L.buf[pos] case L.buf[pos]
of CR: result = lexbase.HandleCR(L, pos) of CR: result = nimlexbase.HandleCR(L, pos)
of LF: result = lexbase.HandleLF(L, pos) of LF: result = nimlexbase.HandleLF(L, pos)
else: result = pos else: result = pos
proc getString(L: var TLexer, tok: var TToken) = proc getString(L: var TLexer, tok: var TToken) =
@ -286,7 +286,7 @@ proc getString(L: var TLexer, tok: var TToken) =
inc(pos) inc(pos)
while true: while true:
case buf[pos] case buf[pos]
of CR, LF, lexbase.EndOfFile: of CR, LF, nimlexbase.EndOfFile:
lexMessage(L, errClosingQuoteExpected) lexMessage(L, errClosingQuoteExpected)
break break
of '\'': of '\'':
@ -362,7 +362,7 @@ proc scanLineComment(L: var TLexer, tok: var TToken) =
while true: while true:
inc(pos, 2) # skip // inc(pos, 2) # skip //
add(tok.literal, '#') add(tok.literal, '#')
while not (buf[pos] in {CR, LF, lexbase.EndOfFile}): while not (buf[pos] in {CR, LF, nimlexbase.EndOfFile}):
add(tok.literal, buf[pos]) add(tok.literal, buf[pos])
inc(pos) inc(pos)
pos = handleCRLF(L, pos) pos = handleCRLF(L, pos)
@ -391,7 +391,7 @@ proc scanCurlyComment(L: var TLexer, tok: var TToken) =
of '}': of '}':
inc(pos) inc(pos)
break break
of lexbase.EndOfFile: lexMessage(L, errTokenExpected, "}") of nimlexbase.EndOfFile: lexMessage(L, errTokenExpected, "}")
else: else:
add(tok.literal, buf[pos]) add(tok.literal, buf[pos])
inc(pos) inc(pos)
@ -415,7 +415,7 @@ proc scanStarComment(L: var TLexer, tok: var TToken) =
break break
else: else:
add(tok.literal, '*') add(tok.literal, '*')
of lexbase.EndOfFile: of nimlexbase.EndOfFile:
lexMessage(L, errTokenExpected, "*)") lexMessage(L, errTokenExpected, "*)")
else: else:
add(tok.literal, buf[pos]) add(tok.literal, buf[pos])
@ -561,7 +561,7 @@ proc getTok(L: var TLexer, tok: var TToken) =
getNumber16(L, tok) getNumber16(L, tok)
of '%': of '%':
getNumber2(L, tok) getNumber2(L, tok)
of lexbase.EndOfFile: of nimlexbase.EndOfFile:
tok.xkind = pxEof tok.xkind = pxEof
else: else:
tok.literal = c & "" tok.literal = c & ""