diff options
| author | Kornelius Kalnbach <murphy@rubychan.de> | 2013-06-10 23:50:03 +0200 |
|---|---|---|
| committer | Kornelius Kalnbach <murphy@rubychan.de> | 2013-06-10 23:50:03 +0200 |
| commit | 4540eb3ceb8882e28908073b20657b239ff2f878 (patch) | |
| tree | 4d5d4f3a0f3929dfb8df7d3f2a318b1cac066a85 /lib/coderay/scanners/java_script.rb | |
| parent | 8ad02d8bde0515636a63247a74098b4d819b7950 (diff) | |
| parent | a69d5d43b79a4f2cf5aaccc50b2275bf0dab4aba (diff) | |
| download | coderay-4540eb3ceb8882e28908073b20657b239ff2f878.tar.gz | |
Merge branch 'master' into javascript-keep-state
Diffstat (limited to 'lib/coderay/scanners/java_script.rb')
| -rw-r--r-- | lib/coderay/scanners/java_script.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/coderay/scanners/java_script.rb b/lib/coderay/scanners/java_script.rb index 75881a0..8587b06 100644 --- a/lib/coderay/scanners/java_script.rb +++ b/lib/coderay/scanners/java_script.rb @@ -183,11 +183,11 @@ module Scanners encoder.text_token match, :content elsif match = scan(/ \\ | $ /x) encoder.end_group state - encoder.text_token match, :error + encoder.text_token match, :error unless match.empty? key_expected = value_expected = false state = :initial else - raise_inspect "else case \" reached; %p not handled." % peek(1), encoder + raise_inspect "else case #{string_delimiter} reached; %p not handled." % peek(1), encoder end when :open_multi_line_comment |