Speedup C scanner (reordering of token rules).

korny · korny · commit ab491380bb3b · 2011-04-04T10:35:53.000Z
diff --git a/lib/coderay/scanners/c.rb b/lib/coderay/scanners/c.rb
@@ -65,10 +65,6 @@ def scan_tokens encoder, options
           elsif match = scan(%r! // [^\n\\]* (?: \\. [^\n\\]* )* | /\* (?: .*? \*/ | .* ) !mx)
             encoder.text_token match, :comment
 
-          elsif match = scan(/ \# \s* if \s* 0 /x)
-            match << scan_until(/ ^\# (?:elif|else|endif) .*? $ | \z /xm) unless eos?
-            encoder.text_token match, :comment
-
           elsif match = scan(/ [-+*=<>?:;,!&^|()\[\]{}~%]+ | \/=? | \.(?!\d) /x)
             label_expected = match =~ /[;\{\}]/
             if case_expected
@@ -93,9 +89,6 @@ def scan_tokens encoder, options
             end
             encoder.text_token match, kind
 
-          elsif match = scan(/\$/)
-            encoder.text_token match, :ident
-          
           elsif match = scan(/L?"/)
             encoder.begin_group :string
             if match[0] == ?L
@@ -105,6 +98,10 @@ def scan_tokens encoder, options
             encoder.text_token match, :delimiter
             state = :string
 
+          elsif match = scan(/ \# \s* if \s* 0 /x)
+            match << scan_until(/ ^\# (?:elif|else|endif) .*? $ | \z /xm) unless eos?
+            encoder.text_token match, :comment
+
           elsif match = scan(/#[ \t]*(\w*)/)
             encoder.text_token match, :preprocessor
             in_preproc_line = true
@@ -115,6 +112,9 @@ def scan_tokens encoder, options
             label_expected = false
             encoder.text_token match, :char
 
+          elsif match = scan(/\$/)
+            encoder.text_token match, :ident
+          
           elsif match = scan(/0[xX][0-9A-Fa-f]+/)
             label_expected = false
             encoder.text_token match, :hex
