diff options
| author | murphy <murphy@rubychan.de> | 2010-03-31 22:17:06 +0000 |
|---|---|---|
| committer | murphy <murphy@rubychan.de> | 2010-03-31 22:17:06 +0000 |
| commit | 862bc9aa6b002f6b29cf74f93ca66e63cf370819 (patch) | |
| tree | 45e8a8731fadca8df5fe86595dc2e8f6dc7a3782 /lib/coderay/scanners | |
| parent | cce5dad0dce285a2b7c4f1fe0ec79d10c71a8403 (diff) | |
| download | coderay-862bc9aa6b002f6b29cf74f93ca66e63cf370819.tar.gz | |
Upporting changes from 0.9.2 (vs. 0.9.1).
Diffstat (limited to 'lib/coderay/scanners')
| -rw-r--r-- | lib/coderay/scanners/php.rb | 1 | ||||
| -rw-r--r-- | lib/coderay/scanners/yaml.rb | 4 |
2 files changed, 3 insertions, 2 deletions
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] |