bug 90: added rule to distinguish C preprocessor directives from comments

Author: [email protected]

src/prettify.js

@@ -952,8 +952,12 @@ window['_pr_isIE6'] = function () {
       if (options['cStyleComments']) {
         // Stop C preprocessor declarations at an unclosed open comment
         shortcutStylePatterns.push(
-            [PR_COMMENT, /^#(?:[^\r\n\/]|\/(?!\*)|\/\*[^\r\n]*?\*\/)*/,
+            [PR_COMMENT, /^#(?:(?:define|elif|else|endif|error|ifdef|include|ifndef|line|pragma|undef|warning)\b|[^\r\n]*)/,
              null, '#']);
+        fallthroughStylePatterns.push(
+            [PR_STRING,
+             /^<(?:(?:(?:\.\.\/)*|\/?)(?:[\w-]+(?:\/[\w-]+)+)?[\w-]+\.h|[a-z]\w*)>/,
+             null]);
       } else {
         shortcutStylePatterns.push([PR_COMMENT, /^#[^\r\n]*/, null, '#']);
       }

tests/prettify_test.html

@@ -1127,7 +1127,7 @@ <h1>Issue 93 -- C# verbatim strings</h1>
           '`PUN/*`END`PLNhead `END`PUN-`END`LIT10`END`PLN `END`PUN|`END' +
           '`PLN tail `END`PUN-`END`LIT1`END'),
   C: (
-      '`COM#include &lt;stdio.h&gt;`END`PLN<br>' +
+      '`COM#include`END`PLN `END`STR&lt;stdio.h&gt;`END`PLN<br>' +
       '<br>' +
       '`END`COM/* the n-th fibonacci number.<br>' +
       '&nbsp;*\/`END`PLN<br>' +
@@ -1153,7 +1153,7 @@ <h1>Issue 93 -- C# verbatim strings</h1>
           '`LIT10`END`PUN));`END`PLN<br>' +
       '`END`PUN}`END'),
   C_lang: (
-      '`COM#include &lt;stdio.h&gt;`END`PLN<br>' +
+      '`COM#include`END`PLN `END`STR&lt;stdio.h&gt;`END`PLN<br>' +
       '<br>' +
       '`END`COM/* the n`END<sup>`COMth`END<\/sup>`COM fibonacci number. *\/`END`PLN<br>' +
       '`END`KWDunsigned`END`PLN `END`KWDint`END`PLN fib`END`PUN(`END' +
@@ -1178,10 +1178,10 @@ <h1>Issue 93 -- C# verbatim strings</h1>
           '`LIT10`END`PUN));`END`PLN<br>' +
       '`END`PUN}`END`PLN<br>' +
       '<br>' +
-      '`END`COM#define ZERO 0 /* a<br>' +
+      '`END`COM#define`END`PLN ZERO `END`LIT0`END`PLN `END`COM/* a<br>' +
       '&nbsp; multiline comment */`END'),
   Cpp: (
-      '`COM#include &lt;iostream&gt;`END`PLN<br>' +
+      '`COM#include`END`PLN `END`STR&lt;iostream&gt;`END`PLN<br>' +
       '<br>' +
       '`END`KWDusing`END`PLN `END`KWDnamespace`END`PLN std`END`PUN;`END' +
           '`PLN<br>' +
@@ -1216,7 +1216,7 @@ <h1>Issue 93 -- C# verbatim strings</h1>
       '`END`PUN}`END'),
 
   Cpp_lang: (
-      '`COM#include &lt;iostream&gt;`END`PLN<br>' +
+      '`COM#include`END`PLN `END`STR&lt;iostream&gt;`END`PLN<br>' +
       '<br>' +
       '`END`KWDusing`END`PLN `END`KWDnamespace`END`PLN std`END`PUN;`END' +
           '`PLN<br>' +