opal 0.10.6 → 0.11.0.rc1

data/spec/lib/compiler_spec.rb

@@ -2,6 +2,13 @@ require 'lib/spec_helper'
 require 'support/match_helpers'
 
 describe Opal::Compiler do
+  describe 'regexp' do
+    it 'should escape regexp' do
+      expect_compiled("%r{^/{4,}$}").to include('/^\/{4,}$/')
+      expect_compiled('/\\\\"/').to include('/\\\\"/')
+    end
+  end
+
   describe 'requiring' do
     it 'calls #require' do
       expect_compiled("require 'pippo'").to include('self.$require("pippo")')
@@ -21,10 +28,6 @@ describe Opal::Compiler do
     end
   end
 
-  it 'raises syntax errors properly' do
-    expect(lambda {Opal::Compiler.new('def foo').compile}).to raise_error SyntaxError, /An error occurred while compiling:.*false/m
-  end
-
   it "should compile simple ruby values" do
     expect_compiled("3.142").to include("return 3.142")
     expect_compiled("123e1").to include("return 1230")
@@ -58,8 +61,8 @@ describe Opal::Compiler do
   end
 
   it "should compile undef calls" do
-    expect_compiled("undef a").to include("Opal.udef(self, '$a')")
-    expect_compiled("undef a,b").to match(/Opal.udef\(self, '\$a'\);.*return Opal.udef\(self, '\$b'\);/m)
+    expect_compiled("undef a").to include("Opal.udef(self, '$' + \"a\")")
+    expect_compiled("undef a,b").to match(/Opal.udef\(self, '\$' \+ "a"\);.*Opal.udef\(self, '\$' \+ "b"\);/m)
   end
 
   describe "class names" do
@@ -129,12 +132,12 @@ describe Opal::Compiler do
 
     describe '#autoload' do
       it 'ignores autoload outside of context class' do
-        compiler = compiler_for(%Q{autoload Whatever, "#{__FILE__}"})
+        compiler = compiler_for(%Q{autoload :Whatever, "#{__FILE__}"})
         expect(compiler.requires).to eq([])
       end
 
       it 'parses and resolve second #autoload arguments' do
-        compiler = compiler_for(%Q{class Foo; autoload Whatever, "#{__FILE__}"; end})
+        compiler = compiler_for(%Q{class Foo; autoload :Whatever, "#{__FILE__}"; end})
         expect(compiler.requires).to eq([__FILE__])
       end
     end
@@ -188,11 +191,11 @@ describe Opal::Compiler do
         end
 
         it 'adds nil check for constants' do
-          expect_compiled("foo = 42 if Test > 4").to include("if ((($a = $rb_gt($scope.get('Test'), 4)) !== nil && $a != null && (!$a.$$is_boolean || $a == true))) ")
+          expect_compiled("foo = 42 if Test > 4").to include("if ((($a = $rb_gt(Opal.const_get_relative($nesting, 'Test'), 4)) !== nil && $a != null && (!$a.$$is_boolean || $a == true))) ")
         end
 
         it 'specifically == excludes nil check for constants' do
-          expect_compiled("foo = 42 if Test == 4").to include("if ($scope.get('Test')['$=='](4))")
+          expect_compiled("foo = 42 if Test == 4").to include("if (Opal.const_get_relative($nesting, 'Test')['$=='](4))")
         end
       end
 
@@ -216,7 +219,7 @@ describe Opal::Compiler do
         end
 
         it 'adds nil check for constants' do
-          expect_compiled("foo = 42 if Test").to include("if ((($a = $scope.get('Test')) !== nil && $a != null && (!$a.$$is_boolean || $a == true)))")
+          expect_compiled("foo = 42 if Test").to include("if ((($a = Opal.const_get_relative($nesting, 'Test')) !== nil && $a != null && (!$a.$$is_boolean || $a == true)))")
         end
       end
     end
@@ -224,57 +227,63 @@ describe Opal::Compiler do
     context 'parentheses' do
       context 'with operators' do
         it 'adds nil check for primitives' do
-          expect_compiled('foo = 42 if (2 > 3)').to include('if ((($a = ($rb_gt(2, 3))) !== nil && $a != null && (!$a.$$is_boolean || $a == true)))')
-          expect_compiled('foo = 42 if (2.5 > 3.5)').to include('if ((($a = ($rb_gt(2.5, 3.5))) !== nil && $a != null && (!$a.$$is_boolean || $a == true)))')
-          expect_compiled('foo = 42 if (true > false)').to include('if ((($a = ($rb_gt(true, false))) !== nil && $a != null && (!$a.$$is_boolean || $a == true)))')
+          expect_compiled('foo = 42 if (2 > 3)').to include('if ((($a = $rb_gt(2, 3)) !== nil && $a != null && (!$a.$$is_boolean || $a == true)))')
+          expect_compiled('foo = 42 if (2.5 > 3.5)').to include('if ((($a = $rb_gt(2.5, 3.5)) !== nil && $a != null && (!$a.$$is_boolean || $a == true)))')
+          expect_compiled('foo = 42 if (true > false)').to include('if ((($a = $rb_gt(true, false)) !== nil && $a != null && (!$a.$$is_boolean || $a == true)))')
 
-          expect_compiled('foo = 42 if (2 == 3)').to include("if ((($a = ((2)['$=='](3))) !== nil && $a != null && (!$a.$$is_boolean || $a == true)))")
-          expect_compiled('foo = 42 if (2.5 == 3.5)').to include("if ((($a = ((2.5)['$=='](3.5))) !== nil && $a != null && (!$a.$$is_boolean || $a == true)))")
-          expect_compiled('foo = 42 if (true == false)').to include("if ((($a = (true['$=='](false))) !== nil && $a != null && (!$a.$$is_boolean || $a == true)))")
+          expect_compiled('foo = 42 if (2 == 3)').to include("if ((($a = (2)['$=='](3)) !== nil && $a != null && (!$a.$$is_boolean || $a == true)))")
+          expect_compiled('foo = 42 if (2.5 == 3.5)').to include("if ((($a = (2.5)['$=='](3.5)) !== nil && $a != null && (!$a.$$is_boolean || $a == true)))")
+          expect_compiled('foo = 42 if (true == false)').to include("if ((($a = true['$=='](false)) !== nil && $a != null && (!$a.$$is_boolean || $a == true)))")
         end
 
         it 'adds nil check for strings' do
-          expect_compiled('foo = 42 if ("test" > "bar")').to include('if ((($a = ($rb_gt("test", "bar"))) !== nil && $a != null && (!$a.$$is_boolean || $a == true)))')
-          expect_compiled('foo = 42 if ("test" == "bar")').to include("if ((($a = (\"test\"['$=='](\"bar\"))) !== nil && $a != null && (!$a.$$is_boolean || $a == true)))")
+          expect_compiled('foo = 42 if ("test" > "bar")').to include('if ((($a = $rb_gt("test", "bar")) !== nil && $a != null && (!$a.$$is_boolean || $a == true)))')
+          expect_compiled('foo = 42 if ("test" == "bar")').to include("if ((($a = \"test\"['$=='](\"bar\")) !== nil && $a != null && (!$a.$$is_boolean || $a == true)))")
         end
 
         it 'adds nil check for lvars' do
-          expect_compiled("bar = 4\nfoo = 42 if (bar > 5)").to include('if ((($a = ($rb_gt(bar, 5))) !== nil && $a != null && (!$a.$$is_boolean || $a == true)))')
-          expect_compiled("bar = 4\nfoo = 42 if (bar == 5)").to include("if ((($a = (bar['$=='](5))) !== nil && $a != null && (!$a.$$is_boolean || $a == true))) ")
+          expect_compiled("bar = 4\nfoo = 42 if (bar > 5)").to include('if ((($a = $rb_gt(bar, 5)) !== nil && $a != null && (!$a.$$is_boolean || $a == true)))')
+          expect_compiled("bar = 4\nfoo = 42 if (bar == 5)").to include("if ((($a = bar['$=='](5)) !== nil && $a != null && (!$a.$$is_boolean || $a == true))) ")
         end
 
         it 'adds nil check for constants' do
-          expect_compiled("foo = 42 if (Test > 4)").to include("if ((($a = ($rb_gt($scope.get('Test'), 4))) !== nil && $a != null && (!$a.$$is_boolean || $a == true)))")
-          expect_compiled("foo = 42 if (Test == 4)").to include("if ((($a = ($scope.get('Test')['$=='](4))) !== nil && $a != null && (!$a.$$is_boolean || $a == true)))")
+          expect_compiled("foo = 42 if (Test > 4)").to include("if ((($a = $rb_gt(Opal.const_get_relative($nesting, 'Test'), 4)) !== nil && $a != null && (!$a.$$is_boolean || $a == true)))")
+          expect_compiled("foo = 42 if (Test == 4)").to include("if ((($a = Opal.const_get_relative($nesting, 'Test')['$=='](4)) !== nil && $a != null && (!$a.$$is_boolean || $a == true)))")
         end
       end
 
       context 'without operators' do
         it 'adds nil check for primitives' do
-          expect_compiled('foo = 42 if (2)').to include('if ((($a = (2)) !== nil && $a != null && (!$a.$$is_boolean || $a == true)))')
-          expect_compiled('foo = 42 if (2.5)').to include('if ((($a = (2.5)) !== nil && $a != null && (!$a.$$is_boolean || $a == true)))')
-          expect_compiled('foo = 42 if (true)').to include('if ((($a = (true)) !== nil && $a != null && (!$a.$$is_boolean || $a == true)))')
+          expect_compiled('foo = 42 if (2)').to include('if ((($a = 2) !== nil && $a != null && (!$a.$$is_boolean || $a == true)))')
+          expect_compiled('foo = 42 if (2.5)').to include('if ((($a = 2.5) !== nil && $a != null && (!$a.$$is_boolean || $a == true)))')
+          expect_compiled('foo = 42 if (true)').to include('if ((($a = true) !== nil && $a != null && (!$a.$$is_boolean || $a == true)))')
         end
 
         it 'adds nil check for boolean method calls' do
-          expect_compiled('foo = 42 if (true.something)').to include('if ((($a = (true.$something())) !== nil && $a != null && (!$a.$$is_boolean || $a == true)))')
+          expect_compiled('foo = 42 if (true.something)').to include('if ((($a = true.$something()) !== nil && $a != null && (!$a.$$is_boolean || $a == true)))')
         end
 
         it 'adds nil check for strings' do
-          expect_compiled('foo = 42 if ("test")').to include('if ((($a = ("test")) !== nil && $a != null && (!$a.$$is_boolean || $a == true)))')
+          expect_compiled('foo = 42 if ("test")').to include('if ((($a = "test") !== nil && $a != null && (!$a.$$is_boolean || $a == true)))')
         end
 
         it 'adds nil check for lvars' do
-          expect_compiled("bar = 4\nfoo = 42 if (bar)").to include('if ((($a = (bar)) !== nil && $a != null && (!$a.$$is_boolean || $a == true)))')
+          expect_compiled("bar = 4\nfoo = 42 if (bar)").to include('if ((($a = bar) !== nil && $a != null && (!$a.$$is_boolean || $a == true)))')
         end
 
         it 'adds nil check for constants' do
-          expect_compiled("foo = 42 if (Test)").to include("if ((($a = ($scope.get('Test'))) !== nil && $a != null && (!$a.$$is_boolean || $a == true)))")
+          expect_compiled("foo = 42 if (Test)").to include("if ((($a = Opal.const_get_relative($nesting, 'Test')) !== nil && $a != null && (!$a.$$is_boolean || $a == true)))")
         end
       end
     end
   end
 
+  describe 'Regexp flags' do
+    it 'skips the unsupported ones' do
+      expect_compiled("/foobar/nix").to include("/foobar/i")
+    end
+  end
+
   def expect_compiled(*args)
     expect(Opal::Compiler.new(*args).compile)
   end

data/spec/lib/dependency_resolver_spec.rb

@@ -30,8 +30,8 @@ describe Opal::Nodes::CallNode::DependencyResolver do
     end
   end
 
-  def s(*parts)
-    Opal::Sexp.new(parts)
+  def s(type, *children)
+    ::Opal::AST::Node.new(type, children)
   end
 
   def resolve(sexp)

data/spec/lib/deprecations_spec.rb

@@ -0,0 +1,16 @@
+require 'lib/spec_helper'
+
+describe Opal::Deprecations do
+  subject { Object.new.extend described_class }
+
+  it 'defaults to warn' do
+    expect(subject).to receive(:warn)
+    subject.deprecation "there's a new api!"
+  end
+
+  it 'can be set to raise' do
+    subject.raise_on_deprecation = true
+    expect(subject).to receive(:raise)
+    subject.deprecation "there's a new api!"
+  end
+end

data/spec/lib/fixtures/source_location_test.rb

@@ -0,0 +1,7 @@
+
+
+
+# Do not move this method
+# This file is used to test Method#source_location
+def m
+end

data/spec/lib/rewriters/binary_operator_assignment_spec.rb

@@ -0,0 +1,151 @@
+require 'lib/spec_helper'
+
+describe Opal::Rewriters::BinaryOperatorAssignment do
+  def s(type, *children)
+    ::Opal::AST::Node.new(type, children)
+  end
+
+  let(:rewriter) { Opal::Rewriters::BinaryOperatorAssignment.new }
+
+  def parse(source)
+    parser = Opal::Parser.default_parser
+    buffer = ::Parser::Source::Buffer.new('(eval)')
+    buffer.source = source
+    parser.parse(buffer)
+  end
+
+  def rewrite(ast)
+    rewriter.process(ast)
+  end
+
+  around(:each) do |e|
+    Opal::Rewriters::BinaryOperatorAssignment.reset_tmp_counter!
+    Opal::Rewriter.disable { e.run }
+  end
+  let(:cache_tmp_name) { :$binary_op_recvr_tmp_1 }
+  let(:cached) { s(:js_tmp, cache_tmp_name) }
+
+  shared_examples 'it rewrites' do |from, to|
+    it "rewrites #{from.inspect} to #{to.inspect}" do
+      input = parse(from)
+      rewritten = rewrite(input)
+      expected = parse(to)
+
+      expect(rewritten).to eq(expected)
+    end
+  end
+
+  context 'rewriting or_asgn and and_asgn nodes' do
+    context 'local variable' do
+      include_examples 'it rewrites', 'a = 1; a += 2', 'a = 1; a = a + 2'
+    end
+
+    context 'instance variable' do
+      include_examples 'it rewrites', '@a += 1', '@a = @a + 1'
+    end
+
+    context 'constant' do
+      include_examples 'it rewrites', 'CONST += 1', 'CONST = CONST + 1'
+    end
+
+    context 'global variable' do
+      include_examples 'it rewrites', '$g += 1', '$g = $g + 1'
+    end
+
+    context 'class variable' do
+      include_examples 'it rewrites', '@@a += 1', '@@a = @@a + 1'
+    end
+
+    context 'simple method call' do
+      include_examples 'it rewrites', 'recvr = 1; recvr.meth += rhs', 'recvr = 1; recvr.meth = recvr.meth + rhs'
+    end
+
+    context '[] / []= method call' do
+      include_examples 'it rewrites', 'recvr = 1; recvr[idx] += rhs', 'recvr = 1; recvr[idx] = recvr[idx] + rhs'
+    end
+
+    context '[] / []= method call with multiple arguments' do
+      include_examples 'it rewrites',
+        'recvr = 1; recvr[idx1, idx2] += rhs',
+          'recvr = 1; recvr[idx1, idx2] = recvr[idx1, idx2] + rhs'
+    end
+
+    context 'chain of method calls' do
+      it 'rewrites += by caching receiver to a temporary local variable' do
+        input = parse('recvr.a.b += rhs')
+        rewritten = rewrite(input)
+
+        expected = s(:begin,
+          s(:lvasgn, cache_tmp_name, parse('recvr.a')), # cached = recvr.a
+          s(:send, cached, :b=,
+            s(:send,
+              s(:send, cached, :b),
+              :+,
+              parse('rhs'))))
+      end
+    end
+
+    context 'method call using safe nafigator' do
+      it 'rewrites += by caching receiver and rewriting it to if and or_asgn' do
+        input = parse('recvr&.meth += rhs')
+        rewritten = rewrite(input)
+
+        expected = s(:begin,
+          s(:lvasgn, cache_tmp_name, parse('recvr')), # cached = recvr
+          s(:if, s(:send, cached, :nil?),             # if cached.nil?
+            s(:nil),                                  #   nil
+                                                      # else
+            s(:send, cached, :meth=,                  #   cached.meth =
+              s(:send,
+                s(:send, cached, :meth),              #     cached.meth +
+                :+,
+                parse('rhs')))                        #     rhs
+          ))                                          # end
+
+        expect(rewritten).to eq(expected)
+      end
+    end
+  end
+
+  context 'rewriting defined?(or_asgn) and defined?(and_asgn)' do
+    context 'local variable' do
+      include_examples 'it rewrites', 'a = nil; defined?(a += 1)', 'a = nil; "assignment"'
+    end
+
+    context 'instance variable' do
+      include_examples 'it rewrites', 'defined?(@a += 1)', %q("assignment")
+    end
+
+    context 'constant' do
+      include_examples 'it rewrites', 'defined?(CONST += 1)', %q("assignment")
+    end
+
+    context 'global variable' do
+      include_examples 'it rewrites', 'defined?($g += 1)', %q("assignment")
+    end
+
+    context 'class variable' do
+      include_examples 'it rewrites', 'defined?(@@a += 1)', %q("assignment")
+    end
+
+    context 'simple method call' do
+      include_examples 'it rewrites', 'defined?(recvr.meth += rhs)', %q("assignment")
+    end
+
+    context '[] / []= method call' do
+      include_examples 'it rewrites', 'defined?(recvr[idx] += rhs)', %q("assignment")
+    end
+
+    context '[] / []= method call with multiple arguments' do
+      include_examples 'it rewrites', 'defined?(recvr[idx1, idx2] += rhs)', %q("assignment")
+    end
+
+    context 'chain of method calls' do
+      include_examples 'it rewrites', 'defined?(recvr.a.b.c += rhs)', %q("assignment")
+    end
+
+    context 'method call using safe nafigator' do
+      include_examples 'it rewrites', 'defined?(recvr&.meth += rhs)', %q("assignment")
+    end
+  end
+end

data/spec/lib/rewriters/block_to_iter_spec.rb

@@ -0,0 +1,28 @@
+require 'lib/spec_helper'
+
+describe Opal::Rewriters::BlockToIter do
+  def s(type, *children)
+    ::Opal::AST::Node.new(type, children)
+  end
+
+  let(:rewriter) { Opal::Rewriters::BlockToIter.new }
+
+  let(:block_node) do
+    # m { |arg1| 1 }
+    s(:block,
+      s(:send, nil, :m),
+      s(:args, s(:arg, :arg1)),
+      s(:int, 1)
+    )
+  end
+
+  let(:iter_node) do
+    s(:send, nil, :m,
+      s(:iter, s(:args, s(:arg, :arg1)), s(:int, 1))
+    )
+  end
+
+  it 'rewriters s(:block) to s(:iter)' do
+    expect(rewriter.process(block_node)).to eq(iter_node)
+  end
+end

data/spec/lib/rewriters/dot_js_syntax_spec.rb

@@ -0,0 +1,108 @@
+require 'lib/spec_helper'
+
+describe Opal::Rewriters::DotJsSyntax do
+  def s(type, *children)
+    ::Opal::AST::Node.new(type, children)
+  end
+
+  let(:rewriter) { Opal::Rewriters::DotJsSyntax.new }
+
+  context '.JS. syntax' do
+    let(:send_node) do
+      # a.JS.b(1)
+      s(:send,
+        s(:send, s(:lvar, :a), :JS),
+        :b,
+        s(:int, 1)
+      )
+    end
+
+    let(:dot_js_node) do
+      s(:jscall, s(:lvar, :a), :b, s(:int, 1))
+    end
+
+    it 'rewrites s(:send, s(:send, obj, :JS), :js_method, ...) to s(:jscall, obj, :js_method, ...)' do
+      expect(rewriter.process(send_node)).to eq(dot_js_node)
+    end
+  end
+
+  context '.JS[] syntax' do
+    context 'when passed one argument' do
+      let(:send_node) do
+        # a.JS[1, 2]
+        s(:send,
+          s(:send, s(:lvar, :a), :JS),
+          :[],
+          s(:int, 1)
+        )
+      end
+
+      let(:jsattr_node) do
+        s(:jsattr, s(:lvar, :a), s(:int, 1))
+      end
+
+      it 'rewrites s(:send, s(:send, obj, :JS), :[], arg) to s(:jsattr, obj, arg)' do
+        expect(rewriter.process(send_node)).to eq(jsattr_node)
+      end
+    end
+
+    context 'when passed 1+ arguments' do
+      let(:send_node) do
+        # a.JS[1, 2]
+        s(:send,
+          s(:send, s(:lvar, :a), :JS),
+          :[],
+          s(:int, 1),
+          s(:int, 2)
+        )
+      end
+
+      it 'raises syntax error' do
+        expect {
+          rewriter.process(send_node)
+        }.to raise_error(SyntaxError)
+      end
+    end
+  end
+
+  context '.JS[]= syntax' do
+    context 'when passed two arguments' do
+      let(:send_node) do
+        # a.JS[1] = 2
+        s(:send,
+          s(:send, s(:lvar, :a), :JS),
+          :[]=,
+          s(:int, 1),
+          s(:int, 2)
+        )
+      end
+
+      let(:jsattr_asgn_node) do
+        s(:jsattrasgn, s(:lvar, :a), s(:int, 1), s(:int, 2))
+      end
+
+      it 'converts send node to jsattrasgn' do
+        expect(rewriter.process(send_node)).to eq(jsattr_asgn_node)
+      end
+    end
+
+    context 'when passed 2+ arguments' do
+      let(:send_node) do
+        # a.JS[1, 2] = 3
+        s(:send,
+          s(:send, s(:lvar, :a), :JS),
+          :[]=,
+          s(:int, 1),
+          s(:int, 2),
+          s(:int, 3)
+        )
+      end
+
+      it 'raises syntax error' do
+        expect {
+          rewriter.process(send_node)
+        }.to raise_error(SyntaxError)
+      end
+    end
+  end
+end