rubinius-melbourne 2.2.0.0 → 2.2.1.0

data/spec/iter_spec.rb

@@ -98,14 +98,14 @@ describe "An Iter node" do
   end
 
   parse "m { |a:| }" do
-    [:call, nil, :m, [:arglist, [:iter, [:args, :a, [:block, [:a]]], [:nil]]]]
+    [:call, nil, :m, [:arglist, [:iter, [:args, :a, [:kwargs, [:a]]], [:nil]]]]
   end
 
   parse "m { |a:; x| }" do
     [:call,
      nil,
      :m,
-     [:arglist, [:iter, [:args, :a, [:block, [:a]]], [:block, [[:lvar, :x]]]]]]
+     [:arglist, [:iter, [:args, :a, [:kwargs, [:a]]], [:block, [[:lvar, :x]]]]]]
   end
 
   parse "m { |a: 1| }" do
@@ -113,7 +113,7 @@ describe "An Iter node" do
      nil,
      :m,
      [:arglist,
-      [:iter, [:args, :a, [:block, [:a], [[:lasgn, :a, [:lit, 1]]]]], [:nil]]]]
+      [:iter, [:args, :a, [:kwargs, [:a], [[:lasgn, :a, [:lit, 1]]]]], [:nil]]]]
   end
 
   parse "m { |a: 1; x| }" do
@@ -122,26 +122,26 @@ describe "An Iter node" do
      :m,
      [:arglist,
       [:iter,
-       [:args, :a, [:block, [:a], [[:lasgn, :a, [:lit, 1]]]]],
+       [:args, :a, [:kwargs, [:a], [[:lasgn, :a, [:lit, 1]]]]],
        [:block, [[:lvar, :x]]]]]]
   end
 
   parse "m { |**| }" do
-    [:call, nil, :m, [:arglist, [:iter, [:args, :**, [:block, [:**]]], [:nil]]]]
+    [:call, nil, :m, [:arglist, [:iter, [:args, :**, [:kwargs, [:**]]], [:nil]]]]
   end
 
   parse "m { |**; x| }" do
     [:call,
      nil,
      :m,
-     [:arglist, [:iter, [:args, :**, [:block, [:**]]], [:block, [[:lvar, :x]]]]]]
+     [:arglist, [:iter, [:args, :**, [:kwargs, [:**]]], [:block, [[:lvar, :x]]]]]]
   end
 
   parse "m { |**k| }" do
     [:call,
      nil,
      :m,
-     [:arglist, [:iter, [:args, :"**k", [:block, [:"**k"]]], [:nil]]]]
+     [:arglist, [:iter, [:args, :"**k", [:kwargs, [:"**k"]]], [:nil]]]]
   end
 
   parse "m { |**k; x| }" do
@@ -149,7 +149,7 @@ describe "An Iter node" do
      nil,
      :m,
      [:arglist,
-      [:iter, [:args, :"**k", [:block, [:"**k"]]], [:block, [[:lvar, :x]]]]]]
+      [:iter, [:args, :"**k", [:kwargs, [:"**k"]]], [:block, [[:lvar, :x]]]]]]
   end
 
   parse "m { |&b| }" do
@@ -161,11 +161,11 @@ describe "An Iter node" do
   end
 
   parse "m { |a, | }" do
-    [:call, nil, :m, [:arglist, [:iter, [:args, :a, :*], [:nil]]]]
+    [:call, nil, :m, [:arglist, [:iter, [:args, :a], [:nil]]]]
   end
 
   parse "m { |a,; x| }" do
-    [:call, nil, :m, [:arglist, [:iter, [:args, :a, :*], [:block, [[:lvar, :x]]]]]]
+    [:call, nil, :m, [:arglist, [:iter, [:args, :a], [:block, [[:lvar, :x]]]]]]
   end
 
   parse "m { |a, b| }" do
@@ -193,7 +193,7 @@ describe "An Iter node" do
   end
 
   parse "m { |a, b:| }" do
-    [:call, nil, :m, [:arglist, [:iter, [:args, :a, :b, [:block, [:b]]], [:nil]]]]
+    [:call, nil, :m, [:arglist, [:iter, [:args, :a, :b, [:kwargs, [:b]]], [:nil]]]]
   end
 
   parse "m { |a, b: 1| }" do
@@ -201,21 +201,21 @@ describe "An Iter node" do
      nil,
      :m,
      [:arglist,
-      [:iter, [:args, :a, :b, [:block, [:b], [[:lasgn, :b, [:lit, 1]]]]], [:nil]]]]
+      [:iter, [:args, :a, :b, [:kwargs, [:b], [[:lasgn, :b, [:lit, 1]]]]], [:nil]]]]
   end
 
   parse "m { |a, **| }" do
     [:call,
      nil,
      :m,
-     [:arglist, [:iter, [:args, :a, :**, [:block, [:**]]], [:nil]]]]
+     [:arglist, [:iter, [:args, :a, :**, [:kwargs, [:**]]], [:nil]]]]
   end
 
   parse "m { |a, **k| }" do
     [:call,
      nil,
      :m,
-     [:arglist, [:iter, [:args, :a, :"**k", [:block, [:"**k"]]], [:nil]]]]
+     [:arglist, [:iter, [:args, :a, :"**k", [:kwargs, [:"**k"]]], [:nil]]]]
   end
 
   parse "m { |a, &b| }" do
@@ -262,7 +262,7 @@ describe "An Iter node" do
      :m,
      [:arglist,
       [:iter,
-       [:args, :a, :b, [:block, [:lasgn, :a, [:lit, 1]]], [:block, [:b]]],
+       [:args, :a, :b, [:block, [:lasgn, :a, [:lit, 1]]], [:kwargs, [:b]]],
        [:nil]]]]
   end
 
@@ -276,7 +276,7 @@ describe "An Iter node" do
         :a,
         :b,
         [:block, [:lasgn, :a, [:lit, 1]]],
-        [:block, [:b], [[:lasgn, :b, [:lit, 2]]]]],
+        [:kwargs, [:b], [[:lasgn, :b, [:lit, 2]]]]],
        [:nil]]]]
   end
 
@@ -286,7 +286,7 @@ describe "An Iter node" do
      :m,
      [:arglist,
       [:iter,
-       [:args, :a, :**, [:block, [:lasgn, :a, [:lit, 1]]], [:block, [:**]]],
+       [:args, :a, :**, [:block, [:lasgn, :a, [:lit, 1]]], [:kwargs, [:**]]],
        [:nil]]]]
   end
 
@@ -296,7 +296,7 @@ describe "An Iter node" do
      :m,
      [:arglist,
       [:iter,
-       [:args, :a, :"**k", [:block, [:lasgn, :a, [:lit, 1]]], [:block, [:"**k"]]],
+       [:args, :a, :"**k", [:block, [:lasgn, :a, [:lit, 1]]], [:kwargs, [:"**k"]]],
        [:nil]]]]
   end
 
@@ -317,14 +317,14 @@ describe "An Iter node" do
   end
 
   parse "m { |*, a:| }" do
-    [:call, nil, :m, [:arglist, [:iter, [:args, :*, :a, [:block, [:a]]], [:nil]]]]
+    [:call, nil, :m, [:arglist, [:iter, [:args, :*, :a, [:kwargs, [:a]]], [:nil]]]]
   end
 
   parse "m { |*a, b:| }" do
     [:call,
      nil,
      :m,
-     [:arglist, [:iter, [:args, :"*a", :b, [:block, [:b]]], [:nil]]]]
+     [:arglist, [:iter, [:args, :"*a", :b, [:kwargs, [:b]]], [:nil]]]]
   end
 
   parse "m { |*, a: 1| }" do
@@ -332,7 +332,7 @@ describe "An Iter node" do
      nil,
      :m,
      [:arglist,
-      [:iter, [:args, :*, :a, [:block, [:a], [[:lasgn, :a, [:lit, 1]]]]], [:nil]]]]
+      [:iter, [:args, :*, :a, [:kwargs, [:a], [[:lasgn, :a, [:lit, 1]]]]], [:nil]]]]
   end
 
   parse "m { |*a, b: 1| }" do
@@ -341,7 +341,7 @@ describe "An Iter node" do
      :m,
      [:arglist,
       [:iter,
-       [:args, :"*a", :b, [:block, [:b], [[:lasgn, :b, [:lit, 1]]]]],
+       [:args, :"*a", :b, [:kwargs, [:b], [[:lasgn, :b, [:lit, 1]]]]],
        [:nil]]]]
   end
 
@@ -349,28 +349,28 @@ describe "An Iter node" do
     [:call,
      nil,
      :m,
-     [:arglist, [:iter, [:args, :*, :**, [:block, [:**]]], [:nil]]]]
+     [:arglist, [:iter, [:args, :*, :**, [:kwargs, [:**]]], [:nil]]]]
   end
 
   parse "m { |*a, **| }" do
     [:call,
      nil,
      :m,
-     [:arglist, [:iter, [:args, :"*a", :**, [:block, [:**]]], [:nil]]]]
+     [:arglist, [:iter, [:args, :"*a", :**, [:kwargs, [:**]]], [:nil]]]]
   end
 
   parse "m { |*, **k| }" do
     [:call,
      nil,
      :m,
-     [:arglist, [:iter, [:args, :*, :"**k", [:block, [:"**k"]]], [:nil]]]]
+     [:arglist, [:iter, [:args, :*, :"**k", [:kwargs, [:"**k"]]], [:nil]]]]
   end
 
   parse "m { |*a, **k| }" do
     [:call,
      nil,
      :m,
-     [:arglist, [:iter, [:args, :"*a", :"**k", [:block, [:"**k"]]], [:nil]]]]
+     [:arglist, [:iter, [:args, :"*a", :"**k", [:kwargs, [:"**k"]]], [:nil]]]]
   end
 
   parse "m { |*, &b| }" do
@@ -385,7 +385,7 @@ describe "An Iter node" do
     [:call,
      nil,
      :m,
-     [:arglist, [:iter, [:args, :a, :b, [:block, [:a, :b]]], [:nil]]]]
+     [:arglist, [:iter, [:args, :a, :b, [:kwargs, [:a, :b]]], [:nil]]]]
   end
 
   parse "m { |a:, b: 1| }" do
@@ -394,7 +394,7 @@ describe "An Iter node" do
      :m,
      [:arglist,
       [:iter,
-       [:args, :a, :b, [:block, [:a, :b], [[:lasgn, :b, [:lit, 1]]]]],
+       [:args, :a, :b, [:kwargs, [:a, :b], [[:lasgn, :b, [:lit, 1]]]]],
        [:nil]]]]
   end
 
@@ -402,21 +402,21 @@ describe "An Iter node" do
     [:call,
      nil,
      :m,
-     [:arglist, [:iter, [:args, :a, :**, [:block, [:a, :**]]], [:nil]]]]
+     [:arglist, [:iter, [:args, :a, :**, [:kwargs, [:a, :**]]], [:nil]]]]
   end
 
   parse "m { |a:, **k| }" do
     [:call,
      nil,
      :m,
-     [:arglist, [:iter, [:args, :a, :"**k", [:block, [:a, :"**k"]]], [:nil]]]]
+     [:arglist, [:iter, [:args, :a, :"**k", [:kwargs, [:a, :"**k"]]], [:nil]]]]
   end
 
   parse "m { |a:, &b| }" do
     [:call,
      nil,
      :m,
-     [:arglist, [:iter, [:args, :a, :"&b", [:block, [:a]]], [:nil]]]]
+     [:arglist, [:iter, [:args, :a, :"&b", [:kwargs, [:a]]], [:nil]]]]
   end
 
   parse "m { |a: 1, b:| }" do
@@ -425,7 +425,7 @@ describe "An Iter node" do
      :m,
      [:arglist,
       [:iter,
-       [:args, :a, :b, [:block, [:a, :b], [[:lasgn, :a, [:lit, 1]]]]],
+       [:args, :a, :b, [:kwargs, [:a, :b], [[:lasgn, :a, [:lit, 1]]]]],
        [:nil]]]]
   end
 
@@ -438,7 +438,7 @@ describe "An Iter 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]]]]],
        [:nil]]]]
   end
 
@@ -448,7 +448,7 @@ describe "An Iter node" do
      :m,
      [:arglist,
       [:iter,
-       [:args, :a, :**, [:block, [:a, :**], [[:lasgn, :a, [:lit, 1]]]]],
+       [:args, :a, :**, [:kwargs, [:a, :**], [[:lasgn, :a, [:lit, 1]]]]],
        [:nil]]]]
   end
 
@@ -458,7 +458,7 @@ describe "An Iter node" do
      :m,
      [:arglist,
       [:iter,
-       [:args, :a, :"**k", [:block, [:a, :"**k"], [[:lasgn, :a, [:lit, 1]]]]],
+       [:args, :a, :"**k", [:kwargs, [:a, :"**k"], [[:lasgn, :a, [:lit, 1]]]]],
        [:nil]]]]
   end
 
@@ -468,7 +468,7 @@ describe "An Iter node" do
      :m,
      [:arglist,
       [:iter,
-       [:args, :a, :"&b", [:block, [:a], [[:lasgn, :a, [:lit, 1]]]]],
+       [:args, :a, :"&b", [:kwargs, [:a], [[:lasgn, :a, [:lit, 1]]]]],
        [:nil]]]]
   end
 
@@ -476,14 +476,14 @@ describe "An Iter node" do
     [:call,
      nil,
      :m,
-     [:arglist, [:iter, [:args, :**, :"&b", [:block, [:**]]], [:nil]]]]
+     [:arglist, [:iter, [:args, :**, :"&b", [:kwargs, [:**]]], [:nil]]]]
   end
 
   parse "m { |**k, &b| }" do
     [:call,
      nil,
      :m,
-     [:arglist, [:iter, [:args, :"**k", :"&b", [:block, [:"**k"]]], [:nil]]]]
+     [:arglist, [:iter, [:args, :"**k", :"&b", [:kwargs, [:"**k"]]], [:nil]]]]
   end
 
   parse "m { n = 1; m { n } }" do
@@ -515,7 +515,7 @@ describe "An Iter node" do
         :"**k",
         :"&l",
         [:block, [:lasgn, :b, [:lit, 1]]],
-        [:block, [:e, :f, :"**k"], [[:lasgn, :f, [:lit, 2]]]]],
+        [:kwargs, [:e, :f, :"**k"], [[:lasgn, :f, [:lit, 2]]]]],
        [:nil]]]]
   end
 
@@ -537,7 +537,7 @@ describe "An Iter node" do
         :"**k",
         :"&l",
         [:block, [:lasgn, :b, [:lit, 1]]],
-        [:block, [:e, :f, :"**k"], [[:lasgn, :f, [:lit, 2]]]]],
+        [:kwargs, [:e, :f, :"**k"], [[:lasgn, :f, [:lit, 2]]]]],
        [:nil]]]]
   end
 
@@ -557,7 +557,7 @@ describe "An Iter node" do
         :"**k",
         :"&l",
         [:block, [:lasgn, :b, [:lit, 1]]],
-        [:block, [:e, :f, :"**k"], [[:lasgn, :f, [:lit, 2]]]]],
+        [:kwargs, [:e, :f, :"**k"], [[:lasgn, :f, [:lit, 2]]]]],
        [:nil]]]]
   end
 
@@ -579,7 +579,7 @@ describe "An Iter node" do
         :"**k",
         :"&l",
         [:block, [:lasgn, :b, [:lit, 1]]],
-        [:block, [:e, :f, :"**k"], [[:lasgn, :f, [:lit, 2]]]]],
+        [:kwargs, [:e, :f, :"**k"], [[:lasgn, :f, [:lit, 2]]]]],
        [:nil]]]]
   end
 

data/spec/lambda_spec.rb

@@ -57,22 +57,22 @@ describe "A Lambda node" do
   end
 
   parse "-> (*a, b, c:) { }" do
-    [:lambda, [:args, :"*a", :b, :c, [:block, [:c]]], [:scope, [:nil]]]
+    [:lambda, [:args, :"*a", :b, :c, [:kwargs, [:c]]], [:scope, [:nil]]]
   end
 
   parse "-> (*a, b, c:, **) { }" do
-    [:lambda, [:args, :"*a", :b, :c, :**, [:block, [:c, :**]]], [:scope, [:nil]]]
+    [:lambda, [:args, :"*a", :b, :c, :**, [:kwargs, [:c, :**]]], [:scope, [:nil]]]
   end
 
   parse "-> (a: 1, b:) { }" do
     [:lambda,
-     [:args, :a, :b, [:block, [:a, :b], [[:lasgn, :a, [:lit, 1]]]]],
+     [:args, :a, :b, [:kwargs, [:a, :b], [[:lasgn, :a, [:lit, 1]]]]],
      [:scope, [:nil]]]
   end
 
   parse "-> (a: 1, b:, &l) { }" do
     [:lambda,
-     [:args, :a, :b, :"&l", [:block, [:a, :b], [[:lasgn, :a, [:lit, 1]]]]],
+     [:args, :a, :b, :"&l", [:kwargs, [:a, :b], [[:lasgn, :a, [:lit, 1]]]]],
      [:scope, [:nil]]]
   end
 
@@ -82,7 +82,7 @@ describe "A Lambda node" do
       :a,
       :b,
       :"**k",
-      [:block,
+      [:kwargs,
        [:a, :b, :"**k"],
        [[:lasgn, :a, [:lit, 1]], [:lasgn, :b, [:lit, 2]]]]],
      [:scope, [:nil]]]
@@ -101,7 +101,7 @@ describe "A Lambda 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, [:call, [:call, nil, :x, [:arglist]], :+, [:arglist, [:lvar, :a]]]]]
   end
 end

data/spec/postexe_spec.rb

@@ -1,5 +1,5 @@
 describe "A Postexe node" do
   parse "END { 1 }" do
-    [:call, nil, :at_exit, [:arglist, [:iter, nil, [:block, [:lit, 1]]]]]
+    [:call, nil, :at_exit, [:arglist, [:iter, [:args], [:block, [:lit, 1]]]]]
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubinius-melbourne
 version: !ruby/object:Gem::Version
-  version: 2.2.0.0
+  version: 2.2.1.0
 platform: ruby
 authors:
 - Brian Shirai
@@ -131,6 +131,7 @@ files:
 - ext/rubinius/melbourne/lex.c.blt
 - ext/rubinius/melbourne/melbourne.cpp
 - ext/rubinius/melbourne/melbourne.hpp
+- ext/rubinius/melbourne/missing.hpp
 - ext/rubinius/melbourne/node.hpp
 - ext/rubinius/melbourne/node_types.cpp
 - ext/rubinius/melbourne/node_types.hpp