Fix comments. Underscores in hex. Added binary.

hackonteur · hackonteur · commit 13ac0632a142 · 2013-01-12T16:21:08.000+01:00
diff --git a/lib/coderay/scanners/e.rb b/lib/coderay/scanners/e.rb
@@ -13,9 +13,6 @@ class E < Scanner
     file_extension 'e'
     title 'e'
 
-    # TODO: 0b0101
-    # TODO: -- I am a comment
-    # TODO: 0x0000_0FFF
     # TODO: DUT'unique_name
 
     KEYWORDS = [
@@ -68,6 +65,8 @@ def scan_tokens encoder, options
 
           elsif match = scan(%r! // [^\n\\]* (?: \\. [^\n\\]* )* | /\* (?: .*? \*/ | .* ) !mx)
             encoder.text_token match, :comment
+          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?
@@ -121,14 +120,18 @@ def scan_tokens encoder, options
             label_expected = false
             encoder.text_token match, :char
 
-          elsif match = scan(/0[xX][0-9A-Fa-f]+/)
+          elsif match = scan(/0[xX][0-9_A-Fa-f]+/)
             label_expected = false
             encoder.text_token match, :hex
 
           elsif match = scan(/(?:0[0-7]+)(?![89.eEfF])/)
             label_expected = false
             encoder.text_token match, :octal
 
+          elsif match = scan(/0[b][0-9_]+/)
+            label_expected = false
+            encoder.text_token match, :binary
+
           elsif match = scan(/(?:\d+)(?![.eEfF])L?L?/)
             label_expected = false
             encoder.text_token match, :integer
