./lib/coderay/scanners/json.rb in coderay-1.0.0.598.pre vs ./lib/coderay/scanners/json.rb in coderay-1.0.0.738.pre

@@ -11,14 +11,15 @@
       :float, :char, :content, :delimiter,
       :error, :integer, :operator, :value,
     ]  # :nodoc:
     
     ESCAPE = / [bfnrt\\"\/] /x  # :nodoc:
-    UNICODE_ESCAPE =  / u[a-fA-F0-9]{4} /x  # :nodoc:
+    UNICODE_ESCAPE = / u[a-fA-F0-9]{4} /x  # :nodoc:
     
   protected
     
+    # See http://json.org/ for a definition of the JSON lexic/grammar.
     def scan_tokens encoder, options
       
       state = :initial
       stack = []
       key_expected = false
@@ -42,18 +43,18 @@
             when '{' then stack << :object; key_expected = true
             when '[' then stack << :array
             when '}', ']' then stack.pop  # no error recovery, but works for valid JSON
             end
           elsif match = scan(/ true | false | null /x)
-             encoder.text_token match, :value
+            encoder.text_token match, :value
           elsif match = scan(/ -? (?: 0 | [1-9]\d* ) /x)
-            kind = :integer
             if scan(/ \.\d+ (?:[eE][-+]?\d+)? | [eE][-+]? \d+ /x)
               match << matched
-              kind = :float
+              encoder.text_token match, :float
+            else
+              encoder.text_token match, :integer
             end
-            encoder.text_token match, kind
           else
             encoder.text_token getch, :error
           end
           
         when :string, :key
@@ -74,10 +75,10 @@
           else
             raise_inspect "else case \" reached; %p not handled." % peek(1), encoder
           end
           
         else
-          raise_inspect 'Unknown state', encoder
+          raise_inspect 'Unknown state: %p' % [state], encoder
           
         end
       end
       
       if [:string, :key].include? state