issue #13 - problem with stripping when two =

pejuko · pejuko · commit 8c394c0ee80b · 2015-02-07T17:07:30.000+01:00
fixed greedy regexp
diff --git a/lib/coderay/scanners/bash.rb b/lib/coderay/scanners/bash.rb
@@ -155,7 +155,7 @@ def scan_tokens encoder, options
             next
           elsif match = scan(PRE_CONSTANTS)
             kind = :predefined_constant
-          elsif match = scan(/[^\s'"]*[A-Za-z_][A-Za-z_0-9]*\+?=/)
+          elsif match = scan(/[^\s'"]*?[A-Za-z_][A-Za-z_0-9]*\+?=/)
             match =~ /(.*?)([A-Za-z_][A-Za-z_0-9]*)(\+?=)/
             str = $1
             pre = $2
diff --git a/test/keep_path.sh b/test/keep_path.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+sudo qemu-kvm -m 768 \
+    -boot d \
+    -drive file=/bak/kvm/salix.qcow,cache=writeback \
+    -cdrom /ntfs-d/ISO/salix64-openbox-14.1.iso -vnc :3
+
diff --git a/test/test.rb b/test/test.rb
@@ -86,3 +86,14 @@ def test_0010_Array
   end
 
 end
+
+
+class TestKeepPath < Test::Unit::TestCase
+  
+  def test_0010_Array
+    file = File.join($current_dir, "keep_path.sh")
+    assert_equal(["#!/bin/sh", :directive, "\n", :end_line, "\n", :end_line, "sudo", :ident, " ", :space, "qemu", :ident, "-", :operator, "kvm", :ident, " ", :space, "-", :operator, "m", :ident, " ", :space, "768", :integer, " ", :space, "\\", :plain, "\n", :end_line, "    ", :space, "-", :operator, "boot", :ident, " ", :space, "d", :ident, " ", :space, "\\", :plain, "\n", :end_line, "    ", :space, "-", :operator, "drive", :ident, " ", :space, "file", :instance_variable, "=", :operator, "/bak/kvm/salix.qcow,cache=", :plain, "writeback", :ident, " ", :space, "\\", :plain, "\n", :end_line, "    ", :space, "-", :operator, "cdrom", :ident, " ", :space, "/", :plain, "ntfs", :ident, "-", :operator, "d", :ident, "/", :plain, "ISO", :ident, "/", :plain, "salix64", :ident, "-", :operator, "openbox", :ident, "-", :operator, "14.1.", :float, "iso", :ident, " ", :space, "-", :operator, "vnc", :ident, " ", :space, ":", :reserved, "3", :integer, "\n", :end_line, "\n", :end_line],
+                 CodeRay.scan(File.read(file), :bash).tokens)
+  end
+
+end
