diff options
| -rw-r--r-- | compiler/ast.nim | 2 | ||||
| -rw-r--r-- | compiler/lexer.nim | 4 | ||||
| -rw-r--r-- | tests/misc/tlowhigh.nim | 6 |
3 files changed, 10 insertions, 2 deletions
diff --git a/compiler/ast.nim b/compiler/ast.nim index 48e8afa67..62a3492cc 100644 --- a/compiler/ast.nim +++ b/compiler/ast.nim @@ -1660,6 +1660,8 @@ proc getInt64*(a: PNode): int64 {.deprecated: "use getInt".} = proc getFloat*(a: PNode): BiggestFloat = case a.kind of nkFloatLiterals: result = a.floatVal + of nkCharLit, nkUIntLit..nkUInt64Lit, nkIntLit..nkInt64Lit: + result = BiggestFloat a.intVal else: raiseRecoverableError("cannot extract number from invalid AST node") #doAssert false, "getFloat" diff --git a/compiler/lexer.nim b/compiler/lexer.nim index 4bf50a359..c2b95c481 100644 --- a/compiler/lexer.nim +++ b/compiler/lexer.nim @@ -864,7 +864,9 @@ proc getCharacter(L: var TLexer, tok: var TToken) = inc(L.bufpos) # skip ' var c = L.buf[L.bufpos] case c - of '\0'..pred(' '), '\'': lexMessage(L, errGenerated, "invalid character literal") + of '\0'..pred(' '), '\'': + lexMessage(L, errGenerated, "invalid character literal") + tok.literal = $c of '\\': getEscapedChar(L, tok) else: tok.literal = $c diff --git a/tests/misc/tlowhigh.nim b/tests/misc/tlowhigh.nim index 61a7bfaed..76f298a4a 100644 --- a/tests/misc/tlowhigh.nim +++ b/tests/misc/tlowhigh.nim @@ -11,4 +11,8 @@ var y: range[-1'f64..1'f64] doAssert y.low == -1'f64 doAssert y.high == 1'f64 doAssert y.type.low == -1'f64 -doAssert y.type.high == 1'f64 \ No newline at end of file +doAssert y.type.high == 1'f64 + +# bug #11972 +var num: uint8 +doAssert num.high.float == 255.0 |