Octal and binary literals are more appropriately converted to hex

disnet · Mar 28, 2012 · 22db7ae · 22db7ae
1 parent 6a88ce7
commit 22db7ae
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/lib/coffee-script/lexer.js b/lib/coffee-script/lexer.js
diff --git a/src/lexer.coffee b/src/lexer.coffee
@@ -142,10 +142,10 @@ exports.Lexer = class Lexer
     else if /^0\d+/.test number
       @error "octal literal '#{number}' must be prefixed with '0o'"
     lexedLength = number.length
-    if octalLiteral = /0o([0-7]+)/.exec number
-      number = (parseInt octalLiteral[1], 8).toString()
-    if binaryLiteral = /0b([01]+)/.exec number
-      number = (parseInt binaryLiteral[1], 2).toString()
+    if octalLiteral = /^0o([0-7]+)/.exec number
+      number = '0x' + (parseInt octalLiteral[1], 8).toString 16
+    if binaryLiteral = /^0b([01]+)/.exec number
+      number = '0x' + (parseInt binaryLiteral[1], 2).toString 16
     @token 'NUMBER', number
     lexedLength