summaryrefslogtreecommitdiff
path: root/lib/coderay/scanners/java_script.rb
diff options
context:
space:
mode:
authormurphy <murphy@rubychan.de>2009-12-30 07:15:11 +0000
committermurphy <murphy@rubychan.de>2009-12-30 07:15:11 +0000
commitd3fa14e8438a4bce18c141e1011059f7f5a125fc (patch)
treeafa4eb47e54d9b501c7b137f9676ac94d9905a71 /lib/coderay/scanners/java_script.rb
parenta07acba0881ee376f94bd6f0a731d44e7e2a3419 (diff)
downloadcoderay-d3fa14e8438a4bce18c141e1011059f7f5a125fc.tar.gz
Using XML scanner for XML literals.
Diffstat (limited to 'lib/coderay/scanners/java_script.rb')
-rw-r--r--lib/coderay/scanners/java_script.rb9
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/coderay/scanners/java_script.rb b/lib/coderay/scanners/java_script.rb
index 46c8c50..772c854 100644
--- a/lib/coderay/scanners/java_script.rb
+++ b/lib/coderay/scanners/java_script.rb
@@ -90,7 +90,8 @@ module Scanners
end
elsif value_expected && match = scan(/<([[:alpha:]]\w*) (?: [^\/>]*\/> | .*?<\/\1>)/xim)
- html_scanner.tokenize match
+ # FIXME: scan over nested tags
+ xml_scanner.tokenize match
value_expected = false
next
@@ -210,11 +211,11 @@ module Scanners
def reset_instance
super
- @html_scanner.reset if defined? @html_scanner
+ @xml_scanner.reset if defined? @xml_scanner
end
- def html_scanner
- @html_scanner ||= CodeRay.scanner :html, :tokens => @tokens, :keep_tokens => true, :keep_state => true
+ def xml_scanner
+ @xml_scanner ||= CodeRay.scanner :xml, :tokens => @tokens, :keep_tokens => true, :keep_state => true
end
end