Fix bug where wrong regexps flags were generated (fixes #426)

opal · Dec 6, 2013 · f983a92 · f983a92
1 parent 1afbc44
commit f983a92
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -48,6 +48,9 @@
 
 *   Fix compliance of `Kernel#extend` and ensure it calls `#extended()` hook.
 
+*   Fix bug where sometimes the wrong regexp flags would be generated in the
+    output javascript.
+
 ## 0.5.5 2013-11-25
 
 *   Fix regression: add `%i[foo bar]` style words back to lexer

diff --git a/lib/opal/nodes/literal.rb b/lib/opal/nodes/literal.rb
@@ -44,10 +44,14 @@ def compile
     class RegexpNode < Base
       handle :regexp
 
-      children :value
+      children :value, :flags
 
       def compile
-        push((value == // ? /^/ : value).inspect)
+        if value == ''
+          push('/^/')
+        else
+          push "#{Regexp.new(value).inspect}#{flags}"
+        end
       end
     end
 

diff --git a/lib/opal/parser.rb b/lib/opal/parser.rb
@@ -609,10 +609,10 @@ def new_str(str)
     end
 
     def new_regexp(reg, ending)
-      return s(:regexp, //) unless reg
+      return s(:regexp, '') unless reg
       case reg.type
       when :str
-        s(:regexp, Regexp.new(reg[1], value(ending)))
+        s(:regexp, reg[1], value(ending))
       when :evstr
         s(:dregx, "", reg)
       when :dstr

diff --git a/lib/opal/parser/lexer.rb b/lib/opal/parser/lexer.rb
@@ -803,7 +803,6 @@ def yylex
                           [:tXSTRING_BEG, STR_XQUOTE]
                         when 'r'
                           [:tREGEXP_BEG, STR_REGEXP]
-
                         end
 
           self.strterm = new_strterm2(func, term, paren)

diff --git a/spec/cli/parser/call_spec.rb b/spec/cli/parser/call_spec.rb
@@ -71,7 +71,7 @@
 
   it "should correctly parse / and regexps" do
     parsed("x / 500").should == [:call, [:call, nil, :x, [:arglist]], :/, [:arglist, [:int, 500]]]
-    parsed("x /foo/").should == [:call, nil, :x, [:arglist, [:regexp, /foo/]]]
+    parsed("x /foo/").should == [:call, nil, :x, [:arglist, [:regexp, 'foo', nil]]]
   end
 
   it "should parse LPAREN_ARG correctly" do

diff --git a/spec/cli/parser/literal_spec.rb b/spec/cli/parser/literal_spec.rb
@@ -97,17 +97,17 @@
   end
 
   describe "parsing regexps" do
-    it "parses a regexp as a s(:lit)" do
-      parsed("/lol/").should == [:regexp, /lol/]
+    it "parses a regexp" do
+      parsed("/lol/").should == [:regexp, 'lol', nil]
     end
 
     it "parses regexp options" do
-      parsed("/lol/i").should == [:regexp, /lol/i]
+      parsed("/lol/i").should == [:regexp, 'lol', 'i']
     end
 
     it "can parse regexps using %r notation" do
-      parsed('%r(foo)').should == [:regexp, /foo/]
-      parsed('%r(foo)i').should == [:regexp, /foo/i]
+      parsed('%r(foo)').should == [:regexp, 'foo', nil]
+      parsed('%r(foo)i').should == [:regexp, 'foo', 'i']
     end
   end
 end