rubinius-melbourne 2.0.1.0 → 2.1.0.0

data/spec/until_spec.rb

@@ -6,135 +6,43 @@ describe "An Until node" do
      true
   ]
 
-  relates <<-ruby do
-      while not a
-        b + 1
-      end
-    ruby
-
-    parse do
-      pre_until_sexp
-    end
-  end
-
-  relates "b + 1 while not a" do
-    parse do
-      pre_until_sexp
-    end
-  end
-
-  relates <<-ruby do
+  parse <<-ruby do
       until a
         b + 1
       end
     ruby
 
-    parse do
-      pre_until_sexp
-    end
-  end
-
-  relates "b + 1 until a" do
-    parse do
-      pre_until_sexp
-    end
-  end
-
-  post_until_sexp = [
-    :until,
-     [:call, nil, :a, [:arglist]],
-     [:call, [:call, nil, :b, [:arglist]], :+, [:arglist, [:lit, 1]]],
-     false
-  ]
-
-  post_until = lambda do |g|
-    top    = g.new_label
-    rdo    = g.new_label
-    brk    = g.new_label
-    bottom = g.new_label
-
-    g.push_modifiers
-
-    top.set!
-
-    g.push :self
-    g.send :b, 0, true
-    g.push 1
-    g.send :+, 1, false
-    g.pop
-
-    rdo.set!
-
-    g.push :self
-    g.send :a, 0, true
-    g.git bottom
-
-    g.check_interrupts
-    g.goto top
-
-    bottom.set!
-    g.push :nil
-
-    brk.set!
-
-    g.pop_modifiers
+    pre_until_sexp
   end
 
-  relates <<-ruby do
-      begin
-        b + 1
-      end while not a
-    ruby
-
-    parse do
-      post_until_sexp
-    end
+  parse "b + 1 until a" do
+    pre_until_sexp
   end
 
-  relates <<-ruby do
+  parse <<-ruby do
       begin
         b + 1
       end until a
     ruby
 
-    parse do
-      post_until_sexp
-    end
+    [:until,
+     [:call, nil, :a, [:arglist]],
+     [:call, [:call, nil, :b, [:arglist]], :+, [:arglist, [:lit, 1]]],
+     false]
   end
 
   nil_condition_sexp = [:until, [:nil], [:call, nil, :a, [:arglist]], true]
 
-  relates "a until ()" do
-    parse do
-      nil_condition_sexp
-    end
+  parse "a until ()" do
+    nil_condition_sexp
   end
 
-  relates <<-ruby do
+  parse <<-ruby do
       until ()
         a
       end
     ruby
 
-    parse do
-      nil_condition_sexp
-    end
-  end
-
-  relates "a while not ()" do
-    parse do
-      nil_condition_sexp
-    end
-  end
-
-  relates <<-ruby do
-      while not ()
-        a
-      end
-    ruby
-
-    parse do
-      nil_condition_sexp
-    end
+    nil_condition_sexp
   end
 end

data/spec/valias_spec.rb

@@ -1,7 +1,5 @@
 describe "A Valias node" do
-  relates "alias $y $x" do
-    parse do
-      [:valias, :$y, :$x]
-    end
+  parse "alias $y $x" do
+    [:valias, :$y, :$x]
   end
 end

data/spec/while_spec.rb

@@ -6,163 +6,69 @@ describe "A While node" do
      true
   ]
 
-  relates <<-ruby do
+  parse <<-ruby do
       while a
         b + 1
       end
     ruby
 
-    parse do
-      pre_while_sexp
-    end
+    pre_while_sexp
   end
 
-  relates <<-ruby do
+  parse <<-ruby do
       a = x
       while a.b
         1
       end
     ruby
 
-    parse do
-      [:block,
-       [:lasgn, :a, [:call, nil, :x, [:arglist]]],
-       [:while, [:call, [:lvar, :a], :b, [:arglist]], [:lit, 1], true]]
-    end
+    [:block,
+     [:lasgn, :a, [:call, nil, :x, [:arglist]]],
+     [:while, [:call, [:lvar, :a], :b, [:arglist]], [:lit, 1], true]]
   end
 
-  relates "b + 1 while a" do
-    parse do
-      pre_while_sexp
-    end
+  parse "b + 1 while a" do
+    pre_while_sexp
   end
 
-  relates <<-ruby do
-      until not a
-        b + 1
-      end
-    ruby
-
-    parse do
-      pre_while_sexp
-    end
-  end
-
-  relates "b + 1 until not a" do
-    parse do
-      pre_while_sexp
-    end
-  end
-
-  post_while_sexp = [
-    :while,
-     [:call, nil, :a, [:arglist]],
-     [:call, [:call, nil, :b, [:arglist]], :+, [:arglist, [:lit, 1]]],
-     false
-  ]
-
-  post_while = lambda do |g|
-    top    = g.new_label
-    rdo    = g.new_label
-    brk    = g.new_label
-    bottom = g.new_label
-
-    g.push_modifiers
-
-    top.set!
-
-    g.push :self
-    g.send :b, 0, true
-    g.push 1
-    g.send :+, 1, false
-    g.pop
-
-    rdo.set!
-
-    g.push :self
-    g.send :a, 0, true
-    g.gif bottom
-
-    g.check_interrupts
-    g.goto top
-
-    bottom.set!
-    g.push :nil
-
-    brk.set!
-    g.pop_modifiers
-  end
-
-  relates <<-ruby do
+  parse <<-ruby do
       begin
         b + 1
       end while a
     ruby
 
-    parse do
-      post_while_sexp
-    end
-  end
-
-  relates <<-ruby do
-      begin
-        b + 1
-      end until not a
-    ruby
-
-    parse do
-      post_while_sexp
-    end
+    [:while,
+     [:call, nil, :a, [:arglist]],
+     [:call, [:call, nil, :b, [:arglist]], :+, [:arglist, [:lit, 1]]],
+     false]
   end
 
   nil_condition_sexp = [:while, [:nil], [:call, nil, :a, [:arglist]], true]
 
-  relates "a while ()" do
-    parse do
-      nil_condition_sexp
-    end
+  parse "a while ()" do
+    nil_condition_sexp
   end
 
-  relates <<-ruby do
+  parse <<-ruby do
       while ()
         a
       end
     ruby
 
-    parse do
-      nil_condition_sexp
-    end
-  end
-
-  relates "a until not ()" do
-
-    parse do
-      nil_condition_sexp
-    end
-  end
-
-  relates <<-ruby do
-      until not ()
-        a
-      end
-    ruby
-
-    parse do
-      nil_condition_sexp
-    end
+    nil_condition_sexp
   end
 
-  relates <<-ruby do
+  parse <<-ruby do
       while 1
         2
         break :brk
       end
     ruby
 
-    # TODO
+    [:while, [:lit, 1], [:block, [:lit, 2], [:break, [:lit, :brk]]], true]
   end
 
-  relates <<-ruby do
+  parse <<-ruby do
       while 1
         begin
           2
@@ -173,10 +79,15 @@ describe "A While node" do
       end
     ruby
 
-    # TODO
+    [:while,
+     [:lit, 1],
+     [:rescue,
+      [:block, [:lit, 2], [:break, [:lit, :brk]]],
+      [:resbody, [:array, [:const, :StandardError]], [:lit, 3]]],
+     true]
   end
 
-  relates <<-ruby do
+  parse <<-ruby do
       while 1
         begin
           2
@@ -187,6 +98,13 @@ describe "A While node" do
       end
     ruby
 
-    # TODO
+    [:while,
+     [:lit, 1],
+     [:rescue,
+      [:lit, 2],
+      [:resbody,
+       [:array, [:const, :StandardError]],
+       [[:lit, 3], [:break, [:lit, :brk]]]]],
+     true]
   end
 end

data/spec/xstr_spec.rb

@@ -1,7 +1,5 @@
 describe "A Xstr node" do
-  relates "`touch 5`" do
-    parse do
-      [:xstr, "touch 5"]
-    end
+  parse "`touch 5`" do
+    [:xstr, "touch 5"]
   end
 end

data/spec/yield_spec.rb

@@ -1,65 +1,45 @@
 describe "A Yield node" do
-  relates "yield(42, 24)" do
-    parse do
-      [:yield, [:lit, 42], [:lit, 24]]
-    end
+  parse "yield(42, 24)" do
+    [:yield, [:lit, 42], [:lit, 24]]
   end
 
-  relates "yield([42, 24])" do
-    parse do
-      [:yield, [:array, [:lit, 42], [:lit, 24]]]
-    end
+  parse "yield([42, 24])" do
+    [:yield, [:array, [:lit, 42], [:lit, 24]]]
   end
 
-  relates "yield([42])" do
-    parse do
-      [:yield, [:array, [:lit, 42]]]
-    end
+  parse "yield([42])" do
+    [:yield, [:array, [:lit, 42]]]
   end
 
-  relates "yield([])" do
-    parse do
-      [:yield, [:array]]
-    end
+  parse "yield([])" do
+    [:yield, [:array]]
   end
 
-  relates "yield(42)" do
-    parse do
-      [:yield, [:lit, 42]]
-    end
+  parse "yield(42)" do
+    [:yield, [:lit, 42]]
   end
 
-  relates "yield" do
-    parse do
-      [:yield]
-    end
+  parse "yield" do
+    [:yield]
   end
 
-  relates "yield([*[]])" do
-    # TODO
+  parse "yield([*[]])" do
+    [:yield, [:array, [:splat, [:array]]]]
   end
 
-  relates "yield([*[1]])" do
-    parse do
-      [:yield, [:array, [:splat, [:array, [:lit, 1]]]]]
-    end
+  parse "yield([*[1]])" do
+    [:yield, [:array, [:splat, [:array, [:lit, 1]]]]]
   end
 
-  relates "yield([*[1, 2]])" do
-    parse do
-      [:yield, [:array, [:splat, [:array, [:lit, 1], [:lit, 2]]]]]
-    end
+  parse "yield([*[1, 2]])" do
+    [:yield, [:array, [:splat, [:array, [:lit, 1], [:lit, 2]]]]]
   end
 
-  relates "yield(*[1])" do
-    parse do
-      [:yield, [:splat, [:array, [:lit, 1]]]]
-    end
+  parse "yield(*[1])" do
+    [:yield, [:splat, [:array, [:lit, 1]]]]
   end
 
-  relates "yield(*[1, 2])" do
-    parse do
-      [:yield, [:splat, [:array, [:lit, 1], [:lit, 2]]]]
-    end
+  parse "yield(*[1, 2])" do
+    [:yield, [:splat, [:array, [:lit, 1], [:lit, 2]]]]
   end
 end