rubinius-melbourne 2.2.0.0 → 2.2.1.0

data/ext/rubinius/melbourne/grammar.y

@@ -19,6 +19,7 @@
 
 #include "namespace.h"
 #include "melbourne.hpp"
+#include "missing.hpp"
 #include "grammar.hpp"
 #include "parser_state.hpp"
 #include "visitor.hpp"
@@ -7305,15 +7306,12 @@ parser_negate_lit(rb_parser_state* parser_state, NODE *node)
   case T_FIXNUM:
     node->nd_lit = LONG2FIX(-FIX2LONG(node->nd_lit));
     break;
-  case T_BIGNUM:
-  case T_RATIONAL:
-  case T_COMPLEX:
-    node->nd_lit = REF(rb_funcall(node->nd_lit, rb_intern("-@"), 0, 0));
-    break;
   case T_FLOAT:
     node->nd_lit = REF(rb_float_new(-NUM2DBL(node->nd_lit)));
     break;
+  case T_BIGNUM:
   default:
+    node->nd_lit = REF(rb_funcall(node->nd_lit, rb_intern("-@"), 0, 0));
     break;
   }
   return node;

data/ext/rubinius/melbourne/missing.hpp

@@ -0,0 +1,29 @@
+#ifndef MEL_MISSING_HPP
+#define MEL_MISSING_HPP
+
+extern "C" {
+
+#ifndef rb_long2int
+#if SIZEOF_INT < SIZEOF_LONG
+  int rb_long2int(long n) {
+    int i = (int)n;
+    if((long)i != n) {
+      rb_raise(rb_eRangeError, "long value is outside of range of int");
+    }
+    return i;
+  }
+#else
+#define rb_long2int(n)  ((int)n)
+#endif
+#endif
+
+#ifndef rb_rational_new
+VALUE rb_rational_new(VALUE a, VALUE b) {
+  VALUE cls = rb_const_get(rb_cObject, rb_intern("Rational"));
+  return rb_funcall(cls, rb_intern("new"), 2, a, b);
+}
+#endif
+
+} /* extern "C" */
+
+#endif

data/lib/rubinius/melbourne/version.rb

@@ -1,5 +1,5 @@
 module CodeTools
   class Melbourne
-    VERSION = "2.2.0.0"
+    VERSION = "2.2.1.0"
   end
 end

data/spec/attrasgn_spec.rb

@@ -21,8 +21,9 @@ describe "An Attrasgn node" do
      [:call, nil, :a, [:arglist]],
      :[]=,
      [:arglist,
-      [:splat, [:call, nil, :b, [:arglist]]],
-      [:call, nil, :c, [:arglist]]]]
+      [:argspush,
+       [:splat, [:call, nil, :b, [:arglist]]],
+       [:call, nil, :c, [:arglist]]]]]
   end
 
   parse "a[b, *c] = d" do
@@ -30,10 +31,11 @@ describe "An Attrasgn node" do
      [:call, nil, :a, [:arglist]],
      :[]=,
      [:arglist,
-      [:argscat,
-       [:array, [:call, nil, :b, [:arglist]]],
-       [:call, nil, :c, [:arglist]]],
-      [:call, nil, :d, [:arglist]]]]
+      [:argspush,
+       [:argscat,
+        [:array, [:call, nil, :b, [:arglist]]],
+        [:call, nil, :c, [:arglist]]],
+       [:call, nil, :d, [:arglist]]]]]
   end
 
   parse "a[b, *c] = *d" do
@@ -41,10 +43,11 @@ describe "An Attrasgn node" do
      [:call, nil, :a, [:arglist]],
      :[]=,
      [:arglist,
-      [:argscat,
-       [:array, [:call, nil, :b, [:arglist]]],
-       [:call, nil, :c, [:arglist]]],
-      [:splat, [:call, nil, :d, [:arglist]]]]]
+      [:argspush,
+       [:argscat,
+        [:array, [:call, nil, :b, [:arglist]]],
+        [:call, nil, :c, [:arglist]]],
+       [:splat, [:call, nil, :d, [:arglist]]]]]]
   end
 
   parse "a[b, *c] = d, e" do
@@ -52,10 +55,11 @@ describe "An Attrasgn node" do
      [:call, nil, :a, [:arglist]],
      :[]=,
      [:arglist,
-      [:argscat,
-       [:array, [:call, nil, :b, [:arglist]]],
-       [:call, nil, :c, [:arglist]]],
-      [:array, [:call, nil, :d, [:arglist]], [:call, nil, :e, [:arglist]]]]]
+      [:argspush,
+       [:argscat,
+        [:array, [:call, nil, :b, [:arglist]]],
+        [:call, nil, :c, [:arglist]]],
+       [:array, [:call, nil, :d, [:arglist]], [:call, nil, :e, [:arglist]]]]]]
   end
 
   parse "a[42] = 24" do

data/spec/defn_spec.rb

@@ -70,7 +70,7 @@ describe "A Defn node" do
       def m(a:) end
     ruby
 
-    [:defn, :m, [:args, :a, [:block, [:a]]], [:scope, [:block, [:nil]]]]
+    [:defn, :m, [:args, :a, [:kwargs, [:a]]], [:scope, [:block, [:nil]]]]
   end
 
   parse <<-ruby do
@@ -79,7 +79,7 @@ describe "A Defn node" do
 
     [:defn,
      :m,
-     [:args, :a, [:block, [:a], [[:lasgn, :a, [:lit, 1]]]]],
+     [:args, :a, [:kwargs, [:a], [[:lasgn, :a, [:lit, 1]]]]],
      [:scope, [:block, [:nil]]]]
   end
 
@@ -87,14 +87,14 @@ describe "A Defn node" do
       def m(**) end
     ruby
 
-    [:defn, :m, [:args, :**, [:block, [:**]]], [:scope, [:block, [:nil]]]]
+    [:defn, :m, [:args, :**, [:kwargs, [:**]]], [:scope, [:block, [:nil]]]]
   end
 
   parse <<-ruby do
       def m(**k) end
     ruby
 
-    [:defn, :m, [:args, :"**k", [:block, [:"**k"]]], [:scope, [:block, [:nil]]]]
+    [:defn, :m, [:args, :"**k", [:kwargs, [:"**k"]]], [:scope, [:block, [:nil]]]]
   end
 
   parse <<-ruby do
@@ -268,7 +268,7 @@ describe "A Defn node" do
       def m(a, b:) end
     ruby
 
-    [:defn, :m, [:args, :a, :b, [:block, [:b]]], [:scope, [:block, [:nil]]]]
+    [:defn, :m, [:args, :a, :b, [:kwargs, [:b]]], [:scope, [:block, [:nil]]]]
   end
 
   parse <<-ruby do
@@ -277,7 +277,7 @@ describe "A Defn node" do
 
     [:defn,
      :m,
-     [:args, :a, :b, [:block, [:b], [[:lasgn, :b, [:lit, 1]]]]],
+     [:args, :a, :b, [:kwargs, [:b], [[:lasgn, :b, [:lit, 1]]]]],
      [:scope, [:block, [:nil]]]]
   end
 
@@ -285,7 +285,7 @@ describe "A Defn node" do
       def m(a, **) end
     ruby
 
-    [:defn, :m, [:args, :a, :**, [:block, [:**]]], [:scope, [:block, [:nil]]]]
+    [:defn, :m, [:args, :a, :**, [:kwargs, [:**]]], [:scope, [:block, [:nil]]]]
   end
 
   parse <<-ruby do
@@ -294,7 +294,7 @@ describe "A Defn node" do
 
     [:defn,
      :m,
-     [:args, :a, :"**k", [:block, [:"**k"]]],
+     [:args, :a, :"**k", [:kwargs, [:"**k"]]],
      [:scope, [:block, [:nil]]]]
   end
 
@@ -463,7 +463,7 @@ describe "A Defn node" do
 
     [:defn,
      :m,
-     [:args, :a, :b, [:block, [:lasgn, :a, [:lit, 1]]], [:block, [:b]]],
+     [:args, :a, :b, [:block, [:lasgn, :a, [:lit, 1]]], [:kwargs, [:b]]],
      [:scope, [:block, [:nil]]]]
   end
 
@@ -477,7 +477,7 @@ describe "A Defn node" do
       :a,
       :b,
       [:block, [:lasgn, :a, [:lit, 1]]],
-      [:block, [:b], [[:lasgn, :b, [:lit, 2]]]]],
+      [:kwargs, [:b], [[:lasgn, :b, [:lit, 2]]]]],
      [:scope, [:block, [:nil]]]]
   end
 
@@ -487,7 +487,7 @@ describe "A Defn node" do
 
     [:defn,
      :m,
-     [:args, :a, :**, [:block, [:lasgn, :a, [:lit, 1]]], [:block, [:**]]],
+     [:args, :a, :**, [:block, [:lasgn, :a, [:lit, 1]]], [:kwargs, [:**]]],
      [:scope, [:block, [:nil]]]]
   end
 
@@ -497,7 +497,7 @@ describe "A Defn node" do
 
     [:defn,
      :m,
-     [:args, :a, :"**k", [:block, [:lasgn, :a, [:lit, 1]]], [:block, [:"**k"]]],
+     [:args, :a, :"**k", [:block, [:lasgn, :a, [:lit, 1]]], [:kwargs, [:"**k"]]],
      [:scope, [:block, [:nil]]]]
   end
 
@@ -529,14 +529,14 @@ describe "A Defn node" do
       def m(*, a:) end
     ruby
 
-    [:defn, :m, [:args, :*, :a, [:block, [:a]]], [:scope, [:block, [:nil]]]]
+    [:defn, :m, [:args, :*, :a, [:kwargs, [:a]]], [:scope, [:block, [:nil]]]]
   end
 
   parse <<-ruby do
       def m(*a, b:) end
     ruby
 
-    [:defn, :m, [:args, :"*a", :b, [:block, [:b]]], [:scope, [:block, [:nil]]]]
+    [:defn, :m, [:args, :"*a", :b, [:kwargs, [:b]]], [:scope, [:block, [:nil]]]]
   end
 
   parse <<-ruby do
@@ -545,7 +545,7 @@ describe "A Defn node" do
 
     [:defn,
      :m,
-     [:args, :*, :a, [:block, [:a], [[:lasgn, :a, [:lit, 1]]]]],
+     [:args, :*, :a, [:kwargs, [:a], [[:lasgn, :a, [:lit, 1]]]]],
      [:scope, [:block, [:nil]]]]
   end
 
@@ -555,7 +555,7 @@ describe "A Defn node" do
 
     [:defn,
      :m,
-     [:args, :"*a", :b, [:block, [:b], [[:lasgn, :b, [:lit, 1]]]]],
+     [:args, :"*a", :b, [:kwargs, [:b], [[:lasgn, :b, [:lit, 1]]]]],
      [:scope, [:block, [:nil]]]]
   end
 
@@ -563,14 +563,14 @@ describe "A Defn node" do
       def m(*, **) end
     ruby
 
-    [:defn, :m, [:args, :*, :**, [:block, [:**]]], [:scope, [:block, [:nil]]]]
+    [:defn, :m, [:args, :*, :**, [:kwargs, [:**]]], [:scope, [:block, [:nil]]]]
   end
 
   parse <<-ruby do
       def m(*a, **) end
     ruby
 
-    [:defn, :m, [:args, :"*a", :**, [:block, [:**]]], [:scope, [:block, [:nil]]]]
+    [:defn, :m, [:args, :"*a", :**, [:kwargs, [:**]]], [:scope, [:block, [:nil]]]]
   end
 
   parse <<-ruby do
@@ -579,7 +579,7 @@ describe "A Defn node" do
 
     [:defn,
      :m,
-     [:args, :*, :"**k", [:block, [:"**k"]]],
+     [:args, :*, :"**k", [:kwargs, [:"**k"]]],
      [:scope, [:block, [:nil]]]]
   end
 
@@ -589,7 +589,7 @@ describe "A Defn node" do
 
     [:defn,
      :m,
-     [:args, :"*a", :"**k", [:block, [:"**k"]]],
+     [:args, :"*a", :"**k", [:kwargs, [:"**k"]]],
      [:scope, [:block, [:nil]]]]
   end
 
@@ -611,7 +611,7 @@ describe "A Defn node" do
       def m(a:, b:) end
     ruby
 
-    [:defn, :m, [:args, :a, :b, [:block, [:a, :b]]], [:scope, [:block, [:nil]]]]
+    [:defn, :m, [:args, :a, :b, [:kwargs, [:a, :b]]], [:scope, [:block, [:nil]]]]
   end
 
   parse <<-ruby do
@@ -620,7 +620,7 @@ describe "A Defn node" do
 
     [:defn,
      :m,
-     [:args, :a, :b, [:block, [:a, :b], [[:lasgn, :b, [:lit, 1]]]]],
+     [:args, :a, :b, [:kwargs, [:a, :b], [[:lasgn, :b, [:lit, 1]]]]],
      [:scope, [:block, [:nil]]]]
   end
 
@@ -628,7 +628,7 @@ describe "A Defn node" do
       def m(a:, **) end
     ruby
 
-    [:defn, :m, [:args, :a, :**, [:block, [:a, :**]]], [:scope, [:block, [:nil]]]]
+    [:defn, :m, [:args, :a, :**, [:kwargs, [:a, :**]]], [:scope, [:block, [:nil]]]]
   end
 
   parse <<-ruby do
@@ -637,7 +637,7 @@ describe "A Defn node" do
 
     [:defn,
      :m,
-     [:args, :a, :"**k", [:block, [:a, :"**k"]]],
+     [:args, :a, :"**k", [:kwargs, [:a, :"**k"]]],
      [:scope, [:block, [:nil]]]]
   end
 
@@ -645,7 +645,7 @@ describe "A Defn node" do
       def m(a:, &b) end
     ruby
 
-    [:defn, :m, [:args, :a, :"&b", [:block, [:a]]], [:scope, [:block, [:nil]]]]
+    [:defn, :m, [:args, :a, :"&b", [:kwargs, [:a]]], [:scope, [:block, [:nil]]]]
   end
 
   parse <<-ruby do
@@ -654,7 +654,7 @@ describe "A Defn node" do
 
     [:defn,
      :m,
-     [:args, :a, :b, [:block, [:a, :b], [[:lasgn, :a, [:lit, 1]]]]],
+     [:args, :a, :b, [:kwargs, [:a, :b], [[:lasgn, :a, [:lit, 1]]]]],
      [:scope, [:block, [:nil]]]]
   end
 
@@ -667,13 +667,13 @@ describe "A Defn node" do
      [:args,
       :a,
       :b,
-      [:block,
+      [:kwargs,
        [:a, :b],
        [[:lasgn,
          :a,
          [:defn,
           :m,
-          [:args, :a, [:block, [:a], [[:lasgn, :a, [:lit, 1]]]]],
+          [:args, :a, [:kwargs, [:a], [[:lasgn, :a, [:lit, 1]]]]],
           [:scope, [:block, [:lvar, :a]]]]]]]],
      [:scope, [:block, [:nil]]]]
   end
@@ -687,7 +687,7 @@ describe "A Defn node" do
      [:args,
       :a,
       :b,
-      [:block, [:a, :b], [[:lasgn, :a, [:lit, 1]], [:lasgn, :b, [:lit, 2]]]]],
+      [:kwargs, [:a, :b], [[:lasgn, :a, [:lit, 1]], [:lasgn, :b, [:lit, 2]]]]],
      [:scope, [:block, [:nil]]]]
   end
 
@@ -697,7 +697,7 @@ describe "A Defn node" do
 
     [:defn,
      :m,
-     [:args, :a, :**, [:block, [:a, :**], [[:lasgn, :a, [:lit, 1]]]]],
+     [:args, :a, :**, [:kwargs, [:a, :**], [[:lasgn, :a, [:lit, 1]]]]],
      [:scope, [:block, [:nil]]]]
   end
 
@@ -707,7 +707,7 @@ describe "A Defn node" do
 
     [:defn,
      :m,
-     [:args, :a, :"**k", [:block, [:a, :"**k"], [[:lasgn, :a, [:lit, 1]]]]],
+     [:args, :a, :"**k", [:kwargs, [:a, :"**k"], [[:lasgn, :a, [:lit, 1]]]]],
      [:scope, [:block, [:nil]]]]
   end
 
@@ -717,7 +717,7 @@ describe "A Defn node" do
 
     [:defn,
      :m,
-     [:args, :a, :"&b", [:block, [:a], [[:lasgn, :a, [:lit, 1]]]]],
+     [:args, :a, :"&b", [:kwargs, [:a], [[:lasgn, :a, [:lit, 1]]]]],
      [:scope, [:block, [:nil]]]]
   end
 
@@ -725,7 +725,7 @@ describe "A Defn node" do
       def m(**, &b) end
     ruby
 
-    [:defn, :m, [:args, :**, :"&b", [:block, [:**]]], [:scope, [:block, [:nil]]]]
+    [:defn, :m, [:args, :**, :"&b", [:kwargs, [:**]]], [:scope, [:block, [:nil]]]]
   end
 
   parse <<-ruby do
@@ -734,7 +734,7 @@ describe "A Defn node" do
 
     [:defn,
      :m,
-     [:args, :"**k", :"&b", [:block, [:"**k"]]],
+     [:args, :"**k", :"&b", [:kwargs, [:"**k"]]],
      [:scope, [:block, [:nil]]]]
   end
 
@@ -755,7 +755,7 @@ describe "A Defn node" do
       :"**k",
       :"&l",
       [:block, [:lasgn, :b, [:lit, 1]]],
-      [:block, [:e, :f, :g, :"**k"], [[:lasgn, :f, [:lit, 2]]]]],
+      [:kwargs, [:e, :f, :g, :"**k"], [[:lasgn, :f, [:lit, 2]]]]],
      [:scope, [:block, [:nil]]]]
   end
 
@@ -777,7 +777,7 @@ describe "A Defn node" do
       :"**k",
       :"&l",
       [:block, [:lasgn, :b, [:lit, 1]]],
-      [:block, [:e, :f, :g, :"**k"], [[:lasgn, :f, [:lit, 2]]]]],
+      [:kwargs, [:e, :f, :g, :"**k"], [[:lasgn, :f, [:lit, 2]]]]],
      [:scope, [:block, [:nil]]]]
   end
 end

data/spec/defs_spec.rb

@@ -67,7 +67,7 @@ describe "A Defs node" do
       :"**k",
       :"&l",
       [:block, [:lasgn, :b, [:lit, 1]]],
-      [:block, [:e, :f, :g, :"**k"], [[:lasgn, :f, [:lit, 2]]]]],
+      [:kwargs, [:e, :f, :g, :"**k"], [[:lasgn, :f, [:lit, 2]]]]],
      [:scope, [:block, [:nil]]]]
   end
 
@@ -90,7 +90,7 @@ describe "A Defs node" do
       :"**k",
       :"&l",
       [:block, [:lasgn, :b, [:lit, 1]]],
-      [:block, [:e, :f, :g, :"**k"], [[:lasgn, :f, [:lit, 2]]]]],
+      [:kwargs, [:e, :f, :g, :"**k"], [[:lasgn, :f, [:lit, 2]]]]],
      [:scope, [:block, [:nil]]]]
   end
 end

data/spec/for_spec.rb

@@ -6,7 +6,7 @@ describe "A For node" do
     ruby
 
     [:for,
-     [:lasgn, :o],
+     [:args, [:lasgn, :o]],
      [:call, nil, :ary, [:arglist]],
      [:call, nil, :puts, [:arglist, [:lvar, :o]]]]
   end
@@ -18,7 +18,7 @@ describe "A For node" do
     ruby
 
     [:for,
-     [:lasgn, :i],
+     [:args, [:lasgn, :i]],
      [:dot2, [:lit, 0], [:call, nil, :max, [:arglist]]],
      [:nil]]
   end
@@ -30,7 +30,7 @@ describe "A For node" do
     ruby
 
     [:for,
-     [:masgn, [:array, [:lasgn, :a], [:lasgn, :b]]],
+     [:args, [:masgn, [:array, [:lasgn, :a], [:lasgn, :b]]]],
      [:call, nil, :x, [:arglist]],
      [:lit, 5]]
   end
@@ -41,7 +41,7 @@ describe "A For node" do
       end
     ruby
 
-    [:for, [:lasgn, :i], [:nil], [:lvar, :i]]
+    [:for, [:args, [:lasgn, :i]], [:nil], [:lvar, :i]]
   end
 
   parse <<-ruby do
@@ -56,8 +56,8 @@ describe "A For node" do
     [:block,
      [:lasgn, :c, [:lit, 1]],
      [:for,
-      [:lasgn, :i],
+      [:args, [:lasgn, :i]],
       [:call, nil, :a, [:arglist]],
-      [:for, [:lasgn, :j], [:call, nil, :b, [:arglist]], [:lvar, :c]]]]
+      [:for, [:args, [:lasgn, :j]], [:call, nil, :b, [:arglist]], [:lvar, :c]]]]
   end
 end