summaryrefslogtreecommitdiff
path: root/lib/coderay
diff options
context:
space:
mode:
authorKornelius Kalnbach <murphy@rubychan.de>2017-11-03 00:40:06 +0100
committerKornelius Kalnbach <murphy@rubychan.de>2017-11-03 00:40:06 +0100
commit0dc1ca39534ad71429bc6c21cbada795ed08185a (patch)
treeba8c1aa4b5ac7dec28482dd7c5c877959e39967e /lib/coderay
parent853787554d17570dace133340e3ec555b0e56e0d (diff)
parent161c17d2c537a32f38f0dcca75218af69f96102b (diff)
downloadcoderay-0dc1ca39534ad71429bc6c21cbada795ed08185a.tar.gz
Merge branch 'master' into possible-speedups
Diffstat (limited to 'lib/coderay')
-rw-r--r--lib/coderay/scanners/java_script.rb1
-rw-r--r--lib/coderay/scanners/lua.rb2
2 files changed, 1 insertions, 2 deletions
diff --git a/lib/coderay/scanners/java_script.rb b/lib/coderay/scanners/java_script.rb
index 9eb0a0a..5e27813 100644
--- a/lib/coderay/scanners/java_script.rb
+++ b/lib/coderay/scanners/java_script.rb
@@ -100,7 +100,6 @@ module Scanners
# TODO: scan over nested tags
xml_scanner.tokenize match, :tokens => encoder
value_expected = false
- next
elsif match = scan(/ [-+*=<>?:;,!&^|(\[{~%]+ | \.(?!\d) /x)
value_expected = true
diff --git a/lib/coderay/scanners/lua.rb b/lib/coderay/scanners/lua.rb
index fb1e45a..81d7dae 100644
--- a/lib/coderay/scanners/lua.rb
+++ b/lib/coderay/scanners/lua.rb
@@ -76,7 +76,7 @@ module Scanners
encoder.text_token(match, :comment)
elsif match = scan(/\[=*\[/) # [[ long (possibly multiline) string ]]
- num_equals = match.count("=") # Number must match for comment end
+ num_equals = match.count("=") # Number must match for string end
encoder.begin_group(:string)
encoder.text_token(match, :delimiter)
state = :long_string