rubinius-ast 3.2 → 3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d59ed449206fc1272a1f2bcef93c32a795c12eab
-  data.tar.gz: 4a14eb185f155aab1a3d45205aca2d797a1f1ad6
+  metadata.gz: 441f4803e58f63bef70234bf6cec699b0a5203d4
+  data.tar.gz: 33a871b9c9a23b399aad57e3df7fea74e0564c0e
 SHA512:
-  metadata.gz: a2e6c7abf59737613b1d7cf6bf0f5135fa2ff1ff9797d2e1a93c098192c1696e008e27a9733fef90a900a3e0d701655600b8011c99328092025774f4f8c7e59f
-  data.tar.gz: 2dc8f70121984a05221cfe4b0bc5e2cee284098a6e383b74262dbbe272f7ab6f8563be76af0937c19e8b1ac4793e50fa2aa927192032c5e8c268dac71208052d
+  metadata.gz: 1467bb1c7d966a43e9a40b44eb5afe4063d0ba6f4c9b1421bca8bd12e4607e17c8ee629bdbe5636d971513522389c0eca1cbc03713a9f077044ec4bd244a119b
+  data.tar.gz: 8a12054422776ef10e5fc120bc09f3be60349ecb8315b4eb0295c38243f7ed967a484ecb5e0a344a434e7dccc09750cce28bf81991bb05ae3ca854277a402ae9

data/lib/rubinius/code/ast/constants.rb

@@ -69,7 +69,7 @@ module CodeTools
         g.goto done
 
         f.set!
-        g.push :nil
+        g.push_nil
 
         done.set!
       end
@@ -87,7 +87,11 @@ module CodeTools
 
         @parent.bytecode(g)
         g.push_literal @name
-        g.push(const_missing ? :true : :false)
+        if const_missing
+          g.push_true
+        else
+          g.push_false
+        end
         g.invoke_primitive :vm_const_defined_under, 3
 
         g.pop_unwind
@@ -151,7 +155,7 @@ module CodeTools
         g.goto done
 
         f.set!
-        g.push :nil
+        g.push_nil
 
         done.set!
       end
@@ -169,7 +173,7 @@ module CodeTools
 
         g.push_cpath_top
         g.push_literal @name
-        g.push :false
+        g.push_false
         g.invoke_primitive :vm_const_defined_under, 3
 
         g.pop_unwind
@@ -246,7 +250,7 @@ module CodeTools
         g.goto done
 
         f.set!
-        g.push :nil
+        g.push_nil
 
         done.set!
       end

data/lib/rubinius/code/ast/control_flow.rb

@@ -129,12 +129,12 @@ module CodeTools
 
         if @single
           condition_bytecode(g, @single)
-          g.gif nxt
+          g.goto_if_false nxt
         else
           if @conditions
             @conditions.body.each do |c|
               condition_bytecode(g, c)
-              g.git body
+              g.goto_if_true body
             end
           end
 
@@ -159,12 +159,12 @@ module CodeTools
 
         if @single
           @single.bytecode(g)
-          g.gif nxt
+          g.goto_if_false nxt
         else
           if @conditions
             @conditions.body.each do |condition|
               condition.bytecode(g)
-              g.git body
+              g.goto_if_true body
             end
           end
 
@@ -209,7 +209,7 @@ module CodeTools
         g.find_const :Runtime
         g.rotate(3)
         g.send :matches_when, 2
-        g.git body
+        g.goto_if_true body
       end
 
       def bytecode(g, body, nxt)
@@ -243,11 +243,11 @@ module CodeTools
         g.state.push_flip_flop
 
         get_flip_flop(g, index)
-        g.git on_label
+        g.goto_if_true on_label
 
         @start.bytecode(g)
         g.dup
-        g.gif done
+        g.goto_if_false done
         g.pop
         set_flip_flop(g, index, true)
 
@@ -258,9 +258,9 @@ module CodeTools
         end
 
         on_label.set!
-        g.push_literal true
+        g.push_true
         @finish.bytecode(g)
-        g.gif done
+        g.goto_if_false done
         set_flip_flop(g, index, false)
         g.pop
 
@@ -271,7 +271,7 @@ module CodeTools
         g.push_rubinius
         g.find_const :Runtime
         g.push_scope
-        g.push_literal index
+        g.push_int index
         g.send(:get_flip_flop, 2)
       end
 
@@ -279,8 +279,12 @@ module CodeTools
         g.push_rubinius
         g.find_const :Runtime
         g.push_scope
-        g.push_literal index
-        g.push_literal value
+        g.push_int index
+        if value
+          g.push_true
+        else
+          g.push_false
+        end
         g.send(:set_flip_flop, 3)
       end
 
@@ -316,7 +320,7 @@ module CodeTools
         else_label = g.new_label
 
         @condition.bytecode(g)
-        g.gif else_label
+        g.goto_if_false else_label
 
         @body.bytecode(g)
         g.goto done
@@ -354,9 +358,9 @@ module CodeTools
       def condition_bytecode(g, bottom, use_gif)
         @condition.bytecode(g)
         if use_gif
-          g.gif bottom
+          g.goto_if_false bottom
         else
-          g.git bottom
+          g.goto_if_true bottom
         end
       end
 
@@ -406,7 +410,7 @@ module CodeTools
         g.set_line 0
 
         bottom.set!
-        g.push :nil
+        g.push_nil
         g.break.set!
 
         g.pop_modifiers
@@ -606,7 +610,7 @@ module CodeTools
         if @value
           @value.bytecode(g)
         else
-          g.push :nil
+          g.push_nil
         end
 
         if g.state.loop?
@@ -697,7 +701,7 @@ module CodeTools
         elsif @value
           @value.bytecode(g)
         else
-          g.push :nil
+          g.push_nil
         end
 
         if lcl = g.state.rescue?

data/lib/rubinius/code/ast/data.rb

@@ -19,7 +19,7 @@ module CodeTools
         g.push_rubinius
         g.push_scope
         g.send :data_path, 0
-        g.push_literal @offset
+        g.push_int @offset
         g.send :set_data, 2
         g.pop
 

data/lib/rubinius/code/ast/definitions.rb

@@ -565,7 +565,7 @@ module CodeTools
           done = g.new_label
 
           arg.variable.get_bytecode(g)
-          g.ginu done
+          g.goto_if_not_undefined done
           arg.bytecode(g)
           g.pop
 
@@ -658,7 +658,7 @@ module CodeTools
           g.send :find_item, 1, true
 
           g.dup
-          g.gif missing_value
+          g.goto_if_false missing_value
 
           g.send :value, 0, true
 
@@ -684,8 +684,8 @@ module CodeTools
         if @defaults.empty?
           g.dup
           g.send :size, 0, true
-          g.push @arguments.size
-          g.gine extra_keys
+          g.push_int @arguments.size
+          g.goto_if_not_equal extra_keys
 
           if @kwrest
             g.push_cpath_top
@@ -706,7 +706,7 @@ module CodeTools
             g.send :find_item, 1, true
 
             g.dup
-            g.gif default_value
+            g.goto_if_false default_value
 
             g.send :value, 0, true
             arg.variable.set_bytecode(g)
@@ -729,9 +729,9 @@ module CodeTools
         g.swap
 
         if @kwrest
-          g.push :true
+          g.push_true
         else
-          g.push :false
+          g.push_false
         end
 
         g.send :keywords_extra, 2, true
@@ -941,7 +941,7 @@ module CodeTools
     class EmptyBody < Node
       def bytecode(g)
         g.pop
-        g.push :nil
+        g.push_nil
       end
 
       def to_sexp
@@ -1079,7 +1079,7 @@ module CodeTools
           attach_and_call g, :__metaclass_init__, true, true
         else
           g.pop
-          g.push :nil
+          g.push_nil
         end
       end
     end
@@ -1225,7 +1225,7 @@ module CodeTools
         container_bytecode(g) do
           @body.bytecode(g)
           g.pop
-          g.push :true
+          g.push_true
           g.ret
         end
       end

data/lib/rubinius/code/ast/exceptions.rb

@@ -77,7 +77,7 @@ module CodeTools
           new_break.set!
           g.pop_unwind
 
-          g.push :true
+          g.push_true
           g.set_stack_local used_break_local
           g.pop
 
@@ -93,7 +93,7 @@ module CodeTools
           new_next.set!
           g.pop_unwind
 
-          g.push :true
+          g.push_true
           g.set_stack_local used_next_local
           g.pop
 
@@ -123,7 +123,7 @@ module CodeTools
         ok.set!
 
         if check_break
-          g.push :false
+          g.push_false
           g.set_stack_local used_break_local
           g.pop
 
@@ -131,7 +131,7 @@ module CodeTools
         end
 
         if check_next
-          g.push :false
+          g.push_false
           g.set_stack_local used_next_local
           g.pop
 
@@ -147,7 +147,7 @@ module CodeTools
           post = g.new_label
 
           g.push_stack_local used_break_local
-          g.gif post
+          g.goto_if_false post
 
           if g.break
             g.goto g.break
@@ -161,7 +161,7 @@ module CodeTools
           post = g.new_label
 
           g.push_stack_local used_next_local
-          g.gif post
+          g.goto_if_false post
 
           g.next ? g.goto(g.next) : g.ret
           post.set!
@@ -193,7 +193,7 @@ module CodeTools
         if @body.nil?
           if @else.nil?
             # Stupid. No body and no else.
-            g.push :nil
+            g.push_nil
           else
             # Only an else, run it.
             @else.bytecode(g)
@@ -431,7 +431,7 @@ module CodeTools
             c.bytecode(g)
             g.swap
             g.send :===, 1
-            g.git body
+            g.goto_if_true body
           end
         end
 
@@ -553,7 +553,7 @@ module CodeTools
         g.cast_array
         g.swap
         g.send :__rescue_match__, 1
-        g.git body
+        g.goto_if_true body
       end
 
       def to_sexp

data/lib/rubinius/code/ast/literals.rb

@@ -25,7 +25,7 @@ module CodeTools
         done = g.new_label
         @body.each do |x|
           x.defined(g)
-          g.gif not_found
+          g.goto_if_false not_found
         end
         g.push_literal "expression"
         g.goto done
@@ -61,7 +61,7 @@ module CodeTools
       def bytecode(g)
         pos(g)
 
-        g.push :false
+        g.push_false
       end
 
       def defined(g)
@@ -77,7 +77,7 @@ module CodeTools
       def bytecode(g)
         pos(g)
 
-        g.push :true
+        g.push_true
       end
 
       def defined(g)
@@ -100,7 +100,7 @@ module CodeTools
       def bytecode(g)
         pos(g)
 
-        g.push_unique_literal @value
+        g.push_literal @value
       end
 
       def defined(g)
@@ -128,7 +128,7 @@ module CodeTools
 
         g.push_cpath_top
         g.find_const :Hash
-        g.push count / 2
+        g.push_int count / 2
         g.send :new_from_literal, 1
 
         while i < count
@@ -225,7 +225,7 @@ module CodeTools
       def bytecode(g)
         pos(g)
 
-        g.push :nil
+        g.push_nil
       end
 
       def defined(g)
@@ -248,7 +248,7 @@ module CodeTools
       def bytecode(g)
         pos(g)
 
-        g.push_unique_literal @value
+        g.push_literal @value
       end
 
       def defined(g)
@@ -269,7 +269,7 @@ module CodeTools
       def bytecode(g)
         pos(g)
 
-        g.push @value
+        g.push_int @value
       end
 
       def defined(g)
@@ -340,7 +340,7 @@ module CodeTools
         g.dup
         @start.bytecode(g)
         @finish.bytecode(g)
-        g.push :true
+        g.push_true
         g.send :initialize, 3, true
         g.pop
       end
@@ -362,25 +362,25 @@ module CodeTools
       def bytecode(g)
         pos(g)
 
-        # A regex literal should only be converted to a Regexp the first time it
-        # is encountered. We push a literal nil here, and then overwrite the
-        # literal value with the created Regexp if it is nil, i.e. the first time
-        # only. Subsequent encounters will use the previously created Regexp
-        idx = g.add_literal(nil)
-        g.push_literal_at idx
+        build = g.new_label
+        done = g.new_label
+
+        g.push_nil
+
+        build.set!
+        g.push_memo nil
         g.dup
-        g.is_nil
+        g.goto_if_not_nil done
 
-        lbl = g.new_label
-        g.gif lbl
         g.pop
         g.push_cpath_top
         g.find_const :Regexp
         g.push_literal @source
-        g.push @options
+        g.push_int @options
         g.send :new, 2
-        g.set_literal idx
-        lbl.set!
+        g.goto build
+
+        done.set!
       end
 
       def defined(g)
@@ -403,7 +403,6 @@ module CodeTools
       def bytecode(g)
         pos(g)
 
-        # TODO: change to push_unique_literal
         g.push_literal @string
         g.string_dup
       end
@@ -532,7 +531,7 @@ module CodeTools
 
     class DynamicExecuteString < DynamicString
       def bytecode(g)
-        g.push :self
+        g.push_self
         super(g)
         g.send :`, 1, true #`
       end
@@ -552,7 +551,7 @@ module CodeTools
         g.push_cpath_top
         g.find_const :Regexp
         super(g)
-        g.push @options
+        g.push_int @options
         g.send :new, 2
       end
 
@@ -571,19 +570,21 @@ module CodeTools
       def bytecode(g)
         pos(g)
 
-        idx = g.add_literal(nil)
-        g.push_literal_at idx
+        build = g.new_label
+        done = g.new_label
+
+        g.push_nil
+
+        build.set!
+        g.push_memo nil
         g.dup
-        g.is_nil
+        g.goto_if_not_nil done
 
-        lbl = g.new_label
-        g.gif lbl
         g.pop
-
         super(g)
+        g.goto build
 
-        g.set_literal idx
-        lbl.set!
+        done.set!
       end
 
       def sexp_name
@@ -595,7 +596,7 @@ module CodeTools
       def bytecode(g)
         pos(g)
 
-        g.push :self
+        g.push_self
         super(g)
         g.send :`, 1, true # ` (silly vim/emacs)
       end

data/lib/rubinius/code/ast/node.rb

@@ -95,10 +95,10 @@ module CodeTools
         g.push_rubinius
         g.push_scope
         g.send :active_path, 0
-        g.push @line
+        g.push_int @line
         g.send :unrecognized_defined, 2
         g.pop
-        g.push :nil
+        g.push_nil
       end
 
       def value_defined(g, f)
@@ -128,7 +128,7 @@ module CodeTools
         found = g.new_label
         bytecode(g)
         g.dup
-        g.git found
+        g.goto_if_true found
         g.pop
         yield
         found.set!

data/lib/rubinius/code/ast/operators.rb

@@ -17,9 +17,9 @@ module CodeTools
         lbl = g.new_label
 
         if use_gif
-          g.gif lbl
+          g.goto_if_false lbl
         else
-          g.git lbl
+          g.goto_if_true lbl
         end
 
         g.pop
@@ -64,13 +64,13 @@ module CodeTools
         end_label = g.new_label
 
         @value.bytecode(g)
-        g.git true_label
+        g.goto_if_true true_label
 
-        g.push :true
+        g.push_true
         g.goto end_label
 
         true_label.set!
-        g.push :false
+        g.push_false
         end_label.set!
       end
 
@@ -92,7 +92,7 @@ module CodeTools
         g.goto done
 
         f.set!
-        g.push :nil
+        g.push_nil
 
         done.set!
       end
@@ -134,7 +134,7 @@ module CodeTools
         # @arguments.size will be 1
 
         if @arguments.splat?
-          g.push :nil
+          g.push_nil
           g.send_with_splat :[], @arguments.size
         else
           g.send :[], @arguments.size
@@ -153,9 +153,9 @@ module CodeTools
 
           g.dup
           if @op == :or
-            g.git fnd
+            g.goto_if_true fnd
           else
-            g.gif fnd
+            g.goto_if_false fnd
           end
 
           # Ok, take the extra copy off and pull the value onto the stack
@@ -174,7 +174,7 @@ module CodeTools
           new_break.set!
           if old_break
             g.pop_many recv_stack + 1
-            g.push :nil
+            g.push_nil
             g.goto old_break
           end
 
@@ -188,7 +188,7 @@ module CodeTools
 
           if @arguments.splat?
             g.send :push, 1
-            g.push :nil
+            g.push_nil
             g.send_with_splat :[]=, @arguments.size
           else
             g.send :[]=, @arguments.size + 1
@@ -222,7 +222,7 @@ module CodeTools
           new_break.set!
           if old_break
             g.pop_many recv_stack + 2
-            g.push :nil
+            g.push_nil
             g.goto old_break
           end
 
@@ -247,7 +247,7 @@ module CodeTools
           # X: Call []=(:a, 5) on h
           if @arguments.splat?
             g.send :push, 1
-            g.push :nil
+            g.push_nil
             g.send_with_splat :[]=, @arguments.size
           else
             g.send :[]=, @arguments.size + 1
@@ -307,9 +307,9 @@ module CodeTools
 
           g.dup
           if @op == :or
-            g.git fnd
+            g.goto_if_true fnd
           else
-            g.gif fnd
+            g.goto_if_false fnd
           end
 
           # Remove the copy of 2 and push @value on the stack
@@ -326,7 +326,7 @@ module CodeTools
           new_break.set!
           if old_break
             g.pop_many 2
-            g.push :nil
+            g.push_nil
             g.goto old_break
           end
 
@@ -365,7 +365,7 @@ module CodeTools
           new_break.set!
           if old_break
             g.pop_many 3
-            g.push :nil
+            g.push_nil
             g.goto old_break
           end
 
@@ -417,7 +417,7 @@ module CodeTools
         @left.bytecode(g)
         lbl = g.new_label
         g.dup
-        g.gif lbl
+        g.goto_if_false lbl
         g.pop
         @right.bytecode(g)
         lbl.set!

data/lib/rubinius/code/ast/self.rb

@@ -6,7 +6,7 @@ module CodeTools
       def bytecode(g)
         pos(g)
 
-        g.push :self
+        g.push_self
       end
 
       def defined(g)
@@ -14,7 +14,7 @@ module CodeTools
       end
 
       def value_defined(g, f)
-        g.push :self
+        g.push_self
       end
 
       def to_sexp

data/lib/rubinius/code/ast/sends.rb

@@ -23,12 +23,14 @@ module CodeTools
       def bytecode(g)
         pos(g)
 
-        if @vcall_style and reference = check_local_reference(g)
-          return reference.get_bytecode(g)
+        if @vcall_style
+          if reference = check_local_reference(g)
+            return reference.get_bytecode(g)
+          end
+        else
+          @receiver.bytecode(g)
         end
 
-        @receiver.bytecode(g)
-
         if @block
           @block.bytecode(g)
           g.send_with_block @name, 0, @privately
@@ -83,18 +85,18 @@ module CodeTools
         g.push_literal @name
 
         if @vcall_style or @privately
-          g.push :true
+          g.push_true
           g.send :__respond_to_p__, 2
         else
           g.push_self
           g.invoke_primitive :vm_check_callable, 3
         end
-        g.gif f
+        g.goto_if_false f
         g.push_literal "method"
         g.goto done
 
         f.set!
-        g.push :nil
+        g.push_nil
 
         done.set!
       end
@@ -141,7 +143,7 @@ module CodeTools
         pos(g)
 
         if @arguments.splat?
-          @block ? @block.bytecode(g) : g.push(:nil)
+          @block ? @block.bytecode(g) : g.push_nil
           g.send_with_splat @name, @arguments.size, @privately, false
         elsif @block
           @block.bytecode(g)
@@ -190,7 +192,7 @@ module CodeTools
           if @arguments.splat?
             g.move_down @arguments.size + 2
             g.swap
-            g.push :nil
+            g.push_nil
             g.send_with_splat @name, @arguments.size, @privately, true
           else
             g.move_down @arguments.size + 1
@@ -252,7 +254,7 @@ module CodeTools
             flag = false
           end
 
-          g.push :nil
+          g.push_nil
           g.send_with_splat @name, @arguments.size, @privately, flag
         else
           g.move_down @arguments.size + 1
@@ -343,8 +345,7 @@ module CodeTools
       def convert(g)
         nil_block = g.new_label
         g.dup
-        g.is_nil
-        g.git nil_block
+        g.goto_if_nil nil_block
 
         g.push_cpath_top
         g.find_const :Proc
@@ -410,7 +411,7 @@ module CodeTools
         g.find_const :Hash
         g.swap
         g.kind_of
-        g.gif not_hash
+        g.goto_if_false not_hash
 
         g.make_array 1
         g.goto done
@@ -909,8 +910,10 @@ module CodeTools
       def bytecode(g)
         pos(g)
 
-        if @value.kind_of? NumberLiteral
-          g.push(-@value.value)
+        if @value.kind_of? FixnumLiteral
+          g.push_int(-@value.value)
+        elsif @value.kind_of? NumberLiteral
+          g.push_literal(-@value.value)
         else
           @value.bytecode(g)
           g.send :"-@", 0
@@ -962,14 +965,14 @@ module CodeTools
 
         g.invoke_primitive :vm_check_super_callable, 0
 
-        g.gif nope
+        g.goto_if_false nope
 
         g.push_literal "super"
         g.string_dup
         g.goto done
 
         nope.set!
-        g.push :nil
+        g.push_nil
 
         done.set!
       end
@@ -1020,8 +1023,8 @@ module CodeTools
         f = g.new_label
 
         g.push_block
-        g.git t
-        g.push :nil
+        g.goto_if_true t
+        g.push_nil
         g.goto f
 
         t.set!

data/lib/rubinius/code/ast/transforms.rb

@@ -271,7 +271,7 @@ module CodeTools
         else
           g.check_serial :new, Rubinius::CompiledCode::KernelMethodSerial
         end
-        g.gif slow
+        g.goto_if_false slow
 
         # fast path
         g.send :allocate, 0, true
@@ -354,7 +354,7 @@ module CodeTools
           const.bytecode(g)
           g.swap
           g.kind_of
-          g.git done
+          g.goto_if_true done
           g.pop
           super(g)
 

data/lib/rubinius/code/ast/values.rb

@@ -23,9 +23,9 @@ module CodeTools
 
         g.dup
         g.push_literal :to_a
-        g.push :true
+        g.push_true
         g.send :respond_to?, 2, true
-        g.git coerce
+        g.goto_if_true coerce
 
         make_array.set!
         g.make_array 1
@@ -48,8 +48,7 @@ module CodeTools
         check_array = g.new_label
 
         g.dup
-        g.is_nil
-        g.gif check_array
+        g.goto_if_not_nil check_array
 
         g.pop
         g.goto make_array
@@ -78,7 +77,7 @@ module CodeTools
         g.find_const :Array
         g.swap
         g.instance_of
-        g.git label
+        g.goto_if_true label
       end
 
       def kind_of_array(g, label)
@@ -87,7 +86,7 @@ module CodeTools
         g.find_const :Array
         g.swap
         g.kind_of
-        g.git label
+        g.goto_if_true label
       end
 
       def to_sexp
@@ -127,9 +126,9 @@ module CodeTools
 
         g.dup
         g.push_literal :to_a
-        g.push :true
+        g.push_true
         g.send :respond_to?, 2, true
-        g.git coerce
+        g.goto_if_true coerce
 
         make_array.set!
         g.make_array 1
@@ -143,8 +142,7 @@ module CodeTools
         check_array = g.new_label
 
         g.dup
-        g.is_nil
-        g.gif check_array
+        g.goto_if_not_nil check_array
 
         g.pop
         g.goto make_array
@@ -173,7 +171,7 @@ module CodeTools
         g.find_const :Array
         g.swap
         g.kind_of
-        g.git label
+        g.goto_if_true label
       end
 
       # Dive down and try to find an array of regular values
@@ -246,11 +244,11 @@ module CodeTools
 
           g.dup
           g.send :size, 0
-          g.push 1
+          g.push_int 1
           g.send :>, 1
-          g.git done
+          g.goto_if_true done
 
-          g.push 0
+          g.push_int 0
           g.send :at, 1
 
           done.set!
@@ -294,7 +292,7 @@ module CodeTools
         pos(g)
 
         @value.bytecode(g)
-        g.meta_to_s
+        g.object_to_s :to_s
       end
 
       def value_defined(g, f)

data/lib/rubinius/code/ast/variables.rb

@@ -42,8 +42,7 @@ module CodeTools
         done = g.new_label
 
         g.last_match mode, 0
-        g.is_nil
-        g.git f
+        g.goto_if_nil f
 
         g.push_literal "global-variable"
         g.string_dup
@@ -51,7 +50,7 @@ module CodeTools
         g.goto done
 
         f.set!
-        g.push :nil
+        g.push_nil
 
         done.set!
       end
@@ -84,8 +83,7 @@ module CodeTools
         done = g.new_label
 
         g.last_match Mode, @which - 1
-        g.is_nil
-        g.git f
+        g.goto_if_nil f
 
         g.push_literal "global-variable"
         g.string_dup
@@ -93,7 +91,7 @@ module CodeTools
         g.goto done
 
         f.set!
-        g.push :nil
+        g.push_nil
 
         done.set!
       end
@@ -149,7 +147,7 @@ module CodeTools
         # Ok, we know the value exists, get it.
         bytecode(g)
         g.dup
-        g.git done
+        g.goto_if_true done
         g.pop
 
         # yield to generate the code for when it's not found
@@ -168,7 +166,7 @@ module CodeTools
 
       def push_scope(g)
         if g.state.scope.module?
-          g.push :self
+          g.push_self
         else
           g.push_scope
         end
@@ -178,7 +176,7 @@ module CodeTools
       def variable_defined(g, f)
         push_scope(g)
         g.send :class_variable_defined?, 1
-        g.gif f
+        g.goto_if_false f
       end
 
       def defined(g)
@@ -190,7 +188,7 @@ module CodeTools
         g.goto done
 
         f.set!
-        g.push :nil
+        g.push_nil
 
         done.set!
       end
@@ -205,7 +203,7 @@ module CodeTools
         pos(g)
 
         if g.state.scope.module?
-          g.push :self
+          g.push_self
         else
           g.push_scope
         end
@@ -287,7 +285,7 @@ module CodeTools
         g.find_const :Globals
         g.push_literal @name
         g.send :key?, 1
-        g.gif f
+        g.goto_if_false f
       end
 
       def defined(g)
@@ -299,7 +297,7 @@ module CodeTools
         g.goto done
 
         f.set!
-        g.push :nil
+        g.push_nil
 
         done.set!
       end
@@ -391,7 +389,7 @@ module CodeTools
         g.find_const :Array
         g.swap
         g.kind_of
-        g.git assign
+        g.goto_if_true assign
         g.make_array 1
 
         assign.set!
@@ -430,10 +428,10 @@ module CodeTools
       end
 
       def variable_defined(g, f)
-        g.push :self
+        g.push_self
         g.push_literal @name
         g.send :__instance_variable_defined_p__, 1
-        g.gif f
+        g.goto_if_false f
       end
 
       def defined(g)
@@ -445,7 +443,7 @@ module CodeTools
         g.goto done
 
         f.set!
-        g.push :nil
+        g.push_nil
 
         done.set!
       end
@@ -635,7 +633,7 @@ module CodeTools
         g.pop
 
         index = g.new_stack_local
-        g.push 0
+        g.push_int 0
         g.set_stack_local index
         g.pop
 
@@ -651,7 +649,7 @@ module CodeTools
 
           if @post
             g.push_stack_local size
-            g.push @post.body.size
+            g.push_int @post.body.size
             g.send :-, 1, true
 
             g.push_stack_local index
@@ -677,9 +675,9 @@ module CodeTools
 
           check_count.set!
           g.dup
-          g.push 0
+          g.push_int 0
           g.send :<, 1, true
-          g.git underflow
+          g.goto_if_true underflow
 
           g.dup
           g.push_stack_local index
@@ -720,9 +718,9 @@ module CodeTools
 
         g.dup
         g.push_literal :to_ary
-        g.push :true
+        g.push_true
         g.send :respond_to?, 2, true
-        g.git coerce
+        g.goto_if_true coerce
 
         make_array.set!
         g.make_array 1
@@ -745,8 +743,7 @@ module CodeTools
         check_array = g.new_label
 
         g.dup
-        g.is_nil
-        g.gif check_array
+        g.goto_if_not_nil check_array
 
         g.pop
         g.goto make_array
@@ -775,7 +772,7 @@ module CodeTools
         g.find_const :Array
         g.swap
         g.instance_of
-        g.git label
+        g.goto_if_true label
       end
 
       def kind_of_array(g, label)
@@ -784,7 +781,7 @@ module CodeTools
         g.find_const :Array
         g.swap
         g.kind_of
-        g.git label
+        g.goto_if_true label
       end
 
       def get_element(g, index)
@@ -792,7 +789,7 @@ module CodeTools
         g.push_stack_local index
 
         g.dup
-        g.push 1
+        g.push_int 1
         g.send :+, 1, true
         g.set_stack_local index
         g.pop

data/lib/rubinius/code/ast/version.rb

@@ -1,5 +1,5 @@
 module CodeTools
   module AST
-    VERSION = "3.2"
+    VERSION = "3.3"
   end
 end

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: rubinius-ast
 version: !ruby/object:Gem::Version
-  version: '3.2'
+  version: '3.3'
 platform: ruby
 authors:
 - Brian Shirai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-29 00:00:00.000000000 Z
+date: 2016-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   name: bundler
-  type: :development
-  requirement: !ruby/object:Gem::Requirement
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
-  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   name: rake
-  type: :development
-  requirement: !ruby/object:Gem::Requirement
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
-  prerelease: false
+  type: :development
 description: An Abstract Syntax Tree for the Rubinius language platform.
 email:
 - brixen@gmail.com
@@ -83,7 +83,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.2
 signing_key: 
 specification_version: 4
 summary: An Abstract Syntax Tree for the Rubinius language platform.