diff options
| -rwxr-xr-x | rod/scanner.nim | 33 | ||||
| -rwxr-xr-x | tests/tunderscores.nim | 7 | ||||
| -rwxr-xr-x | web/news.txt | 3 |
3 files changed, 36 insertions, 7 deletions
diff --git a/rod/scanner.nim b/rod/scanner.nim index 8ee7d44b4..dd6bedac4 100755 --- a/rod/scanner.nim +++ b/rod/scanner.nim @@ -136,7 +136,7 @@ proc closeLexer*(lex: var TLexer) proc PrintTok*(tok: PToken) proc tokToStr*(tok: PToken): string -proc lexMessage*(L: TLexer, msg: TMsgKind, arg: string = "") +proc lexMessage*(L: TLexer, msg: TMsgKind, arg = "") # the Pascal scanner uses this too: proc fillToken*(L: var TToken) # implementation @@ -146,8 +146,13 @@ proc isKeyword(kind: TTokType): bool = proc isNimrodIdentifier*(s: string): bool = if s[0] in SymStartChars: - for c in items(s): - if c notin SymChars+{'_'}: return + var i = 1 + while i < s.len: + if s[i] == '_': + inc(i) + if s[i] notin SymChars: return + if s[i] notin SymChars: return + inc(i) result = true proc pushInd(L: var TLexer, indent: int) = @@ -214,15 +219,14 @@ proc getColumn(L: TLexer): int = proc getLineInfo(L: TLexer): TLineInfo = result = newLineInfo(L.filename, L.linenumber, getColNumber(L, L.bufpos)) -proc lexMessage(L: TLexer, msg: TMsgKind, arg: string = "") = +proc lexMessage(L: TLexer, msg: TMsgKind, arg = "") = msgs.liMessage(getLineInfo(L), msg, arg) -proc lexMessagePos(L: var TLexer, msg: TMsgKind, pos: int, arg: string = "") = +proc lexMessagePos(L: var TLexer, msg: TMsgKind, pos: int, arg = "") = var info = newLineInfo(L.filename, L.linenumber, pos - L.lineStart) msgs.liMessage(info, msg, arg) proc matchUnderscoreChars(L: var TLexer, tok: var TToken, chars: TCharSet) = - # matches ([chars]_)* var pos = L.bufpos # use registers for pos, buf var buf = L.buf while true: @@ -232,6 +236,9 @@ proc matchUnderscoreChars(L: var TLexer, tok: var TToken, chars: TCharSet) = else: break if buf[pos] == '_': + if buf[pos+1] notin chars: + lexMessage(L, errInvalidToken, "_") + break add(tok.literal, '_') Inc(pos) L.bufPos = pos @@ -316,6 +323,9 @@ proc GetNumber(L: var TLexer): TToken = lexMessage(L, errInvalidNumber, result.literal) inc(pos) of '_': + if L.buf[pos+1] notin {'0'..'1'}: + lexMessage(L, errInvalidToken, "_") + break inc(pos) of '0', '1': xi = `shl`(xi, 1) or (ord(L.buf[pos]) - ord('0')) @@ -329,6 +339,9 @@ proc GetNumber(L: var TLexer): TToken = lexMessage(L, errInvalidNumber, result.literal) inc(pos) of '_': + if L.buf[pos+1] notin {'0'..'7'}: + lexMessage(L, errInvalidToken, "_") + break inc(pos) of '0'..'7': xi = `shl`(xi, 3) or (ord(L.buf[pos]) - ord('0')) @@ -344,6 +357,9 @@ proc GetNumber(L: var TLexer): TToken = lexMessage(L, errInvalidNumber, result.literal) inc(pos) of '_': + if L.buf[pos+1] notin {'0'..'9', 'a'..'f', 'A'..'F'}: + lexMessage(L, errInvalidToken, "_") + break inc(pos) of '0'..'9': xi = `shl`(xi, 4) or (ord(L.buf[pos]) - ord('0')) @@ -551,7 +567,10 @@ proc getSymbol(L: var TLexer, tok: var TToken) = h = h +% Ord(c) h = h +% h shl 10 h = h xor (h shr 6) - of '_': nil + of '_': + if buf[pos+1] notin SymChars: + lexMessage(L, errInvalidToken, "_") + return else: break Inc(pos) h = h +% h shl 3 diff --git a/tests/tunderscores.nim b/tests/tunderscores.nim new file mode 100755 index 000000000..459cfda30 --- /dev/null +++ b/tests/tunderscores.nim @@ -0,0 +1,7 @@ +# Bug #502670 + +var ef_ = 3 #ERROR_MSG invalid token: _ +var a__b = 1 +var c___d = 2 +echo(ab, cd, ef_) + diff --git a/web/news.txt b/web/news.txt index 234edc5aa..5ab91ccd3 100755 --- a/web/news.txt +++ b/web/news.txt @@ -8,6 +8,7 @@ News Bugfixes -------- - The Posix version of ``os.copyFile`` has better error handling. +- Fixed bug #502670 (underscores in identifiers). Additions @@ -21,6 +22,8 @@ Additions - Many wrappers now do not contain redundant name prefixes (like ``GTK_``, ``lua``). The new wrappers are available in ``lib/newwrap``. Change your configuration file to use these. +- Triple quoted strings allow for ``"`` in more contexts. +- ``""`` within raw string literals stands for a single quotation mark. - More extensive subscript operator overloading. See ``_ for further information. |