fixed bug: regular expression literal pattern was failing to match certain productions right after the opening slash

Author: mikesamuel

README.html

@@ -74,8 +74,10 @@ <h3>Which languages does it work for?</h3>
     <a href="http://code.google.com/p/google-code-prettify/source/browse/trunk/src/lang-lisp.js"
      ><code>lang-lisp.js</code></a>.</p>
     <p>And similarly for <a href="http://code.google.com/p/google-code-prettify/source/browse/trunk/src/lang-lua.js"
-     ><code>LUA</code></a> and <a href="http://code.google.com/p/google-code-prettify/source/browse/trunk/src/lang-ml.js"
-     ><code>OCAML, SML, and F#</code></a>.
+     ><code>LUA</code></a>, <a href="http://code.google.com/p/google-code-prettify/source/browse/trunk/src/lang-ml.js"
+     ><code>OCAML, SML, F#</code></a>, and
+     <a href="http://code.google.com/p/google-code-prettify/source/browse/trunk/src/lang-sql.js"
+     ><code>SQL</code></a>.
 
     <p>If you'd like to add an extension for your favorite language, please
     look at lang-lisp.js and file an

src/prettify.js

@@ -514,6 +514,7 @@ function pr_isIE6() {
     })();
 
     var nPatterns = fallthroughStylePatterns.length;
+    var notWs = /\S/;
 
     return function (sourceCode, opt_basePos) {
       opt_basePos = opt_basePos || 0;
@@ -557,7 +558,7 @@ function pr_isIE6() {
         decorations.push(opt_basePos + pos, style);
         pos += token.length;
         tail = tail.substring(token.length);
-        if (style !== PR_COMMENT && /\S/.test(token)) { lastToken = token; }
+        if (style !== PR_COMMENT && notWs.test(token)) { lastToken = token; }
       }
       return decorations;
     };
@@ -677,16 +678,25 @@ function pr_isIE6() {
     }
     if (options.cStyleComments) {
       fallthroughStylePatterns.push([PR_COMMENT, /^\/\/[^\r\n]*/, null]);
-    }
-    if (options.regexLiterals) {
       fallthroughStylePatterns.push(
-          [PR_STRING,
-           /^\/(?:[^\\\*\/\[]|\\[\s\S]|\[(?:[^\]\\]|\\.)*(?:\]|$))+(?:\/|$)/,
-           REGEXP_PRECEDER_PATTERN]);
+          [PR_COMMENT, /^\/\*[\s\S]*?(?:\*\/|$)/, null]);
     }
-    if (options.cStyleComments) {
+    if (options.regexLiterals) {
+      var REGEX_LITERAL = (
+          // A regular expression literal starts with a slash that is
+          // not followed by * or / so that it is not confused with
+          // comments.
+          '^/(?=[^/*])'
+          // and then contains any number of raw characters,
+          + '(?:[^/\\x5B\\x5C]'
+          // escape sequences (\x5C),
+          +    '|\\x5C[\\s\\S]'
+          // or non-nesting character sets (\x5B\x5D);
+          +    '|\\x5B(?:[^\\x5C\\x5D]|\\x5C[\\s\\S])*(?:\\x5D|$))+'
+          // finally closed by a /.
+          + '(?:/|$)');
       fallthroughStylePatterns.push(
-          [PR_COMMENT, /^\/\*[\s\S]*?(?:\*\/|$)/, null]);
+          [PR_STRING, new RegExp(REGEX_LITERAL), REGEXP_PRECEDER_PATTERN]);
     }
 
     var keywords = wordSet(options.keywords);