[clojure mode] Use a regular expression for matching number literals.

Clojure mode is now capable of syntax highlighting all kinds of number
literals in Clojure.

Author: Abdussalam Abdurrahman

mode/clojure/clojure.js

@@ -127,11 +127,8 @@ CodeMirror.defineMode("clojure", function (options) {
     var coreSymbols = makeKeywords(commonCoreSymbols);
     var indentSymbols = makeKeywords(commonIndentSymbols);
 
+    var numberLiteral = /^[+\-]?\d+(?:(?:N|(?:[eE][+\-]?\d+))|(?:\.?\d*(?:M|(?:[eE][+\-]?\d+))?)|\/\d+|[xX][0-9a-fA-F]+|r[0-9a-zA-Z]+)?/;
     var tests = {
-        digit: /\d/,
-        hex: /[0-9a-f]/i,
-        sign: /[+-]/,
-        exponent: /e/i,
         keyword_char: /[^\s;()\[\]{}]/,
         symbol: /[\w*+!\-._?:<>\/'\xa1-\uffff]/,
         block_indent: /^(?:def|with)[^\/]+$|\/(?:def|with)/
@@ -151,42 +148,6 @@ CodeMirror.defineMode("clojure", function (options) {
         state.indentStack = state.indentStack.prev;
     }
 
-    function isNumber(ch, stream){
-        // hex
-        if ( ch === '0' && stream.eat(/x/i) ) {
-            stream.eatWhile(tests.hex);
-            return true;
-        }
-
-        // leading sign
-        if ( ( ch == '+' || ch == '-' ) && ( tests.digit.test(stream.peek()) ) ) {
-          stream.eat(tests.sign);
-          ch = stream.next();
-        }
-
-        if ( tests.digit.test(ch) ) {
-            stream.eat(ch);
-            stream.eatWhile(tests.digit);
-
-            if ( '.' == stream.peek() ) {
-                stream.eat('.');
-                stream.eatWhile(tests.digit);
-            } else if ('/' == stream.peek() ) {
-                stream.eat('/');
-                stream.eatWhile(tests.digit);
-            }
-
-            if ( stream.eat(tests.exponent) ) {
-                stream.eat(tests.sign);
-                stream.eatWhile(tests.digit);
-            }
-
-            return true;
-        }
-
-        return false;
-    }
-
     // Eat character that starts after backslash \
     function eatCharacter(stream) {
         var first = stream.next();
@@ -236,6 +197,10 @@ CodeMirror.defineMode("clojure", function (options) {
                     returnType = STRING; // continue on in string mode
                     break;
                 default: // default parsing mode
+                    if (stream.match(numberLiteral)) {
+                        return NUMBER;
+                    }
+
                     var ch = stream.next();
 
                     if (ch == "\"") {
@@ -249,8 +214,6 @@ CodeMirror.defineMode("clojure", function (options) {
                     } else if (ch == ";") { // comment
                         stream.skipToEnd(); // rest of the line is a comment
                         returnType = COMMENT;
-                    } else if (isNumber(ch,stream)){
-                        returnType = NUMBER;
                     } else if (ch == "(" || ch == "[" || ch == "{" ) {
                         var keyWord = '', indentTemp = stream.column(), letter;
                         /**

mode/clojure/test.js

@@ -23,23 +23,27 @@
 
     MT("numbers",
         "[number 42] [number +42] [number -421]",
-        // FIXME
-        // "[number 42N] [number +42N] [number -42N]",
+        "[number 42N] [number +42N] [number -42N]",
         "[number 0.42] [number +0.42] [number -0.42]",
-        // FIXME
-        // "[number 42M] [number +42M] [number -42M]",
-        // "[number 42.42M] [number +42.42M] [number -42.42M]",
+        "[number 42M] [number +42M] [number -42M]",
+        "[number 42.42M] [number +42.42M] [number -42.42M]",
         "[number 1/42] [number +1/42] [number -1/42]",
-        "[number 0x420f]",
-        // FIXME
-        // "[number +0x420f] [number -0x420f]",
+        "[number 0x42af] [number +0x42af] [number -0x42af]",
+        "[number 0x42AF] [number +0x42AF] [number -0x42AF]",
         "[number 1e2] [number 1e+2] [number 1e-2]",
         "[number +1e2] [number +1e+2] [number +1e-2]",
         "[number -1e2] [number -1e+2] [number -1e-2]",
-        "[number -1.0e2] [number -0.1e+2] [number -1.01e-2]"
-        // FIXME
-        // "[number 2r101010] [number +2r101010] [number -2r101010]",
-        // "[number 8r52] [number +8r52] [number -8r52]"
+        "[number -1.0e2] [number -0.1e+2] [number -1.01e-2]",
+        "[number 1E2] [number 1E+2] [number 1E-2]",
+        "[number +1E2] [number +1E+2] [number +1E-2]",
+        "[number -1E2] [number -1E+2] [number -1E-2]",
+        "[number -1.0E2] [number -0.1E+2] [number -1.01E-2]",
+        "[number 2r101010] [number +2r101010] [number -2r101010]",
+        "[number 2r101010] [number +2r101010] [number -2r101010]",
+        "[number 8r52] [number +8r52] [number -8r52]",
+        "[number 36rhello] [number +36rhello] [number -36rhello]",
+        "[number 36rz] [number +36rz] [number -36rz]",
+        "[number 36rZ] [number +36rZ] [number -36rZ]"
     );
 
     MT("characters",
@@ -522,15 +526,15 @@
     );
 
     MT("should indent with-precision",
-        "[bracket (][keyword with-precision] [number 10] [bracket (][keyword /] [number 1][variable M] [number 3][bracket ))]",
+        "[bracket (][keyword with-precision] [number 10] [bracket (][keyword /] [number 1M] [number 3][bracket ))]",
         "",
-        "[bracket (][keyword with-precision] [number 10] [atom :rounding] [variable HALF_DOWN] [bracket (][keyword /] [number 1][variable M] [number 3][bracket ))]",
+        "[bracket (][keyword with-precision] [number 10] [atom :rounding] [variable HALF_DOWN] [bracket (][keyword /] [number 1M] [number 3][bracket ))]",
         "",
         "[bracket (][keyword with-precision]",
         "  [number 10]",
         "  [atom :rounding]",
         "  [variable HALF_DOWN]",
-        "  [bracket (][keyword /] [number 1][variable M] [number 3][bracket ))]"
+        "  [bracket (][keyword /] [number 1M] [number 3][bracket ))]"
     );
 
     MT("should indent when",