Merge pull request #2061 from geraldalewis/uppercase_radix_prefixes

Issue #2060 Disallow uppercase radix prefixes and exponential notation

Author: jashkenas

lib/coffee-script/lexer.js

@@ -133,14 +133,18 @@ exports.Lexer = class Lexer
   numberToken: ->
     return 0 unless match = NUMBER.exec @chunk
     number = match[0]
+    if /[E]/.test number
+      @error "exponential notation must be indicated with a lowercase 'e'"
+    else if /[BOX]/.test number
+      @error "radix prefixes must be lowercase '#{number}'"
+    else if /^0[89]/.test number
+      @error "decimal literals '#{number}' must not be prefixed with '0'"
+    else if /^0[0-7]/.test number
+      @error "octal literals '#{number}' must be prefixed with '0o'"
     lexedLength = number.length
-    if nonStrictOctalLiteral = /^0\d+/.test number
-      dec = if /[89]/.test number then "\"#{number}\" " else ''
-      oct = if dec then '' else "\"#{number}\" "
-      @error "decimal literals #{dec}must not be prefixed with '0'; octal literals #{oct}must be prefixed with '0o'"
-    if octalLiteral = /0o([0-7]+)/i.exec number
+    if octalLiteral = /0o([0-7]+)/.exec number
       number = (parseInt octalLiteral[1], 8).toString()
-    if binaryLiteral = /0b([01]+)/i.exec number
+    if binaryLiteral = /0b([01]+)/.exec number
       number = (parseInt binaryLiteral[1], 2).toString()
     @token 'NUMBER', number
     lexedLength
@@ -596,9 +600,9 @@ IDENTIFIER = /// ^
 ///
 
 NUMBER     = ///
-  ^ 0x[\da-f]+ |              # hex
   ^ 0b[01]+    |              # binary
   ^ 0o[0-7]+   |              # octal
+  ^ 0x[\da-f]+ |              # hex
   ^ \d*\.?\d+ (?:e[+-]?\d+)?  # decimal
 ///i
 

src/lexer.coffee

@@ -15,7 +15,6 @@
 
 test "Parser recognises binary numbers", ->
   eq 4, 0b100
-  eq 5, 0B101
 
 # Decimal Integer Literals
 
@@ -57,12 +56,16 @@ test '#1168: leading floating point suppresses newline', ->
 
 test "Python-style octal literal notation '0o777'", ->
   eq 511, 0o777
-  eq 511, 0O777
   eq 1, 0o1
-  eq 1, 0O1
   eq 1, 0o00001
   eq parseInt('0777', 8), 0o777
   eq '777', 0o777.toString 8
   eq 4, 0o4.valueOf()
   eq Number::toString, 0o777['toString']
   eq Number::toString, 0o777.toString
+
+test "#2060: Disallow uppercase radix prefixes and exponential notation", ->
+  for char in ['b', 'o', 'x', 'e']
+    program = "0#{char}0"
+    doesNotThrow -> CoffeeScript.compile program, bare: yes
+    throws -> CoffeeScript.compile program.toUpperCase(), bare: yes