Introduce Opal.to_ary runtime helper

to_ary is used to implicitly convert objects into arrays where they are expected, e.g. mass-assignments
opal · Sep 11, 2013 · ba7ea76 · ba7ea76
1 parent 3340e71
commit ba7ea76
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/corelib/runtime.js b/corelib/runtime.js
@@ -330,6 +330,15 @@
     return block.apply(null, args);
   };
 
+  // Helper to convert the given object to an array
+  Opal.to_ary = function(value) {
+    if (value._isArray) {
+      return value;
+    }
+
+    return [value];
+  };
+
   /*
     Call a ruby method on a ruby object with some arguments:
 

diff --git a/lib/opal/parser.rb b/lib/opal/parser.rb
@@ -1479,8 +1479,7 @@ def process_masgn(sexp, level)
         len = rhs.length - 1 # we are guaranteed an array of this length
         code << f("#{tmp} = ", sexp) << process(rhs)
       elsif rhs[0] == :to_ary
-        code << f("((#{tmp} = ", sexp) << process(rhs[1])
-        code << f(")._isArray ? #{tmp} : (#{tmp} = [#{tmp}]))", sexp)
+        code << [f("#{tmp} = $opal.to_ary("), process(rhs[1]), f(")")]
       elsif rhs[0] == :splat
         code << f("(#{tmp} = ", sexp) << process(rhs[1])
         code << f(")['$to_a'] ? (#{tmp} = #{tmp}['$to_a']()) : (#{tmp})._isArray ?  #{tmp} : (#{tmp} = [#{tmp}])", sexp)