diff options
| author | Kornelius Kalnbach <murphy@rubychan.de> | 2017-11-03 00:39:44 +0100 |
|---|---|---|
| committer | Kornelius Kalnbach <murphy@rubychan.de> | 2017-11-03 00:39:44 +0100 |
| commit | 161c17d2c537a32f38f0dcca75218af69f96102b (patch) | |
| tree | 7096a57074bc33f7e87055a469a0745934ae88ae | |
| parent | e15cf96405177153e1418496a7a8e85beaa679fb (diff) | |
| download | coderay-161c17d2c537a32f38f0dcca75218af69f96102b.tar.gz | |
port a few tweaks from dsl branch
| -rw-r--r-- | lib/coderay/scanners/java_script.rb | 1 | ||||
| -rw-r--r-- | lib/coderay/scanners/lua.rb | 2 | ||||
| -rw-r--r-- | rake_tasks/test.rake | 2 |
3 files changed, 2 insertions, 3 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 diff --git a/rake_tasks/test.rake b/rake_tasks/test.rake index 1a23a5b..ce32a02 100644 --- a/rake_tasks/test.rake +++ b/rake_tasks/test.rake @@ -37,7 +37,7 @@ Please rename or remove it and run again to use the GitHub repository: else puts 'Downloading scanner test suite...' sh 'git clone https://github.com/rubychan/coderay-scanner-tests.git test/scanners/' - end + end unless ENV['SKIP_UPDATE_SCANNER_SUITE'] end namespace :scanner do |