opal 0.10.6 → 0.11.0.rc1

data/spec/filters/unsupported/struct.rb

@@ -1,4 +1,4 @@
-opal_filter "Struct" do
+opal_unsupported_filter "Struct" do
   fails "Struct#initialize is private"
   fails "Struct.new does not create a constant with symbol as first argument"
   fails "Struct.new fails with invalid constant name as first argument" # this invalid name gets interpreted as a struct member

data/spec/filters/unsupported/symbol.rb

@@ -1,4 +1,4 @@
-opal_filter "Symbol" do
+opal_unsupported_filter "Symbol" do
   fails "Numeric#coerce raises a TypeError when passed a Symbol"
   fails "Fixnum#coerce raises a TypeError when given an Object that does not respond to #to_f"
   fails "Symbol#to_proc produces a proc that always returns [[:rest]] for #parameters"
@@ -16,4 +16,5 @@ opal_filter "Symbol" do
   fails "Marshal.dump with a Symbol dumps an encoded Symbol"
   fails "Marshal.dump with a Symbol dumps a binary encoded Symbol"
   fails "Marshal.dump with an Array dumps a non-empty Array" # this particular spec dumps a Symbol, spec with String instead of Symbol is in spec/opal/
+  fails "Hash literal raises a TypeError if any splatted elements keys are not symbols"
 end

data/spec/filters/unsupported/taint.rb

@@ -1,15 +1,30 @@
-opal_filter "taint" do
+opal_unsupported_filter "taint" do
   fails "Hash#reject with extra state does not taint the resulting hash"
-
-  fails "String#% doesn't taint the result for %e when argument is tainted"
+  fails "Kernel#inspect returns a tainted string if self is tainted"
+  fails "Module#append_features copies own tainted status to the given module"
+  fails "Module#append_features copies own untrusted status to the given module"
+  fails "Module#extend_object does not copy own tainted status to the given object"
+  fails "Module#extend_object does not copy own untrusted status to the given object"
+  fails "Module#prepend_features copies own tainted status to the given module"
+  fails "Module#prepend_features copies own untrusted status to the given module"
   fails "String#% doesn't taint the result for %E when argument is tainted"
+  fails "String#% doesn't taint the result for %G when argument is tainted"
+  fails "String#% doesn't taint the result for %e when argument is tainted"
   fails "String#% doesn't taint the result for %f when argument is tainted"
   fails "String#% doesn't taint the result for %g when argument is tainted"
-  fails "String#% doesn't taint the result for %G when argument is tainted"
-  fails "String#byteslice with index, length always taints resulting strings when self is tainted"
+  fails "String#[] with Regexp always taints resulting strings when self or regexp is tainted"
+  fails "String#[] with Regexp returns an untrusted string if the regexp is untrusted"
   fails "String#byteslice with Range always taints resulting strings when self is tainted"
-
-  fails "StringScanner#pre_match taints the returned String if the input was tainted"
+  fails "String#byteslice with index, length always taints resulting strings when self is tainted"
+  fails "String#dump taints the result if self is tainted"
+  fails "String#slice with Regexp always taints resulting strings when self or regexp is tainted"
+  fails "String#slice with Regexp returns an untrusted string if the regexp is untrusted"
+  fails "StringScanner#getbyte taints the returned String if the input was tainted"
+  fails "StringScanner#getch taints the returned String if the input was tainted"
+  fails "StringScanner#matched taints the returned String if the input was tainted"
+  fails "StringScanner#peek taints the returned String if the input was tainted"
+  fails "StringScanner#peep taints the returned String if the input was tainted"
   fails "StringScanner#post_match taints the returned String if the input was tainted"
+  fails "StringScanner#pre_match taints the returned String if the input was tainted"
   fails "StringScanner#rest taints the returned String if the input was tainted"
 end

data/spec/filters/unsupported/thread.rb

@@ -1,4 +1,4 @@
-opal_filter "Thread" do
+opal_unsupported_filter "Thread" do
   fails "StandardError is a superclass of ThreadError"
   fails "The throw keyword raises an ArgumentError if used to exit a thread"
   fails "The throw keyword clears the current exception"

data/spec/filters/unsupported/time.rb

@@ -1,4 +1,4 @@
-opal_filter "Time" do
+opal_unsupported_filter "Time" do
   fails "Time#+ accepts arguments that can be coerced into Rational"
   fails "Time#+ adds a negative Float"
   fails "Time#+ increments the time by the specified amount as rational numbers"

data/spec/lib/builder_spec.rb

@@ -69,4 +69,21 @@ describe Opal::Builder do
       expect(builder.to_s).to start_with('(function(undefined)')
     end
   end
+
+  it 'defaults config from Opal::Config' do
+    Opal::Config.arity_check_enabled = false
+    expect(Opal::Config.arity_check_enabled).to eq(false)
+    expect(Opal::Config.compiler_options[:arity_check]).to eq(false)
+    builder = described_class.new
+    builder.build_str('def foo; end', 'foo')
+    expect(builder.to_s).not_to include('TMP_foo_1.$$parameters = []')
+
+    Opal::Config.arity_check_enabled = true
+    expect(Opal::Config.arity_check_enabled).to eq(true)
+    expect(Opal::Config.compiler_options[:arity_check]).to eq(true)
+    builder = described_class.new
+    builder.build_str('def foo; end', 'foo')
+    expect(builder.to_s).to include('TMP_foo_1.$$parameters = []')
+  end
+
 end

data/spec/lib/cli_spec.rb

@@ -30,7 +30,7 @@ describe Opal::CLI do
         expect { subject.run }.to raise_error(ArgumentError)
       end
 
-      context 'with lib_only: true' do
+      context 'with lib_only: true and opal require' do
         let(:options) { super().merge lib_only: true }
 
         it 'does not raise an error' do
@@ -89,10 +89,16 @@ describe Opal::CLI do
     end
 
     context 'when true' do
-      let(:options) { {lib_only: true, compile: true, skip_opal_require: true, no_exit: true} }
+      let(:options) { {lib_only: true, compile: true, no_exit: true} }
+      it 'appends code block at the end of the source' do
+        expect_output_of{ subject.run }.not_to eq("\n")
+      end
 
-      it 'does not append code block at the end of the source' do
-        expect_output_of{ subject.run }.to eq("\n")
+      context 'without any require' do
+        let(:options) { {lib_only: true, compile: true, skip_opal_require: true, no_exit: true} }
+        it 'raises ArgumentError' do
+          expect{subject.run}.to raise_error(ArgumentError)
+        end
       end
     end
   end
@@ -123,7 +129,7 @@ describe Opal::CLI do
       let(:options)  { {:gems => [gem_name], :evals => ['']} }
 
       it "adds the gem's lib paths to Opal.path" do
-        builder = cli.build
+        builder = cli.builder
 
         spec = Gem::Specification.find_by_name(gem_name)
         spec.require_paths.each do |require_path|
@@ -176,21 +182,44 @@ describe Opal::CLI do
   describe ':sexp option' do
     let(:options) { {evals: ['puts 4'], sexp: true} }
     it 'prints syntax expressions for the given code' do
-      expect_output_of{ subject.run }.to eq("(:call, nil, :puts, (:arglist, (:int, 4)))\n")
+      expect_output_of{ subject.run }.to eq("s(:send, nil, :puts,\n  s(:int, 4))\n")
     end
   end
 
   describe ':map option' do
-    let(:options)  { {:map => true, :evals => ['foo']} }
+    let(:map_path) { "#{Dir.mktmpdir 'opal-map'}/file.map" }
+    let(:options)  { {map: map_path, evals: ['123']} }
 
     it 'sets the verbose flag (currently unused)' do
-      expect_output_of{ subject.run }.to include(%{"version"=>3})
+      expect_output_of{ subject.run }.to eq('')
+      expect(File.read(map_path)).to include(%{"version":3})
     end
   end
 
+  describe ':parse_comments option' do
+    let(:code) do
+      <<-CODE
+        # multiline
+        # comment
+        def m
+        end
+      CODE
+    end
+    let(:options) { { parse_comments: true, evals: [code], compile: true } }
 
+    it 'sets $$comment prop for compiled methods' do
+      expect_output_of { subject.run }.to include('$$comments = ["# multiline", "# comment"]')
+    end
+  end
 
+  describe ':enable_source_location' do
+    let(:file) { File.expand_path('../fixtures/source_location_test.rb', __FILE__) }
+    let(:options) { { enable_source_location: true, compile: true, file: File.open(file) } }
 
+    it 'sets $$source_location prop for compiled methods' do
+      expect_output_of { subject.run }.to include("source_location_test.rb', 6]")
+    end
+  end
 
   private
 

data/spec/lib/compiler/call_spec.rb

@@ -16,13 +16,13 @@ describe Opal::Compiler do
 
     context 'outside block' do
       context 'method missing on' do
-        it { is_expected.to include "return (!(Opal.find_super_dispatcher(self, 'some_method', TMP_1, true).$$stub) ? \"super\" : nil);" }
+        it { is_expected.to include "return (!(self, Opal.find_super_dispatcher(self, 'some_method', TMP_some_method_1, true).$$stub) ? \"super\" : nil)" }
       end
 
       context 'method missing off' do
         let(:compiler) { Opal::Compiler.new(method, method_missing: false) }
 
-        it { is_expected.to include "return ((Opal.find_super_dispatcher(self, 'some_method', TMP_1, true)) != null ? \"super\" : nil);" }
+        it { is_expected.to include "return ((self, Opal.find_super_dispatcher(self, 'some_method', TMP_some_method_1, true)) != null ? \"super\" : nil)" }
       end
     end
 
@@ -30,13 +30,13 @@ describe Opal::Compiler do
       context 'implicit' do
         let(:method) { 'lambda { defined? super }' }
 
-        it { is_expected.to include "return (!(Opal.find_iter_super_dispatcher(self, null, (TMP_1.$$def || null), true, false).$$stub) ? \"super\" : nil)}, TMP_1.$$s = self, TMP_1.$$arity = 0, TMP_1), $a).call($b)" }
+        it { is_expected.to include "return (!(self, Opal.find_iter_super_dispatcher(self, null, (TMP_1.$$def || null), true, false).$$stub) ? \"super\" : nil)}, TMP_1.$$s = self, TMP_1.$$arity = 0, TMP_1))" }
       end
 
       context 'explicit' do
         let(:method) { 'lambda { defined? super() }' }
 
-        it { is_expected.to include "return (!(Opal.find_iter_super_dispatcher(self, null, (TMP_1.$$def || null), true, false).$$stub) ? \"super\" : nil)}, TMP_1.$$s = self, TMP_1.$$arity = 0, TMP_1), $a).call($b)" }
+        it { is_expected.to include "return (!(self, Opal.find_iter_super_dispatcher(self, null, (TMP_1.$$def || null), true, false).$$stub) ? \"super\" : nil)}, TMP_1.$$s = self, TMP_1.$$arity = 0, TMP_1))" }
       end
     end
   end
@@ -60,9 +60,9 @@ describe Opal::Compiler do
 
                 it do
                   is_expected.to include <<-CODE
-    return ($b = ($c = self).$call_method, $b.$$p = (TMP_2 = function(a){var self = TMP_2.$$s || this;
+    return $send(self, 'call_method', Opal.to_a(stuff), (TMP_2 = function(a){var self = TMP_2.$$s || this;
 if (a == null) a = nil;
-    return self.$foobar()}, TMP_2.$$s = self, TMP_2.$$arity = 1, TMP_2), $b).apply($c, Opal.to_a(stuff));
+    return self.$foobar()}, TMP_2.$$s = self, TMP_2.$$arity = 1, TMP_2))
                   CODE
                 end
               end
@@ -70,7 +70,7 @@ if (a == null) a = nil;
               context 'via reference' do
                 let(:invocation) { 'call_method *stuff, &block2' }
 
-                it { is_expected.to include "return ($b = ($c = self).$call_method, $b.$$p = block2.$to_proc(), $b).apply($c, Opal.to_a(stuff));" }
+                it { is_expected.to include "return $send(self, 'call_method', Opal.to_a(stuff), block2.$to_proc())" }
               end
             end
           end
@@ -82,9 +82,9 @@ if (a == null) a = nil;
 
                 it do
                   is_expected.to include <<-CODE
-    return ($b = ($c = self).$call_method, $b.$$p = (TMP_2 = function(a){var self = TMP_2.$$s || this;
+    return $send(self, 'call_method', [], (TMP_2 = function(a){var self = TMP_2.$$s || this;
 if (a == null) a = nil;
-    return self.$foobar()}, TMP_2.$$s = self, TMP_2.$$arity = 1, TMP_2), $b).call($c);
+    return self.$foobar()}, TMP_2.$$s = self, TMP_2.$$arity = 1, TMP_2))
                   CODE
                 end
               end
@@ -92,7 +92,7 @@ if (a == null) a = nil;
               context 'via reference' do
                 let(:invocation) { 'call_method &block2' }
 
-                it { is_expected.to include "return ($b = ($c = self).$call_method, $b.$$p = block2.$to_proc(), $b).call($c);" }
+                it { is_expected.to include "return $send(self, 'call_method', [], block2.$to_proc())" }
               end
             end
           end
@@ -114,9 +114,9 @@ if (a == null) a = nil;
 
                 it do
                   is_expected.to include <<-CODE
-    return ($b = ($c = self).$call_method, $b.$$p = (TMP_1 = function(a){var self = TMP_1.$$s || this;
+    return $send(self, 'call_method', Opal.to_a(stuff), (TMP_1 = function(a){var self = TMP_1.$$s || this;
 if (a == null) a = nil;
-    return self.$foobar()}, TMP_1.$$s = self, TMP_1.$$arity = 1, TMP_1), $b).apply($c, Opal.to_a(stuff));
+    return self.$foobar()}, TMP_1.$$s = self, TMP_1.$$arity = 1, TMP_1))
                   CODE
                 end
               end
@@ -124,7 +124,7 @@ if (a == null) a = nil;
               context 'via reference' do
                 let(:invocation) { 'call_method *stuff, &block2' }
 
-                it { is_expected.to include "return ($b = ($c = self).$call_method, $b.$$p = self.$block2().$to_proc(), $b).apply($c, Opal.to_a(stuff));" }
+                it { is_expected.to include "return $send(self, 'call_method', Opal.to_a(stuff), self.$block2().$to_proc())" }
               end
             end
           end
@@ -136,9 +136,9 @@ if (a == null) a = nil;
 
                 it do
                   is_expected.to include <<-CODE
-    return ($b = ($c = self).$call_method, $b.$$p = (TMP_1 = function(a){var self = TMP_1.$$s || this;
+    return $send(self, 'call_method', [], (TMP_1 = function(a){var self = TMP_1.$$s || this;
 if (a == null) a = nil;
-    return self.$foobar()}, TMP_1.$$s = self, TMP_1.$$arity = 1, TMP_1), $b).call($c);
+    return self.$foobar()}, TMP_1.$$s = self, TMP_1.$$arity = 1, TMP_1))
                   CODE
                 end
               end
@@ -146,7 +146,7 @@ if (a == null) a = nil;
               context 'via reference' do
                 let(:invocation) { 'call_method &block2' }
 
-                it { is_expected.to include "return ($b = ($c = self).$call_method, $b.$$p = self.$block2().$to_proc(), $b).call($c);" }
+                it { is_expected.to include "return $send(self, 'call_method', [], self.$block2().$to_proc())" }
               end
             end
           end
@@ -165,27 +165,33 @@ if (a == null) a = nil;
         context 'no splat' do
           let(:invocation) { 'another_method(42)' }
 
-          it { is_expected.to include 'return self.$another_method(42);' }
+          it { is_expected.to include 'return self.$another_method(42)' }
         end
 
         context 'splat' do
           context 'with no block' do
             let(:invocation) { 'another_method(*args)' }
 
-            it { is_expected.to include 'return ($a = self).$another_method.apply($a, Opal.to_a(self.$args()));' }
+            it { is_expected.to include "return $send(self, 'another_method', Opal.to_a(self.$args()))" }
           end
 
           context 'with block' do
             context 'via variable' do
               let(:invocation) { 'another_method(*args) {|b| foobar }' }
 
-              it { is_expected.to include "return ($a = ($b = self).$another_method, $a.$$p = (TMP_1 = function(b){var self = TMP_1.$$s || this;\nif (b == null) b = nil;\n    return self.$foobar()}, TMP_1.$$s = self, TMP_1.$$arity = 1, TMP_1), $a).apply($b, Opal.to_a(self.$args()));" }
+              it do
+                is_expected.to include <<-CODE
+    return $send(self, 'another_method', Opal.to_a(self.$args()), (TMP_1 = function(b){var self = TMP_1.$$s || this;
+if (b == null) b = nil;
+    return self.$foobar()}, TMP_1.$$s = self, TMP_1.$$arity = 1, TMP_1))
+                CODE
+              end
             end
 
             context 'via reference' do
               let(:invocation) { 'another_method(*args, &block2)' }
 
-              it { is_expected.to include "return ($a = ($b = self).$another_method, $a.$$p = self.$block2().$to_proc(), $a).apply($b, Opal.to_a(self.$args()));" }
+              it { is_expected.to include "return $send(self, 'another_method', Opal.to_a(self.$args()), self.$block2().$to_proc())" }
             end
           end
         end
@@ -194,13 +200,19 @@ if (a == null) a = nil;
           context 'via variable' do
             let(:invocation) { 'another_method {|b| foobar }' }
 
-            it { is_expected.to include "return ($a = ($b = self).$another_method, $a.$$p = (TMP_1 = function(b){var self = TMP_1.$$s || this;\nif (b == null) b = nil;\n    return self.$foobar()}, TMP_1.$$s = self, TMP_1.$$arity = 1, TMP_1), $a).call($b);" }
+            it do
+              is_expected.to include <<-CODE
+    return $send(self, 'another_method', [], (TMP_1 = function(b){var self = TMP_1.$$s || this;
+if (b == null) b = nil;
+    return self.$foobar()}, TMP_1.$$s = self, TMP_1.$$arity = 1, TMP_1))
+              CODE
+            end
           end
 
           context 'via reference' do
             let(:invocation) { 'another_method(&block)' }
 
-            it { is_expected.to include 'return ($a = ($b = self).$another_method, $a.$$p = self.$block().$to_proc(), $a).call($b);' }
+            it { is_expected.to include "return $send(self, 'another_method', [], self.$block().$to_proc())" }
           end
         end
       end
@@ -223,14 +235,14 @@ if (a == null) a = nil;
             context 'no arguments' do
               let(:invocation) { 'super()' }
 
-              it { is_expected.to include "return ($a = ($b = self, Opal.find_super_dispatcher(self, 'some_method', TMP_1, false)), $a.$$p = null, $a).call($b);" }
+              it { is_expected.to include "return $send(self, Opal.find_super_dispatcher(self, 'some_method', TMP_Foobar_some_method_1, false), [], null)" }
             end
 
             context 'implicit arguments' do
               let(:invocation) { 'super' }
 
               context 'no block' do
-                it { is_expected.to include "return ($a = ($b = self, Opal.find_super_dispatcher(self, 'some_method', TMP_1, false)), $a.$$p = $iter, $a).apply($b, $zuper);" }
+                it { is_expected.to include "return $send(self, Opal.find_super_dispatcher(self, 'some_method', TMP_Foobar_some_method_1, false), $zuper, $iter)" }
               end
 
               context 'block' do
@@ -244,7 +256,7 @@ if (a == null) a = nil;
                   CODE
                 end
 
-                it { is_expected.to include "return ($a = ($b = self, Opal.find_super_dispatcher(self, 'some_method', TMP_1, false)), $a.$$p = $iter, $a).apply($b, $zuper);" }
+                it { is_expected.to include "return $send(self, Opal.find_super_dispatcher(self, 'some_method', TMP_Foobar_some_method_1, false), $zuper, $iter)" }
               end
             end
           end
@@ -268,9 +280,9 @@ if (a == null) a = nil;
 
                     it do
                       is_expected.to include <<-CODE
-    return ($b = ($c = self, Opal.find_super_dispatcher(self, 'some_method', TMP_1, false)), $b.$$p = (TMP_2 = function(a){var self = TMP_2.$$s || this;
+      return $send(self, Opal.find_super_dispatcher(self, 'some_method', TMP_Foobar_some_method_1, false), Opal.to_a(stuff), (TMP_2 = function(a){var self = TMP_2.$$s || this;
 if (a == null) a = nil;
-      return self.$foobar()}, TMP_2.$$s = self, TMP_2.$$arity = 1, TMP_2), $b).apply($c, Opal.to_a(stuff));
+      return self.$foobar()}, TMP_2.$$s = self, TMP_2.$$arity = 1, TMP_2))
                       CODE
                     end
                   end
@@ -278,7 +290,7 @@ if (a == null) a = nil;
                   context 'via reference' do
                     let(:invocation) { 'super *stuff, &block2' }
 
-                    it { is_expected.to include "return ($b = ($c = self, Opal.find_super_dispatcher(self, 'some_method', TMP_1, false)), $b.$$p = block2.$to_proc(), $b).apply($c, Opal.to_a(stuff));" }
+                    it { is_expected.to include "return $send(self, Opal.find_super_dispatcher(self, 'some_method', TMP_Foobar_some_method_1, false), Opal.to_a(stuff), block2.$to_proc())" }
                   end
                 end
               end
@@ -290,9 +302,9 @@ if (a == null) a = nil;
 
                     it do
                       is_expected.to include <<-CODE
-    return ($b = ($c = self, Opal.find_super_dispatcher(self, 'some_method', TMP_1, false)), $b.$$p = (TMP_2 = function(a){var self = TMP_2.$$s || this;
+      return $send(self, Opal.find_super_dispatcher(self, 'some_method', TMP_Foobar_some_method_1, false), $zuper, (TMP_2 = function(a){var self = TMP_2.$$s || this;
 if (a == null) a = nil;
-      return self.$foobar()}, TMP_2.$$s = self, TMP_2.$$arity = 1, TMP_2), $b).apply($c, $zuper);
+      return self.$foobar()}, TMP_2.$$s = self, TMP_2.$$arity = 1, TMP_2))
                       CODE
                     end
                   end
@@ -300,7 +312,7 @@ if (a == null) a = nil;
                   context 'via reference' do
                     let(:invocation) { 'super &block2' }
 
-                    it { is_expected.to include "return ($b = ($c = self, Opal.find_super_dispatcher(self, 'some_method', TMP_1, false)), $b.$$p = block2.$to_proc(), $b).call($c);" }
+                    it { is_expected.to include "return $send(self, Opal.find_super_dispatcher(self, 'some_method', TMP_Foobar_some_method_1, false), [], block2.$to_proc())" }
                   end
                 end
               end
@@ -308,7 +320,7 @@ if (a == null) a = nil;
               context 'no arguments' do
                 let(:invocation) { 'super()' }
 
-                it { is_expected.to include "return ($b = ($c = self, Opal.find_super_dispatcher(self, 'some_method', TMP_1, false)), $b.$$p = null, $b).call($c);" }
+                it { is_expected.to include "return $send(self, Opal.find_super_dispatcher(self, 'some_method', TMP_Foobar_some_method_1, false), [], null)" }
               end
             end
 
@@ -330,9 +342,9 @@ if (a == null) a = nil;
 
                     it do
                       is_expected.to include <<-CODE
-      return ($b = ($c = self, Opal.find_super_dispatcher(self, 'some_method', TMP_1, false)), $b.$$p = (TMP_2 = function(a){var self = TMP_2.$$s || this;
+      return $send(self, Opal.find_super_dispatcher(self, 'some_method', TMP_Foobar_some_method_1, false), Opal.to_a(stuff), (TMP_2 = function(a){var self = TMP_2.$$s || this;
 if (a == null) a = nil;
-      return self.$foobar()}, TMP_2.$$s = self, TMP_2.$$arity = 1, TMP_2), $b).apply($c, Opal.to_a(stuff));
+      return self.$foobar()}, TMP_2.$$s = self, TMP_2.$$arity = 1, TMP_2))
                       CODE
                     end
                   end
@@ -340,7 +352,7 @@ if (a == null) a = nil;
                   context 'via reference' do
                     let(:invocation) { 'super *stuff, &block2' }
 
-                    it { is_expected.to include "return ($b = ($c = self, Opal.find_super_dispatcher(self, 'some_method', TMP_1, false)), $b.$$p = self.$block2().$to_proc(), $b).apply($c, Opal.to_a(stuff));" }
+                    it { is_expected.to include "return $send(self, Opal.find_super_dispatcher(self, 'some_method', TMP_Foobar_some_method_1, false), Opal.to_a(stuff), self.$block2().$to_proc())" }
                   end
                 end
               end
@@ -352,9 +364,9 @@ if (a == null) a = nil;
 
                     it do
                       is_expected.to include <<-CODE
-      return ($b = ($c = self, Opal.find_super_dispatcher(self, 'some_method', TMP_1, false)), $b.$$p = (TMP_2 = function(a){var self = TMP_2.$$s || this;
+      return $send(self, Opal.find_super_dispatcher(self, 'some_method', TMP_Foobar_some_method_1, false), $zuper, (TMP_2 = function(a){var self = TMP_2.$$s || this;
 if (a == null) a = nil;
-      return self.$foobar()}, TMP_2.$$s = self, TMP_2.$$arity = 1, TMP_2), $b).apply($c, $zuper);
+      return self.$foobar()}, TMP_2.$$s = self, TMP_2.$$arity = 1, TMP_2))
       CODE
                     end
                   end
@@ -362,7 +374,7 @@ if (a == null) a = nil;
                   context 'via reference' do
                     let(:invocation) { 'super &block2' }
 
-                    it { is_expected.to include "return ($b = ($c = self, Opal.find_super_dispatcher(self, 'some_method', TMP_1, false)), $b.$$p = self.$block2().$to_proc(), $b).call($c);" }
+                    it { is_expected.to include "return $send(self, Opal.find_super_dispatcher(self, 'some_method', TMP_Foobar_some_method_1, false), [], self.$block2().$to_proc())" }
                   end
                 end
               end
@@ -370,7 +382,7 @@ if (a == null) a = nil;
               context 'no arguments' do
                 let(:invocation) { 'super()' }
 
-                it { is_expected.to include "return ($b = ($c = self, Opal.find_super_dispatcher(self, 'some_method', TMP_1, false)), $b.$$p = null, $b).call($c);" }
+                it { is_expected.to include "return $send(self, Opal.find_super_dispatcher(self, 'some_method', TMP_Foobar_some_method_1, false), [], null)" }
               end
             end
           end
@@ -390,14 +402,14 @@ if (a == null) a = nil;
           context 'no splat' do
             let(:invocation) { 'super(42)' }
 
-            it { is_expected.to include "return ($a = ($b = self, Opal.find_super_dispatcher(self, 'regular_method', TMP_1, false)), $a.$$p = null, $a).call($b, 42);" }
+            it { is_expected.to include "return $send(self, Opal.find_super_dispatcher(self, 'regular_method', TMP_Foobar_regular_method_1, false), [42], null)" }
           end
 
           context 'splat' do
             context 'with no block' do
               let(:invocation) { "args=[1,2,3]\nsuper(*args)" }
 
-              it { is_expected.to include "return ($a = ($b = self, Opal.find_super_dispatcher(self, 'regular_method', TMP_1, false)), $a.$$p = null, $a).apply($b, Opal.to_a(args));" }
+              it { is_expected.to include "return $send(self, Opal.find_super_dispatcher(self, 'regular_method', TMP_Foobar_regular_method_1, false), Opal.to_a(args), null)" }
             end
 
             context 'with block' do
@@ -406,9 +418,9 @@ if (a == null) a = nil;
 
                 it do
                   is_expected.to include <<-CODE
-      return ($a = ($b = self, Opal.find_super_dispatcher(self, 'regular_method', TMP_1, false)), $a.$$p = (TMP_2 = function(b){var self = TMP_2.$$s || this;
+      return $send(self, Opal.find_super_dispatcher(self, 'regular_method', TMP_Foobar_regular_method_1, false), Opal.to_a(self.$args()), (TMP_2 = function(b){var self = TMP_2.$$s || this;
 if (b == null) b = nil;
-      return self.$foobar()}, TMP_2.$$s = self, TMP_2.$$arity = 1, TMP_2), $a).apply($b, Opal.to_a(self.$args()));
+      return self.$foobar()}, TMP_2.$$s = self, TMP_2.$$arity = 1, TMP_2))
                   CODE
                 end
               end
@@ -416,7 +428,7 @@ if (b == null) b = nil;
               context 'via reference' do
                 let(:invocation) { 'super(*args, &block2)' }
 
-                it { is_expected.to include "return ($a = ($b = self, Opal.find_super_dispatcher(self, 'regular_method', TMP_1, false)), $a.$$p = self.$block2().$to_proc(), $a).apply($b, Opal.to_a(self.$args()));" }
+                it { is_expected.to include "return $send(self, Opal.find_super_dispatcher(self, 'regular_method', TMP_Foobar_regular_method_1, false), Opal.to_a(self.$args()), self.$block2().$to_proc())" }
               end
             end
           end
@@ -427,9 +439,9 @@ if (b == null) b = nil;
 
               it do
                 is_expected.to include <<-CODE
-      return ($a = ($b = self, Opal.find_super_dispatcher(self, 'regular_method', TMP_1, false)), $a.$$p = (TMP_2 = function(b){var self = TMP_2.$$s || this;
+return $send(self, Opal.find_super_dispatcher(self, 'regular_method', TMP_Foobar_regular_method_1, false), $zuper, (TMP_2 = function(b){var self = TMP_2.$$s || this;
 if (b == null) b = nil;
-      return self.$foobar()}, TMP_2.$$s = self, TMP_2.$$arity = 1, TMP_2), $a).apply($b, $zuper);
+      return self.$foobar()}, TMP_2.$$s = self, TMP_2.$$arity = 1, TMP_2))
                 CODE
               end
             end
@@ -437,14 +449,14 @@ if (b == null) b = nil;
             context 'via reference' do
               let(:invocation) { 'super(&block)' }
 
-              it { is_expected.to include "return ($a = ($b = self, Opal.find_super_dispatcher(self, 'regular_method', TMP_1, false)), $a.$$p = self.$block().$to_proc(), $a).call($b);" }
+              it { is_expected.to include "return $send(self, Opal.find_super_dispatcher(self, 'regular_method', TMP_Foobar_regular_method_1, false), [], self.$block().$to_proc())" }
             end
           end
 
           context 'no arguments' do
             let(:invocation) { 'super()' }
 
-            it { is_expected.to include "return ($a = ($b = self, Opal.find_super_dispatcher(self, 'regular_method', TMP_1, false)), $a.$$p = null, $a).call($b);" }
+            it { is_expected.to include "return $send(self, Opal.find_super_dispatcher(self, 'regular_method', TMP_Foobar_regular_method_1, false), [], null)" }
           end
         end
       end
@@ -452,7 +464,7 @@ if (b == null) b = nil;
       context 'block' do
         let(:method) { 'stuff = lambda { super }'}
 
-        it { is_expected.to include "return ($c = ($d = self, Opal.find_iter_super_dispatcher(self, null, (TMP_1.$$def || null), false, true)), $c.$$p = $iter, $c).apply($d)}, TMP_1.$$s = self, TMP_1.$$arity = 0, TMP_1), $a).call($b)" }
+        it { is_expected.to include "return $send(self, Opal.find_iter_super_dispatcher(self, null, (TMP_1.$$def || null), false, true), [], $iter)}, TMP_1.$$s = self, TMP_1.$$arity = 0, TMP_1)))" }
       end
 
       context 'block inside method' do
@@ -465,7 +477,7 @@ if (b == null) b = nil;
             CODE
           end
 
-          it { is_expected.to include "return ($c = ($d = self, Opal.find_iter_super_dispatcher(self, 'in_method', (TMP_1.$$def || TMP_2), false, true)), $c.$$p = $iter, $c).apply($d, $zuper)}, TMP_1.$$s = self, TMP_1.$$arity = 0, TMP_1), $a).call($b);" }
+          it { is_expected.to include "return $send(self, Opal.find_iter_super_dispatcher(self, 'in_method', (TMP_1.$$def || TMP_in_method_2), false, true), $zuper, $iter)}, TMP_1.$$s = self, TMP_1.$$arity = 0, TMP_1))" }
         end
 
         context 'not first node' do
@@ -480,7 +492,7 @@ if (b == null) b = nil;
             CODE
           end
 
-          it { is_expected.to include "Opal.ret(($c = ($d = self, Opal.find_iter_super_dispatcher(self, 'foo', (TMP_1.$$def || TMP_2), false, true)), $c.$$p = $iter, $c).apply($d, $zuper))}, TMP_1.$$s = self, TMP_1.$$arity = 0, TMP_1), $a).call($b);" }
+          it { is_expected.to include "Opal.ret($send(self, Opal.find_iter_super_dispatcher(self, 'foo', (TMP_1.$$def || TMP_Foo_foo_2), false, true), $zuper, $iter))}, TMP_1.$$s = self, TMP_1.$$arity = 0, TMP_1))" }
         end
 
         context 'right method is called, IS THIS A NEW CASE??' do
@@ -505,7 +517,7 @@ if (b == null) b = nil;
           end
 
           # runtime if (current_func.$$def) code should take care of locating the correct method here
-          it { is_expected.to include "return ($d = ($e = self, Opal.find_iter_super_dispatcher(self, 'setup', (TMP_3.$$def || TMP_4), false, false)), $d.$$p = null, $d).apply($e, Opal.to_a(args))}, TMP_3.$$s = self, TMP_3.$$arity = -1, TMP_3), $a).call($b, \"m\");" }
+          it { is_expected.to include "return $send(self, Opal.find_iter_super_dispatcher(self, 'setup', (TMP_3.$$def || TMP_Foo_setup_4), false, false), Opal.to_a(args), null)" }
         end
       end
 
@@ -521,7 +533,13 @@ if (b == null) b = nil;
         context 'implicit' do
           let(:invocation) { 'define_method(:wilma) { super }' }
 
-          it { is_expected.to include "return ($c = ($d = self, Opal.find_iter_super_dispatcher(self, null, (TMP_1.$$def || null), false, true)), $c.$$p = $iter, $c).apply($d)}, TMP_1.$$s = self, TMP_1.$$arity = 0, TMP_1), $a).call($b, \"wilma\")" }
+          it do
+            is_expected.to include <<-CODE
+    return $send(self, 'define_method', ["wilma"], (TMP_Foobar_1 = function(){var self = TMP_Foobar_1.$$s || this;
+
+    return $send(self, Opal.find_iter_super_dispatcher(self, null, (TMP_Foobar_1.$$def || null), false, true), [], $iter)}, TMP_Foobar_1.$$s = self, TMP_Foobar_1.$$arity = 0, TMP_Foobar_1))
+            CODE
+          end
         end
 
         context 'module' do
@@ -535,9 +553,9 @@ if (b == null) b = nil;
 
           it do
             is_expected.to include <<-CODE
-    ($a = ($b = self).$define_method, $a.$$p = (TMP_1 = function(){var self = TMP_1.$$s || this, $c, $d;
+    $send(self, 'define_method', ["wilma"], (TMP_Foobar_1 = function(){var self = TMP_Foobar_1.$$s || this;
 
-    return ($c = ($d = self, Opal.find_iter_super_dispatcher(self, null, (TMP_1.$$def || null), false, false)), $c.$$p = null, $c).call($d)}, TMP_1.$$s = self, TMP_1.$$arity = 0, TMP_1), $a).call($b, "wilma")
+    return $send(self, Opal.find_iter_super_dispatcher(self, null, (TMP_Foobar_1.$$def || null), false, false), [], null)}, TMP_Foobar_1.$$s = self, TMP_Foobar_1.$$arity = 0, TMP_Foobar_1))
             CODE
           end
         end
@@ -554,7 +572,13 @@ if (b == null) b = nil;
               CODE
             end
 
-            it { is_expected.to include "return ($e = ($f = self, Opal.find_iter_super_dispatcher(self, null, (TMP_2.$$def || TMP_1.$$def || null), false, false)), $e.$$p = null, $e).call($f)}, TMP_2.$$s = self, TMP_2.$$arity = 0, TMP_2), $c).call($d, \"foo\")}, TMP_1.$$s = self, TMP_1.$$arity = 0, TMP_1), $a).call($b)" }
+            it do
+              is_expected.to include <<-CODE
+  return $send(self, 'define_method', ["foo"], (TMP_2 = function(){var self = TMP_2.$$s || this;
+
+    return $send(self, Opal.find_iter_super_dispatcher(self, null, (TMP_2.$$def || TMP_1.$$def || null), false, false), [], null)}, TMP_2.$$s = self, TMP_2.$$arity = 0, TMP_2))}, TMP_1.$$s = self, TMP_1.$$arity = 0, TMP_1))
+              CODE
+            end
           end
 
           context 'alongside def''d method' do
@@ -576,7 +600,15 @@ if (b == null) b = nil;
               CODE
             end
 
-            it { is_expected.to include "return ($h = ($i = self, Opal.find_iter_super_dispatcher(self, null, (TMP_6.$$def || TMP_5.$$def || TMP_3.$$def || null), false, false)), $h.$$p = nil.$to_proc(), $h).call($i)}, TMP_6.$$s = self, TMP_6.$$arity = 0, TMP_6), $f).call($g)}, TMP_5.$$s = self, TMP_5.$$arity = 0, TMP_5), $d).call($e, \"a\");}, TMP_3.$$s = self, TMP_3.$$arity = 0, TMP_3), $a).call($c, sup);" }
+            it do
+              is_expected.to include <<-CODE.strip
+    return $send(self, 'define_method', ["a"], (TMP_5 = function(){var self = TMP_5.$$s || this, TMP_6;
+
+    return $send(self, 'fetch', [], (TMP_6 = function(){var self = TMP_6.$$s || this;
+
+      return $send(self, Opal.find_iter_super_dispatcher(self, null, (TMP_6.$$def || TMP_5.$$def || TMP_3.$$def || null), false, false), [], nil.$to_proc())}, TMP_6.$$s = self, TMP_6.$$arity = 0, TMP_6))}, TMP_5.$$s = self, TMP_5.$$arity = 0, TMP_5));}
+              CODE
+            end
           end
 
           context 'alongside another define_method' do
@@ -598,7 +630,7 @@ if (b == null) b = nil;
               CODE
             end
 
-            it { is_expected.to include "return ($i = ($j = self, Opal.find_iter_super_dispatcher(self, null, (TMP_6.$$def || TMP_5.$$def || TMP_3.$$def || null), false, false)), $i.$$p = nil.$to_proc(), $i).call($j)}, TMP_6.$$s = self, TMP_6.$$arity = 0, TMP_6), $g).call($h)}, TMP_5.$$s = self, TMP_5.$$arity = 0, TMP_5), $d).call($f, \"a\");}, TMP_3.$$s = self, TMP_3.$$arity = 0, TMP_3), $a).call($c, sup);" }
+            it { is_expected.to include "return $send(self, Opal.find_iter_super_dispatcher(self, null, (TMP_6.$$def || TMP_5.$$def || TMP_3.$$def || null), false, false), [], nil.$to_proc())" }
           end
 
           context 'not last method in class' do
@@ -620,7 +652,7 @@ if (b == null) b = nil;
               CODE
             end
 
-            it { is_expected.to include "return ($h = ($i = self, Opal.find_iter_super_dispatcher(self, null, (TMP_5.$$def || TMP_4.$$def || TMP_3.$$def || null), false, false)), $h.$$p = nil.$to_proc(), $h).call($i)}, TMP_5.$$s = self, TMP_5.$$arity = 0, TMP_5), $f).call($g)}, TMP_4.$$s = self, TMP_4.$$arity = 0, TMP_4), $d).call($e, \"a\");" }
+            it { is_expected.to include "return $send(self, Opal.find_iter_super_dispatcher(self, null, (TMP_5.$$def || TMP_4.$$def || TMP_3.$$def || null), false, false), [], nil.$to_proc())" }
           end
         end
 
@@ -645,8 +677,8 @@ if (b == null) b = nil;
             CODE
           end
 
-          it { is_expected.to include "return ($f = ($g = self, Opal.find_iter_super_dispatcher(self, 'foo', (TMP_4.$$def || TMP_3.$$def || TMP_5), false, false)), $f.$$p = block2.$to_proc(), $f).call($g, self.$some_arg())}, TMP_4.$$s = self, TMP_4.$$arity = 0, TMP_4), $d).call($e)}, TMP_3.$$s = self, TMP_3.$$arity = 0, TMP_3), $a).call($c, \"a\");" }
-          it { is_expected.to include "return ($g = ($h = self, Opal.find_iter_super_dispatcher(self, 'foo', (TMP_7.$$def || TMP_6.$$def || TMP_5), false, false)), $g.$$p = nil.$to_proc(), $g).call($h)}, TMP_7.$$s = self, TMP_7.$$arity = 0, TMP_7), $e).call($f)}, TMP_6.$$s = self, TMP_6.$$arity = 0, TMP_6), $a).call($d, \"a\")" }
+          it { is_expected.to include "return $send(self, Opal.find_iter_super_dispatcher(self, 'foo', (TMP_4.$$def || TMP_3.$$def || TMP_Bar_foo_5), false, false), [self.$some_arg()], block2.$to_proc())" }
+          it { is_expected.to include "return $send(self, Opal.find_iter_super_dispatcher(self, 'foo', (TMP_7.$$def || TMP_6.$$def || TMP_Bar_foo_5), false, false), [], nil.$to_proc())" }
         end
 
         context 'explicit' do
@@ -654,9 +686,9 @@ if (b == null) b = nil;
 
           it do
             is_expected.to include <<-CODE
-    return ($a = ($b = self).$define_method, $a.$$p = (TMP_1 = function(){var self = TMP_1.$$s || this, $c, $d;
+    return $send(self, 'define_method', ["wilma"], (TMP_Foobar_1 = function(){var self = TMP_Foobar_1.$$s || this;
 
-    return ($c = ($d = self, Opal.find_iter_super_dispatcher(self, null, (TMP_1.$$def || null), false, false)), $c.$$p = null, $c).call($d)}, TMP_1.$$s = self, TMP_1.$$arity = 0, TMP_1), $a).call($b, "wilma")
+    return $send(self, Opal.find_iter_super_dispatcher(self, null, (TMP_Foobar_1.$$def || null), false, false), [], null)}, TMP_Foobar_1.$$s = self, TMP_Foobar_1.$$arity = 0, TMP_Foobar_1))
             CODE
           end
         end
@@ -676,9 +708,9 @@ if (b == null) b = nil;
             CODE
           end
 
-          it { is_expected.to include "return ($e = ($f = self, Opal.find_iter_super_dispatcher(self, null, (TMP_2.$$def || TMP_1.$$def || null), false, true)), $e.$$p = $iter, $e).apply($f)}, TMP_2.$$s = self, TMP_2.$$arity = 0, TMP_2), $c).call($d, \"foo\");" }
+          it { is_expected.to include "return $send(self, Opal.find_iter_super_dispatcher(self, null, (TMP_2.$$def || TMP_1.$$def || null), false, true), [], $iter)" }
 
-          it { is_expected.to include "return ($c = ($d = self, Opal.find_iter_super_dispatcher(self, 'm', (TMP_5.$$def || TMP_6), false, true)), $c.$$p = $iter, $c).apply($d, $zuper)}, TMP_5.$$s = self, TMP_5.$$arity = 0, TMP_5), $a).call($b);" }
+          it { is_expected.to include "return $send(self, Opal.find_iter_super_dispatcher(self, 'm', (TMP_5.$$def || TMP_m_6), false, true), $zuper, $iter)" }
         end
       end
 
@@ -693,7 +725,7 @@ if (b == null) b = nil;
           CODE
         end
 
-        it { is_expected.to include "return ($a = ($b = self, Opal.find_super_dispatcher(self, 'some_method', TMP_1, false, $Foobar)), $a.$$p = $iter, $a).apply($b, $zuper);" }
+        it { is_expected.to include "return $send(self, Opal.find_super_dispatcher(self, 'some_method', TMP_Foobar_some_method_1, false, $Foobar), $zuper, $iter)" }
       end
     end
   end