3 files changed, 70 insertions, 4 deletions
diff --git a/lib/coderay/helpers/file_type.rb b/lib/coderay/helpers/file_type.rb
index e2c3edd..0984f3a 100644
--- a/lib/coderay/helpers/file_type.rb
+++ b/lib/coderay/helpers/file_type.rb
@@ -105,7 +105,7 @@ module FileType
     'py3' => :python,
     'pyw' => :python,
     'rake' => :ruby,
-    'raydebug' => :debug,
+    'raydebug' => :raydebug,
     'rb' => :ruby,
     'rbw' => :ruby,
     'rhtml' => :rhtml,
diff --git a/lib/coderay/scanners/debug.rb b/lib/coderay/scanners/debug.rb
index deaa30b..613b55c 100644
--- a/lib/coderay/scanners/debug.rb
+++ b/lib/coderay/scanners/debug.rb
@@ -4,12 +4,11 @@ module Scanners
 
   # = Debug Scanner
   # 
-  # Parses the output of the Encoders::Debug encoder.
+  # Interprets the output of the Encoders::Debug encoder.
   class Debug < Scanner
 
     register_for :debug
-    file_extension 'raydebug'
-    title 'CodeRay Token Dump'
+    title 'CodeRay Token Dump Import'
     
   protected
     
diff --git a/lib/coderay/scanners/raydebug.rb b/lib/coderay/scanners/raydebug.rb
new file mode 100644
index 0000000..d5839f9
--- /dev/null
+++ b/lib/coderay/scanners/raydebug.rb
@@ -0,0 +1,67 @@
+($:.unshift '../..'; require 'coderay') unless defined? CodeRay
+module CodeRay
+module Scanners
+
+  # = Debug Scanner
+  # 
+  # Parses the output of the Encoders::Debug encoder.
+  class Raydebug < Scanner
+
+    register_for :raydebug
+    file_extension 'raydebug'
+    title 'CodeRay Token Dump'
+    
+  protected
+    
+    def scan_tokens encoder, options
+
+      opened_tokens = []
+
+      until eos?
+
+        if match = scan(/\s+/)
+          encoder.text_token match, :space
+          
+        elsif match = scan(/ (\w+) \( ( [^\)\\]* ( \\. [^\)\\]* )* ) /x)
+          kind = self[1]
+          encoder.text_token kind, :class
+          encoder.text_token '(', :operator
+          match = self[2]
+          encoder.text_token match, kind.to_sym
+          encoder.text_token match, :operator if match = scan(/\)/)
+          
+        elsif match = scan(/ (\w+) ([<\[]) /x)
+          kind = self[1]
+          case self[2]
+          when '<'
+            encoder.text_token kind, :class
+          when '['
+            encoder.text_token kind, :class
+          else
+            raise 'CodeRay bug: This case should not be reached.'
+          end
+          kind = kind.to_sym
+          opened_tokens << kind
+          encoder.begin_group kind
+          encoder.text_token self[2], :operator
+          
+        elsif !opened_tokens.empty? && match = scan(/ [>\]] /x)
+          encoder.text_token match, :operator
+          encoder.end_group opened_tokens.pop
+          
+        else
+          encoder.text_token getch, :space
+          
+        end
+        
+      end
+      
+      encoder.end_group opened_tokens.pop until opened_tokens.empty?
+      
+      encoder
+    end
+
+  end
+
+end
+end