Merge branch 'master' into sass-scanner

korny · korny · commit 46a947538f2e · 2013-03-11T02:28:23.000+01:00
diff --git a/Gemfile b/Gemfile
@@ -11,5 +11,4 @@ group :development do
   gem "shoulda-context", "~> 1.0.0"
   gem "json" if RUBY_VERSION <  '1.9'
   gem "rdoc"
-  gem "activesupport"
 end
diff --git a/lib/coderay/scanners/c.rb b/lib/coderay/scanners/c.rb
@@ -148,7 +148,7 @@ def scan_tokens encoder, options
             encoder.text_token match, :char
           elsif match = scan(/ \\ | $ /x)
             encoder.end_group :string
-            encoder.text_token match, :error
+            encoder.text_token match, :error unless match.empty?
             state = :initial
             label_expected = false
           else
diff --git a/lib/coderay/scanners/cpp.rb b/lib/coderay/scanners/cpp.rb
@@ -160,7 +160,7 @@ def scan_tokens encoder, options
             encoder.text_token match, :char
           elsif match = scan(/ \\ | $ /x)
             encoder.end_group :string
-            encoder.text_token match, :error
+            encoder.text_token match, :error unless match.empty?
             state = :initial
             label_expected = false
           else
diff --git a/lib/coderay/scanners/java.rb b/lib/coderay/scanners/java.rb
@@ -147,7 +147,7 @@ def scan_tokens encoder, options
           elsif match = scan(/ \\ | $ /x)
             encoder.end_group state
             state = :initial
-            encoder.text_token match, :error
+            encoder.text_token match, :error unless match.empty?
           else
             raise_inspect "else case \" reached; %p not handled." % peek(1), encoder
           end
diff --git a/lib/coderay/scanners/java_script.rb b/lib/coderay/scanners/java_script.rb
@@ -175,11 +175,11 @@ def scan_tokens encoder, options
             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
           
         else
diff --git a/lib/coderay/scanners/json.rb b/lib/coderay/scanners/json.rb
@@ -70,7 +70,7 @@ def scan_tokens encoder, options
             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?
             state = :initial
           else
             raise_inspect "else case \" reached; %p not handled." % peek(1), encoder
diff --git a/lib/coderay/scanners/python.rb b/lib/coderay/scanners/python.rb
@@ -133,7 +133,7 @@ def scan_tokens encoder, options
           elsif match = scan(/ \\ | $ /x)
             encoder.end_group string_type
             string_type = nil
-            encoder.text_token match, :error
+            encoder.text_token match, :error unless match.empty?
             state = :initial
           else
             raise_inspect "else case \" reached; %p not handled." % peek(1), encoder, state
diff --git a/lib/coderay/scanners/sql.rb b/lib/coderay/scanners/sql.rb
@@ -148,7 +148,7 @@ def scan_tokens encoder, options
               encoder.text_token string_content, :content
               string_content = ''
             end
-            encoder.text_token match, :error
+            encoder.text_token match, :error unless match.empty?
             state = :initial
           else
             raise "else case \" reached; %p not handled." % peek(1), encoder
diff --git a/rake_tasks/generator.rake b/rake_tasks/generator.rake
@@ -1,5 +1,5 @@
 namespace :generate do
-  desc 'generates a new scanner NAME=lang [ALT=alternative,plugin,ids] [EXT=file,extensions] [BASE=base lang] '
+  desc 'generates a new scanner NAME=lang [ALT=alternative,plugin,ids] [EXT=file,extensions] [BASE=base lang]'
   task :scanner do
     raise 'I need a scanner name; use NAME=lang' unless scanner_class_name = ENV['NAME']
     raise "Invalid lang: #{scanner_class_name}; use NAME=lang." unless /\A\w+\z/ === scanner_class_name
@@ -52,7 +52,7 @@ namespace :generate do
       end
     end
     
-    if alternative_ids = ENV['ALT']
+    if alternative_ids = ENV['ALT'] && alternative_ids != lang
       map_file = File.join(LIB_ROOT, 'coderay', 'scanners', '_map.rb')
       puts "Not automated. Remember to add your alternative plugin ids to #{map_file}:"
       for id in alternative_ids.split(',')
