rubinius-ast 3.8 → 3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0fcd85af7bb6b46d7cc98969f55e3d1f7ca2461f
-  data.tar.gz: f841f69e37c46dbabdec8cc008b3bf0ef9cfe9a9
+  metadata.gz: d867b8dbe5184f19f8f332e2e0ca106e6508cbb1
+  data.tar.gz: 8deb10a4f19850ee6fad3ae64083982a0cdac5d5
 SHA512:
-  metadata.gz: 32b46b170eaefa666d06a7dd2489de4e0fc584650eca3f5397a7c4b4607b6d24e458fec4eca3b42fcedb38308bda340a8667097c49c2e6cb5fdcc64dc92d0d76
-  data.tar.gz: 6b4818f6358ada39bebbe7e7036c9f213f11aa335146d0bd132a29894886a74961a8ac09828b18485198bd6ec4b950b50575bc34b6263b40b1e015733476fb0f
+  metadata.gz: 61b46cfcebb9444b301f1e80513d510ae891342fefaf9344a6de6f90229fcd7f9682ec76f01ea54c1f4b1c9035f405060a1a12949b239d9cb1e5e899621300d0
+  data.tar.gz: 3f16067d2677866fefed206f191bf11a205a653b5c94fbcd89fab4e1c901d26af02054a8495e5f6eda7ef755c4e2834ed5f364552cefafcee3ab4740033c280d

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

@@ -83,6 +83,7 @@ module CodeTools
 
         ex = g.new_label
         ok = g.new_label
+        g.state.push_unwind g.new_unwind_label
         g.setup_unwind ex, RescueType
 
         @parent.bytecode(g)
@@ -94,6 +95,7 @@ module CodeTools
         end
         g.invoke_primitive :vm_const_defined_under, 3
 
+        g.state.pop_unwind
         g.pop_unwind
         g.goto ok
 
@@ -169,6 +171,7 @@ module CodeTools
 
         ex = g.new_label
         ok = g.new_label
+        g.state.push_unwind g.new_unwind_label
         g.setup_unwind ex, RescueType
 
         g.push_cpath_top
@@ -176,6 +179,7 @@ module CodeTools
         g.push_false
         g.invoke_primitive :vm_const_defined_under, 3
 
+        g.state.pop_unwind
         g.pop_unwind
         g.goto ok
 
@@ -264,11 +268,13 @@ module CodeTools
 
         ex = g.new_label
         ok = g.new_label
+        g.state.push_unwind g.new_unwind_label
         g.setup_unwind ex, RescueType
 
         g.push_literal @name
         g.invoke_primitive :vm_const_defined, 1
 
+        g.state.pop_unwind
         g.pop_unwind
         g.goto ok
 

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

@@ -40,6 +40,7 @@ module CodeTools
 
         ok = g.new_label
         ex = g.new_label
+        g.state.push_unwind g.new_unwind_label
         g.setup_unwind ex, EnsureType
 
         # TODO: ?
@@ -65,6 +66,7 @@ module CodeTools
         g.break = old_break
         g.next = old_next
 
+        g.state.pop_unwind
         g.pop_unwind
         g.goto ok
 
@@ -214,6 +216,7 @@ module CodeTools
 
           this_retry.set!
           ex = g.new_label
+          g.state.push_unwind g.new_unwind_label
           g.setup_unwind ex, RescueType
 
           # TODO: ?
@@ -241,6 +244,7 @@ module CodeTools
           end
 
           @body.bytecode(g)
+          g.state.pop_unwind
           g.pop_unwind
           g.goto els
 

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

@@ -285,6 +285,7 @@ module CodeTools
         @op_asgn = 0
         @rescue = []
         @name = []
+        @unwinds = []
         @check_for_locals = true
       end
 
@@ -403,6 +404,18 @@ module CodeTools
       def loop?
         @loop > 0
       end
+
+      def push_unwind(label)
+        @unwinds << label
+      end
+
+      def pop_unwind
+        @unwinds.pop
+      end
+
+      def unwind_label
+        @unwinds.last
+      end
     end
   end
 end

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

@@ -50,10 +50,12 @@ module CodeTools
 
         ok = g.new_label
         ex = g.new_label
+        g.state.push_unwind g.new_unwind_label
         g.setup_unwind ex, RescueType
 
         bytecode(g)
 
+        g.state.pop_unwind
         g.pop_unwind
         g.goto ok
 

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

@@ -1,5 +1,5 @@
 module CodeTools
   module AST
-    VERSION = "3.8"
+    VERSION = "3.9"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubinius-ast
 version: !ruby/object:Gem::Version
-  version: '3.8'
+  version: '3.9'
 platform: ruby
 authors:
 - Brian Shirai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-15 00:00:00.000000000 Z
+date: 2017-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler