opal 0.10.0.beta3 → 0.10.0.beta4

data/opal/corelib/runtime.js

@@ -904,7 +904,14 @@
         }
       }
 
-      parent = parent.$$is_class ? parent.$$super : null;
+      // only the actual singleton class gets included in its ancestry
+      // after that, traverse the normal class hierarchy
+      if (parent.$$is_singleton && parent.$$singleton_of.$$is_module) {
+        parent = parent.$$singleton_of.$$super;
+      }
+      else {
+        parent = parent.$$is_class ? parent.$$super : null;
+      }
     }
 
     return result;
@@ -993,7 +1000,10 @@
       method_missing_stub.$$p = null;
 
       // call method missing with correct args (remove '$' prefix on method name)
-      return this.$method_missing.apply(this, [method_name.slice(1)].concat($slice.call(arguments)));
+      var args_ary = new Array(arguments.length);
+      for(var i = 0, l = args_ary.length; i < l; i++) { args_ary[i] = arguments[i]; }
+
+      return this.$method_missing.apply(this, [method_name.slice(1)].concat(args_ary));
     }
 
     method_missing_stub.$$stub = true;
@@ -1005,7 +1015,13 @@
   // Methods
   // -------
 
-  // Arity count error dispatcher
+  // Arity count error dispatcher for methods
+  //
+  // @param actual [Fixnum] number of arguments given to method
+  // @param expected [Fixnum] expected number of arguments
+  // @param object [Object] owner of the method +meth+
+  // @param meth [String] method name that got wrong number of arguments
+  // @raise [ArgumentError]
   Opal.ac = function(actual, expected, object, meth) {
     var inspect = '';
     if (object.$$is_class || object.$$is_module) {
@@ -1019,6 +1035,18 @@
     throw Opal.ArgumentError.$new('[' + inspect + '] wrong number of arguments(' + actual + ' for ' + expected + ')');
   };
 
+  // Arity count error dispatcher for blocks
+  //
+  // @param actual [Fixnum] number of arguments given to block
+  // @param expected [Fixnum] expected number of arguments
+  // @param context [Object] context of the block definition
+  // @raise [ArgumentError]
+  Opal.block_ac = function(actual, expected, context) {
+    var inspect = "`block in " + context + "'";
+
+    throw Opal.ArgumentError.$new(inspect + ': wrong number of arguments (' + actual + ' for ' + expected + ')');
+  }
+
   // Super dispatcher
   Opal.find_super_dispatcher = function(obj, jsid, current_func, defcheck, defs) {
     var dispatcher;
@@ -1184,7 +1212,10 @@
     }
 
     if (!args.$$is_array) {
-      args = $slice.call(args);
+      var args_ary = new Array(args.length);
+      for(var i = 0, l = args_ary.length; i < l; i++) { args_ary[i] = args[i]; }
+
+      return block.apply(null, args_ary);
     }
 
     return block.apply(null, args);
@@ -1369,26 +1400,30 @@
   // @param mid  [String] ruby method to call
   // @return [Object] forwards the return value of the method (or of method_missing)
   Opal.send = function(recv, mid) {
-    var args = $slice.call(arguments, 2),
-        func = recv['$' + mid];
+    var args_ary = new Array(Math.max(arguments.length - 2, 0));
+    for(var i = 0, l = args_ary.length; i < l; i++) { args_ary[i] = arguments[i + 2]; }
+
+    var func = recv['$' + mid];
 
     if (func) {
-      return func.apply(recv, args);
+      return func.apply(recv, args_ary);
     }
 
-    return recv.$method_missing.apply(recv, [mid].concat(args));
+    return recv.$method_missing.apply(recv, [mid].concat(args_ary));
   };
 
   Opal.block_send = function(recv, mid, block) {
-    var args = $slice.call(arguments, 3),
-        func = recv['$' + mid];
+    var args_ary = new Array(Math.max(arguments.length - 3, 0));
+    for(var i = 0, l = args_ary.length; i < l; i++) { args_ary[i] = arguments[i + 3]; }
+
+    var func = recv['$' + mid];
 
     if (func) {
       func.$$p = block;
-      return func.apply(recv, args);
+      return func.apply(recv, args_ary);
     }
 
-    return recv.$method_missing.apply(recv, [mid].concat(args));
+    return recv.$method_missing.apply(recv, [mid].concat(args_ary));
   };
 
   // Used to define methods on an object. This is a helper method, used by the

data/spec/filters/bugs/date.rb

@@ -1,8 +1,4 @@
 opal_filter "Date" do
-  fails "Date#<< raises an error on non numeric parameters"
-  fails "Date#<=> returns -1 when self is less than a Numeric"
-  fails "Date#<=> returns 1 when self is greater than a Numeric"
-  fails "Date#=== compares to another numeric"
   fails "Date#>> returns the day of the reform if date falls within calendar reform"
   fails "Date#ajd determines the Astronomical Julian day"
   fails "Date#amjd determines the Astronomical Modified Julian day"
@@ -12,8 +8,6 @@ opal_filter "Date" do
   fails "Date#commercial Creates a Date for the correct day given the year, week and day number"
   fails "Date#commercial Creates a Date for the monday in the year and week given"
   fails "Date#commercial creates only Date objects for valid weeks"
-  fails "Date#cwday determines the commercial week day"
-  fails "Date#cweek determines the commercial week"
   fails "Date#cwyear determines the commercial year"
   fails "Date#day_fraction determines the day fraction"
   fails "Date#downto creates earlier dates when passed a negative step"
@@ -21,8 +15,6 @@ opal_filter "Date" do
   fails "Date#gregorian converts a date object into another with the Gregorian calendar"
   fails "Date#gregorian? marks a day after the calendar reform as Julian"
   fails "Date#gregorian? marks a day before the calendar reform as Julian"
-  fails "Date#gregorian_leap? returns false if a year is not a leap year in the Gregorian calendar"
-  fails "Date#gregorian_leap? returns true if a year is a leap year in the Gregorian calendar"
   fails "Date#hash returns the same value for equal dates"
   fails "Date#italy converts a date object into another with the Italian calendar reform"
   fails "Date#julian converts a date object into another with the Julian calendar"
@@ -36,7 +28,6 @@ opal_filter "Date" do
   fails "Date#parse parses a day name into a Date object"
   fails "Date#parse parses a month day into a Date object"
   fails "Date#parse parses a month name into a Date object"
-  fails "Date#parse parses DDD as year day number" # requires Date.gregorian_leap?
   fails "Date#prev_year returns the day of the reform if date falls within calendar reform"
   fails "Date#step steps backward in time"
   fails "Date#step steps forward in time"

data/spec/filters/bugs/hash.rb

@@ -2,8 +2,6 @@ opal_filter "Hash" do
   fails "Hash#== compares keys with eql? semantics" # spec relies on integer and float being different
   fails "Hash#== computes equality for complex recursive hashes"
   fails "Hash#== computes equality for recursive hashes & arrays"
-  fails "Hash#each yields the key only to a block expecting |key,|" # procs in Opal do not have access to this info (yet)
-  fails "Hash#each_pair yields the key only to a block expecting |key,|" # procs in Opal do not have access to this info (yet)
   fails "Hash#eql? compares keys with eql? semantics" # spec relies on integer and float being different
   fails "Hash#eql? computes equality for complex recursive hashes"
   fails "Hash#eql? computes equality for recursive hashes & arrays"

data/spec/filters/bugs/kernel.rb

@@ -273,14 +273,9 @@ opal_filter "Kernel" do
   fails "Kernel.__method__ returns the caller from define_method too"
   fails "Kernel.global_variables finds subset starting with std"
   fails "Kernel.global_variables is a private method"
-  fails "Kernel.lambda accepts 0 arguments when used with ||"
-  fails "Kernel.lambda checks the arity of the call when no args are specified"
-  fails "Kernel.lambda checks the arity when 1 arg is specified"
-  fails "Kernel.lambda does not check the arity when passing a Proc with &"
   fails "Kernel.lambda is a private method"
   fails "Kernel.lambda raises an ArgumentError when no block is given"
   fails "Kernel.lambda returns from the lambda itself, not the creation site of the lambda"
-  fails "Kernel.lambda strictly checks the arity when 0 or 2..inf args are specified"
   fails "Kernel.loop is a private method"
   fails "Kernel.loop rescues StopIteration"
   fails "Kernel.loop rescues StopIteration's subclasses"

data/spec/filters/bugs/language.rb

@@ -32,13 +32,9 @@ opal_filter "language" do
   fails "A constant on a singleton class is not defined on the object's class"
   fails "A constant on a singleton class is not preserved when the object is duped"
   fails "A constant on a singleton class raises a NameError for anonymous_module::CONST"
-  fails "A lambda expression 'lambda { ... }' assigns variables from parameters for definition '@a = lambda { |a, | a }'" # requires arity checking to be enabled
-  fails "A lambda expression 'lambda { ... }' assigns variables from parameters for definition \n    def m(*a) yield(*a) end\n    @a = lambda { |a| a }"
   fails "A lambda expression 'lambda { ... }' assigns variables from parameters for definition \n    def m(a) yield a end\n    def m2() yield end\n    @a = lambda { |a, | a }"
   fails "A lambda expression 'lambda { ... }' requires a block"
   fails "A lambda expression 'lambda { ... }' with an implicit block can be created"
-  fails "A lambda literal -> () { } assigns variables from parameters for definition '@a = -> (a, b) { [a, b] }'"
-  fails "A lambda literal -> () { } assigns variables from parameters for definition '@a = -> (a={}) { a }'"
   fails "A lambda literal -> () { } assigns variables from parameters for definition \n    @a = -> (a: @a = -> (a: 1) { a }, b:) do\n      [a, b]\n    end"
   fails "A lambda literal -> () { } assigns variables from parameters with circular optional argument reference shadows an existing local with the same name as the argument"
   fails "A lambda literal -> () { } assigns variables from parameters with circular optional argument reference shadows an existing method with the same name as the argument"
@@ -230,7 +226,6 @@ opal_filter "language" do
   fails "Predefined global $_ is set at the method-scoped level rather than block-scoped"
   fails "Predefined global $_ is Thread-local"
   fails "The predefined global constants includes TOPLEVEL_BINDING"
-  fails "A block yielded a single Array assigns the first element to a single argument with trailing comma"
   fails "A block yielded a single Array assigns elements to required arguments when a keyword rest argument is present"
   fails "A block yielded a single Array assigns symbol keys from a Hash to keyword arguments"
   fails "A block yielded a single Array assigns symbol keys from a Hash returned by #to_hash to keyword arguments"
@@ -242,7 +237,6 @@ opal_filter "language" do
   fails "A block taking identically-named arguments raises a SyntaxError for standard arguments"
   fails "Block-local variables can not have the same name as one of the standard parameters"
   fails "Block-local variables override shadowed variables from the outer scope"
-  fails "Post-args are required"
   fails "Post-args with optional args with a circular argument reference shadows an existing method with the same name as the argument"
   fails "Post-args with optional args with a circular argument reference shadows an existing local with the same name as the argument"
   fails "The break statement in a captured block when the invocation of the scope creating the block is still active raises a LocalJumpError when invoking the block from the scope creating the block"
@@ -257,19 +251,6 @@ opal_filter "language" do
   fails "The break statement in a lambda from a scope that has returned raises a LocalJumpError when yielding to a lambda passed as a block argument"
   fails "Break inside a while loop with a value passes the value returned by a method with omitted parenthesis and passed block"
   fails "Executing break from within a block returns from the original invoking method even in case of chained calls"
-  fails "A Proc taking zero arguments raises an ArgumentErro if a value is passed"
-  fails "A Proc taking || arguments raises an ArgumentError if a value is passed"
-  fails "A Proc taking |a| arguments raises an ArgumentError if no value is passed"
-  fails "A Proc taking |a, b| arguments raises an ArgumentError if passed no values"
-  fails "A Proc taking |a, b| arguments raises an ArgumentError if passed one value"
-  fails "A Proc taking |a, b| arguments does not call #to_ary to convert a single passed object to an Array"
-  fails "A Proc taking |a, *b| arguments raises an ArgumentError if passed no values"
-  fails "A Proc taking |a, | arguments raises an ArgumentError when passed no values"
-  fails "A Proc taking |a, | arguments raises an ArgumentError when passed more than one value"
-  fails "A Proc taking |(a, b)| arguments raises an ArgumentError when passed no values"
-  fails "A Proc taking |(a, b)| arguments calls #to_ary to convert a single passed object to an Array"
-  fails "A Proc taking |(a, b)| arguments calls #to_ary to convert a single passed object to an Array"
-  fails "A Proc taking |(a, b)| arguments raises a TypeError if #to_ary does not return an Array"
   fails "A singleton method definition can be declared for a global variable"
   fails "A nested method definition creates an instance method when evaluated in an instance method"
   fails "A nested method definition creates a class method when evaluated in a class method"
@@ -286,4 +267,8 @@ opal_filter "language" do
   fails "Invoking a method allows []= with a *args and multiple rhs args"
   fails "Invoking a method does not expand final array arguments after a splat expansion"
   fails "Invoking a private getter method does not permit self as a receiver"
+  fails "The yield call taking no arguments ignores assignment to the explicit block argument and calls the passed block"
+  fails "The return keyword invoked with a method call without parentheses with a block returns the value returned from the method call"
+  fails "The next statement from within the block passes the value returned by a method with omitted parenthesis and passed block"
+  fails "The next statement in a method is invalid and raises a SyntaxError"
 end

data/spec/filters/bugs/module.rb

@@ -63,16 +63,10 @@ opal_filter "Module" do
   fails "Module#autoload when changing $LOAD_PATH does not reload a file due to a different load path"
   fails "Module#autoload? returns nil if no file has been registered for a constant"
   fails "Module#autoload? returns the name of the file that will be autoloaded"
-  fails "Module#class_eval adds methods respecting the lexical constant scope"
   fails "Module#class_eval converts a non-string filename to a string using to_str"
   fails "Module#class_eval converts non string eval-string to string using to_str"
-  fails "Module#class_eval defines constants in the receiver's scope"
-  fails "Module#class_eval evaluates a given string in the context of self"
   fails "Module#class_eval raises a TypeError when the given eval-string can't be converted to string using to_str"
   fails "Module#class_eval raises a TypeError when the given filename can't be converted to string using to_str"
-  fails "Module#class_eval resolves constants in the caller scope ignoring send"
-  fails "Module#class_eval resolves constants in the caller scope"
-  fails "Module#class_eval resolves constants in the receiver's scope"
   fails "Module#class_eval uses the optional filename and lineno parameters for error messages"
   fails "Module#class_exec defines method in the receiver's scope"
   fails "Module#class_variable_defined? converts a non string/symbol/fixnum name to string using to_str"
@@ -95,22 +89,6 @@ opal_filter "Module" do
   fails "Module#constants returns all constants including inherited when passed true"
   fails "Module#constants returns an array of Symbol names of all constants defined in the module and all included modules"
   fails "Module#constants returns only public constants"
-  fails "Module#define_method does not change the arity check style of the original proc"
-  fails "Module#define_method passed {  } creates a method that raises an ArgumentError when passed one argument"
-  fails "Module#define_method passed {  } creates a method that raises an ArgumentError when passed two arguments"
-  fails "Module#define_method passed { |a, *b|  } creates a method that raises an ArgumentError when passed zero arguments"
-  fails "Module#define_method passed { |a, b, *c|  } creates a method that raises an ArgumentError when passed one argument and a block"
-  fails "Module#define_method passed { |a, b, *c|  } creates a method that raises an ArgumentError when passed one argument"
-  fails "Module#define_method passed { |a, b, *c|  } creates a method that raises an ArgumentError when passed zero arguments"
-  fails "Module#define_method passed { |a, b|  } creates a method that raises an ArgumentError when passed one argument and a block"
-  fails "Module#define_method passed { |a, b|  } creates a method that raises an ArgumentError when passed one argument"
-  fails "Module#define_method passed { |a, b|  } creates a method that raises an ArgumentError when passed three arguments"
-  fails "Module#define_method passed { |a, b|  } creates a method that raises an ArgumentError when passed zero arguments"
-  fails "Module#define_method passed { |a|  } creates a method that raises an ArgumentError when passed two arguments"
-  fails "Module#define_method passed { |a|  } creates a method that raises an ArgumentError when passed zero arguments and a block"
-  fails "Module#define_method passed { |a|  } creates a method that raises an ArgumentError when passed zero arguments"
-  fails "Module#define_method passed { ||  } creates a method that raises an ArgumentError when passed one argument"
-  fails "Module#define_method passed { ||  } creates a method that raises an ArgumentError when passed two arguments"
   fails "Module#define_method raises a TypeError when a Method from a singleton class is defined on another class"
   fails "Module#define_method raises a TypeError when a Method from one class is defined on an unrelated class"
   fails "Module#define_method raises a TypeError when an UnboundMethod from a child class is defined on a parent class"
@@ -140,16 +118,10 @@ opal_filter "Module" do
   fails "Module#const_defined? returns true when passed a scoped constant name for a constant in the inheritance hierarchy and the inherited flag is true"
   fails "Module#const_defined? returns true or false for the nested name"
   fails "Module#const_defined? returns true when passed a constant name with EUC-JP characters"
-  fails "Module#module_eval adds methods respecting the lexical constant scope"
   fails "Module#module_eval converts a non-string filename to a string using to_str"
   fails "Module#module_eval converts non string eval-string to string using to_str"
-  fails "Module#module_eval defines constants in the receiver's scope"
-  fails "Module#module_eval evaluates a given string in the context of self"
   fails "Module#module_eval raises a TypeError when the given eval-string can't be converted to string using to_str"
   fails "Module#module_eval raises a TypeError when the given filename can't be converted to string using to_str"
-  fails "Module#module_eval resolves constants in the caller scope ignoring send"
-  fails "Module#module_eval resolves constants in the caller scope"
-  fails "Module#module_eval resolves constants in the receiver's scope"
   fails "Module#module_eval uses the optional filename and lineno parameters for error messages"
   fails "Module#module_exec defines method in the receiver's scope"
   fails "Module#module_function as a toggle (no arguments) in a Module body does not affect module_evaled method definitions also if outside the eval itself"
@@ -221,6 +193,4 @@ opal_filter "Module" do
   fails "Module.new creates a new Module and passes it to the provided block"
   fails "Module::Nesting returns the list of Modules nested at the point of call"
   fails "Module::Nesting returns the nesting for module/class declaring the called method"
-  fails "passed { |a, b = 1|  } creates a method that raises an ArgumentError when passed three arguments"
-  fails "passed { |a, b = 1|  } creates a method that raises an ArgumentError when passed zero arguments"
 end

data/spec/filters/bugs/pathname.rb

@@ -0,0 +1,5 @@
+opal_filter "Pathname" do
+  fails "Pathname#relative_path_from raises an error when the two paths do not share a common prefix"
+  fails "Pathname#relative_path_from raises an error when the base directory has .."
+  fails "Pathname#relative_path_from returns current and pattern when only those patterns are used"
+end

data/spec/filters/bugs/proc.rb

@@ -1,11 +1,7 @@
 opal_filter "Proc" do
   fails "Proc as an implicit block pass argument remains the same object if re-vivified by the target method"
-  fails "Proc#=== on a Proc created with Kernel#lambda or Kernel#proc raises an ArgumentError on excess arguments when self is a lambda"
-  fails "Proc#=== on a Proc created with Kernel#lambda or Kernel#proc raises an ArgumentError on missing arguments when self is a lambda"
   fails "Proc#binding returns a Binding instance"
   fails "Proc#binding returns the binding associated with self"
-  fails "Proc#call on a Proc created with Kernel#lambda or Kernel#proc raises an ArgumentError on excess arguments when self is a lambda"
-  fails "Proc#call on a Proc created with Kernel#lambda or Kernel#proc raises an ArgumentError on missing arguments when self is a lambda"
   fails "Proc#curry with arity argument returns Procs with arities of -1 regardless of the value of _arity_"
   fails "Proc#inspect for a proc created with UnboundMethod#to_proc returns a description including '(lambda)' and optionally including file and line number"
   fails "Proc#inspect for a proc created with lambda returns a description including '(lambda)' and optionally including file and line number"
@@ -19,8 +15,6 @@ opal_filter "Proc" do
   fails "Proc#source_location works even if the proc was created on the same line"
   fails "Proc#to_s for a proc created with UnboundMethod#to_proc returns a description including '(lambda)' and optionally including file and line number"
   fails "Proc#to_s for a proc created with lambda returns a description including '(lambda)' and optionally including file and line number"
-  fails "Proc#yield on a Proc created with Kernel#lambda or Kernel#proc raises an ArgumentError on excess arguments when self is a lambda"
-  fails "Proc#yield on a Proc created with Kernel#lambda or Kernel#proc raises an ArgumentError on missing arguments when self is a lambda"
   fails "Proc.allocate raises a TypeError"
   fails "Proc.new with a block argument called indirectly from a subclass returns the passed proc created from a block"
   fails "Proc.new with a block argument called indirectly from a subclass returns the passed proc created from a method"

data/spec/filters/unsupported/thread.rb

@@ -3,4 +3,5 @@ opal_filter "Thread" do
   fails "The throw keyword raises an ArgumentError if used to exit a thread"
   fails "The throw keyword clears the current exception"
   fails "Module#autoload loads the registered constant even if the constant was already loaded by another thread"
+  fails "The return keyword in a Thread raises a LocalJumpError if used to exit a thread"
 end

data/spec/lib/compiler_spec.rb

@@ -172,7 +172,7 @@ describe Opal::Compiler do
         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.$$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)))')
         end
 
         it 'specifically == excludes nil check for strings' do
@@ -180,7 +180,7 @@ describe Opal::Compiler do
         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.$$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)))')
         end
 
         it 'specifically == excludes nil check for lvars' do
@@ -188,7 +188,7 @@ 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.$$is_boolean || $a == true))) ")
+          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))) ")
         end
 
         it 'specifically == excludes nil check for constants' do
@@ -198,25 +198,25 @@ describe Opal::Compiler do
 
       context 'without operators' do
         it 'adds nil check for primitives' do
-          expect_compiled('foo = 42 if 2').to include('if ((($a = 2) !== nil && (!$a.$$is_boolean || $a == true)))')
-          expect_compiled('foo = 42 if 2.5').to include('if ((($a = 2.5) !== nil && (!$a.$$is_boolean || $a == true)))')
-          expect_compiled('foo = 42 if true').to include('if ((($a = true) !== nil && (!$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.$$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.$$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 (bar !== false && bar !== nil)')
+          expect_compiled("bar = 4\nfoo = 42 if bar").to include('if (bar !== false && bar !== nil && bar != null)')
         end
 
         it 'adds nil check for constants' do
-          expect_compiled("foo = 42 if Test").to include("if ((($a = $scope.get('Test')) !== nil && (!$a.$$is_boolean || $a == true)))")
+          expect_compiled("foo = 42 if Test").to include("if ((($a = $scope.get('Test')) !== nil && $a != null && (!$a.$$is_boolean || $a == true)))")
         end
       end
     end
@@ -224,52 +224,52 @@ 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.$$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.$$is_boolean || $a == true)))')
-          expect_compiled('foo = 42 if (true > false)').to include('if ((($a = ($rb_gt(true, false))) !== nil && (!$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.$$is_boolean || $a == true)))")
-          expect_compiled('foo = 42 if (2.5 == 3.5)').to include("if ((($a = ((2.5)['$=='](3.5))) !== nil && (!$a.$$is_boolean || $a == true)))")
-          expect_compiled('foo = 42 if (true == false)').to include("if ((($a = (true['$=='](false))) !== nil && (!$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.$$is_boolean || $a == true)))')
-          expect_compiled('foo = 42 if ("test" == "bar")').to include("if ((($a = (\"test\"['$=='](\"bar\"))) !== nil && (!$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.$$is_boolean || $a == true)))')
-          expect_compiled("bar = 4\nfoo = 42 if (bar == 5)").to include("if ((($a = (bar['$=='](5))) !== nil && (!$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.$$is_boolean || $a == true)))")
-          expect_compiled("foo = 42 if (Test == 4)").to include("if ((($a = ($scope.get('Test')['$=='](4))) !== nil && (!$a.$$is_boolean || $a == true)))")
+          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)))")
         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.$$is_boolean || $a == true)))')
-          expect_compiled('foo = 42 if (2.5)').to include('if ((($a = (2.5)) !== nil && (!$a.$$is_boolean || $a == true)))')
-          expect_compiled('foo = 42 if (true)').to include('if ((($a = (true)) !== nil && (!$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.$$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.$$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.$$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.$$is_boolean || $a == true)))")
+          expect_compiled("foo = 42 if (Test)").to include("if ((($a = ($scope.get('Test'))) !== nil && $a != null && (!$a.$$is_boolean || $a == true)))")
         end
       end
     end