Merge branch 'complex-regex-fix' of https://github.com/misfo/sorcerer …

…into iregexfix * 'complex-regex-fix' of https://github.com/misfo/sorcerer: Fix for regexes with interpolated and literal parts
jimweirich · Aug 5, 2013 · bd1fedc · bd1fedc
2 parents 2b5158f + 73ce7e2
commit bd1fedc
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 17 deletions.
diff --git a/lib/sorcerer/resource.rb b/lib/sorcerer/resource.rb
@@ -284,6 +284,7 @@ def determine_regexp_delimiters(sexp)
     SPACE = lambda { |sexp| emit(" ") }
     PASS1 = lambda { |sexp| resource(sexp[1]) }
     PASS2 = lambda { |sexp| resource(sexp[2]) }
+    PASSBOTH = lambda { |sexp| resource(sexp[1]); resource(sexp[2]) }
     EMIT1 = lambda { |sexp| emit(sexp[1]) }
 
     # Earlier versions of ripper miss array node for words, see
@@ -649,14 +650,8 @@ def determine_regexp_delimiters(sexp)
         emit(" = ")
         resource(sexp[2])
       },
-      :method_add_arg => lambda { |sexp|
-        resource(sexp[1])
-        resource(sexp[2])
-      },
-      :method_add_block => lambda { |sexp|
-        resource(sexp[1])
-        resource(sexp[2])
-      },
+      :method_add_arg => PASSBOTH,
+      :method_add_block => PASSBOTH,
       :mlhs_add => lambda { |sexp|
         resource(sexp[1])
         emit(", ") unless sexp[1] == [:mlhs_new]
@@ -728,13 +723,14 @@ def determine_regexp_delimiters(sexp)
       :redo => lambda { |sexp|
         emit("redo")
       },
-      :regexp_add => PASS2,
+      :regexp_add => PASSBOTH,
       :regexp_literal => lambda { |sexp|
         delims = determine_regexp_delimiters(sexp[2])
         emit(delims[0])
         resource(sexp[1])
         emit(delims[1])
       },
+      :regexp_new => NOOP,
       :rescue => lambda { |sexp|
         outdent do emit("rescue") end
         if sexp[1]                # Exception list
@@ -790,10 +786,7 @@ def determine_regexp_delimiters(sexp)
         resource(sexp[2]) if sexp[2]
       },
       :stmts_new => NOOP,
-      :string_add => lambda { |sexp|
-        resource(sexp[1])
-        resource(sexp[2])
-      },
+      :string_add => PASSBOTH,
       :string_concat => lambda { |sexp|
         resource(sexp[1])
         emit(" ")
@@ -903,10 +896,7 @@ def determine_regexp_delimiters(sexp)
         words("W", sexp)
       },
       :words_new => NOOP,
-      :xstring_add => lambda { |sexp|
-        resource(sexp[1])
-        resource(sexp[2])
-      },
+      :xstring_add => PASSBOTH,
       :xstring_literal => lambda { |sexp|
         emit('"')
         resource(sexp[1])

diff --git a/test/sorcerer/resource_test.rb b/test/sorcerer/resource_test.rb
@@ -276,6 +276,7 @@ def test_can_source_regular_expressions
     assert_resource "/[a-z]/"
     assert_resource "/\[a-z\]/"
     assert_resource '/#{name}/'
+    assert_resource '/before #{name} after/'
   end
 
   def test_can_source_regular_expressions_with_alternate_delimiters