Merge pull request #60 from tfoleyNV/revise-rewriter

Revise rewriter

1 files changed, 3 insertions, 3 deletions

diff --git a/source/slang/lexer.cpp b/source/slang/lexer.cpp
index 2d75e1900..d8211fb20 100644
--- a/source/slang/lexer.cpp
+++ b/source/slang/lexer.cpp
@@ -517,7 +517,7 @@ namespace Slang
                 if(base > 10)
                 {
                     cursor++;
-                    return c - 'a';
+                    return 10 + c - 'a';
                 }
                 return -1;
 
@@ -525,7 +525,7 @@ namespace Slang
                 if(base > 10)
                 {
                     cursor++;
-                    return c - 'A';
+                    return 10 + c - 'A';
                 }
                 return -1;
             }
@@ -957,7 +957,7 @@ namespace Slang
                 switch(peek(lexer))
                 {
                 default:
-                    return TokenType::IntegerLiteral;
+                    return maybeLexNumberSuffix(lexer, TokenType::IntegerLiteral);
 
                 case '.':
                     advance(lexer);