From 862bc9aa6b002f6b29cf74f93ca66e63cf370819 Mon Sep 17 00:00:00 2001
From: murphy <murphy@rubychan.de>
Date: Wed, 31 Mar 2010 22:17:06 +0000
Subject: Upporting changes from 0.9.2 (vs. 0.9.1).

---
 lib/coderay/scanners/php.rb  | 1 +
 lib/coderay/scanners/yaml.rb | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'lib/coderay/scanners')

diff --git a/lib/coderay/scanners/php.rb b/lib/coderay/scanners/php.rb
index 73c4fc8..289e795 100644
--- a/lib/coderay/scanners/php.rb
+++ b/lib/coderay/scanners/php.rb
@@ -216,6 +216,7 @@ module Scanners
         \.(?!\d)=? |      # dot that is not decimal point, string concatenation
         && | \|\| |       # logic
         :: | -> | => |    # scope, member, dictionary
+        \\(?!\n) |        # namespace
         \+\+ | -- |       # increment, decrement
         [,;?:()\[\]{}] |  # simple delimiters
         [-+*\/%&|^]=? |   # ordinary math, binary logic, assignment shortcuts
diff --git a/lib/coderay/scanners/yaml.rb b/lib/coderay/scanners/yaml.rb
index fa29701..62a6aba 100644
--- a/lib/coderay/scanners/yaml.rb
+++ b/lib/coderay/scanners/yaml.rb
@@ -125,9 +125,9 @@ module Scanners
         
         if $CODERAY_DEBUG and not kind
           raise_inspect 'Error token %p in line %d' %
-            [[match, kind], line], tokens
+            [[match, kind], line], tokens, state
         end
-        raise_inspect 'Empty token', tokens unless match
+        raise_inspect 'Empty token', tokens, state unless match
         
         tokens << [match, kind]
         
-- 
cgit v1.2.1