RubyGems - furnace-avm2 - Versions diffs - 0.9.0 → 0.9.1 - Mend

furnace-avm2 0.9.0 → 0.9.1

Files changed (129) hide show

data/lib/furnace-avm2/abc/metadata/multiname_kind_multinamel.rb CHANGED

@@ -10,6 +10,10 @@ module Furnace::AVM2::ABC
       node = AST::Node.new(:m, [ ns_set.to_astlet, name ])
     end
+    def collect_ns(options)
+      # nothing
+    end
     def context_size
       1
     end

data/lib/furnace-avm2/abc/metadata/multiname_kind_qname.rb CHANGED

@@ -37,8 +37,16 @@ module Furnace::AVM2::ABC
       end
     end
-    def collect_ns
-      [ ns ]
+    def collect_ns(options)
+      return if options[:no_ns].include?(ns)
+      names = options[:names]
+      if names[name].nil?
+        options[:ns].add ns
+        names[name] = ns
+      elsif names[name] != ns
+        options[:no_ns].add ns
+      end
     end
     def context_size

data/lib/furnace-avm2/abc/metadata/multiname_kind_rtqname.rb CHANGED

@@ -10,6 +10,10 @@ module Furnace::AVM2::ABC
       node = AST::Node.new(:q, [ ns, name ])
     end
+    def collect_ns(options)
+      # nothing
+    end
     def context_size
       1
     end

data/lib/furnace-avm2/abc/metadata/multiname_kind_rtqnamel.rb CHANGED

@@ -4,6 +4,10 @@ module Furnace::AVM2::ABC
       "(rt)::(rt)"
     end
+    def collect_ns(options)
+      # nothing
+    end
     def context_size
       2
     end

data/lib/furnace-avm2/abc/metadata/script_info.rb CHANGED

@@ -1,23 +1,27 @@
 module Furnace::AVM2::ABC
   class ScriptInfo < Record
     include InitializerBody
+    include RecordWithTraits
     root_ref     :initializer,  :method
     abc_array_of :trait, :nested, :class => TraitInfo
     def collect_ns
-      ns = []
-      ns += initializer.collect_ns if initializer
-      traits.each { |trait| ns += trait.collect_ns }
-      ns
+      options = { ns: Set.new([ non_init_traits[0].name.ns ]), no_ns: Set.new, names: {} }
+      initializer.collect_ns(options) if initializer
+      traits.each { |trait| trait.collect_ns(options) }
+      options
     end
     def decompile(options={})
       Furnace::AVM2::Tokens::PackageToken.new(self,
-            options.merge(ns: collect_ns,
-                package_type: :script,
-                package_name: non_init_traits[0].name))
+            options.merge(collect_ns).merge(
+              package_type: :script,
+              package_name: non_init_traits[0].name)
+            )
     end
     def any_code?

data/lib/furnace-avm2/abc/metadata/trait_class.rb CHANGED

@@ -7,8 +7,8 @@ module Furnace::AVM2::ABC
       AST::Node.new(:class, [trait.name.to_astlet, klass.instance.name.to_astlet])
     end
-    def collect_ns
-      []
+    def collect_ns(options)
+      # dummy
     end
   end
 end

data/lib/furnace-avm2/abc/metadata/trait_info.rb CHANGED

@@ -50,7 +50,7 @@ module Furnace::AVM2::ABC
       variant :Const,    :nested, :class => TraitSlot
     end
-    abc_array_of :metadata, :vuint30, :plural => :metadata, :if => :metadata?
+    root_array_of :metadata, :metadata, :plural => :metadata, :if => :metadata?
     def method_missing(method, *args, &block)
       data.send(method, *args, &block)

data/lib/furnace-avm2/abc/metadata/trait_method.rb CHANGED

@@ -4,15 +4,16 @@ module Furnace::AVM2::ABC
     root_ref :method
     def body
-      root.method_bodies.find { |body| body.method_idx == method_idx }
+      root.method_body_at(method_idx)
     end
     def to_astlet(trait)
       method.to_astlet(method_idx, trait.name.to_astlet)
     end
-    def collect_ns
-      method.collect_ns
+    def collect_ns(options)
+      method.collect_ns(options)
+      body.collect_ns(options) if body
     end
   end
 end

data/lib/furnace-avm2/abc/metadata/trait_slot.rb CHANGED

@@ -14,9 +14,9 @@ module Furnace::AVM2::ABC
       AST::Node.new(:slot, [ (trait.name ? trait.name.to_astlet : nil), (type ? type.to_astlet : nil), value, idx ])
     end
-    def collect_ns
+    def collect_ns(options)
       if type
-        type.collect_ns
+        type.collect_ns(options)
       else
         []
       end

data/lib/furnace-avm2/abc/opcodes/alchemy/alchemy_extend_1.rb ADDED

@@ -0,0 +1,8 @@
+module Furnace::AVM2::ABC
+  class AS3AlchemyExtend1 < Opcode
+    instruction 0x50
+    consume 1
+    produce 1
+  end
+end

data/lib/furnace-avm2/abc/opcodes/alchemy/alchemy_extend_16.rb ADDED

@@ -0,0 +1,8 @@
+module Furnace::AVM2::ABC
+  class AS3AlchemyExtend16 < Opcode
+    instruction 0x52
+    consume 1
+    produce 1
+  end
+end

data/lib/furnace-avm2/abc/opcodes/alchemy/alchemy_extend_8.rb ADDED

@@ -0,0 +1,8 @@
+module Furnace::AVM2::ABC
+  class AS3AlchemyExtend8 < Opcode
+    instruction 0x51
+    consume 1
+    produce 1
+  end
+end

data/lib/furnace-avm2/abc/opcodes/alchemy/alchemy_load_float32.rb ADDED

@@ -0,0 +1,8 @@
+module Furnace::AVM2::ABC
+  class AS3AlchemyLoadFloat32 < Opcode
+    instruction 0x3d
+    consume 1
+    produce 1
+  end
+end

data/lib/furnace-avm2/abc/opcodes/alchemy/alchemy_load_float64.rb ADDED

@@ -0,0 +1,8 @@
+module Furnace::AVM2::ABC
+  class AS3AlchemyLoadFloat64 < Opcode
+    instruction 0x3e
+    consume 1
+    produce 1
+  end
+end

data/lib/furnace-avm2/abc/opcodes/alchemy/alchemy_load_int16.rb ADDED

@@ -0,0 +1,8 @@
+module Furnace::AVM2::ABC
+  class AS3AlchemyLoadInt16 < Opcode
+    instruction 0x3b
+    consume 1
+    produce 1
+  end
+end

data/lib/furnace-avm2/abc/opcodes/alchemy/alchemy_load_int32.rb ADDED

@@ -0,0 +1,8 @@
+module Furnace::AVM2::ABC
+  class AS3AlchemyLoadInt32 < Opcode
+    instruction 0x3c
+    consume 1
+    produce 1
+  end
+end

data/lib/furnace-avm2/abc/opcodes/alchemy/alchemy_load_int8.rb ADDED

@@ -0,0 +1,8 @@
+module Furnace::AVM2::ABC
+  class AS3AlchemyLoadInt8 < Opcode
+    instruction 0x3a
+    consume 1
+    produce 1
+  end
+end

data/lib/furnace-avm2/abc/opcodes/alchemy/alchemy_store_float32.rb ADDED

@@ -0,0 +1,8 @@
+module Furnace::AVM2::ABC
+  class AS3AlchemyStoreFloat32 < Opcode
+    instruction 0x38
+    consume 2
+    produce 0
+  end
+end

data/lib/furnace-avm2/abc/opcodes/alchemy/alchemy_store_float64.rb ADDED

@@ -0,0 +1,8 @@
+module Furnace::AVM2::ABC
+  class AS3AlchemyStoreFloat64 < Opcode
+    instruction 0x39
+    consume 2
+    produce 0
+  end
+end

data/lib/furnace-avm2/abc/opcodes/alchemy/alchemy_store_int16.rb ADDED

@@ -0,0 +1,8 @@
+module Furnace::AVM2::ABC
+  class AS3AlchemyStoreInt16 < Opcode
+    instruction 0x36
+    consume 2
+    produce 0
+  end
+end

data/lib/furnace-avm2/abc/opcodes/alchemy/alchemy_store_int32.rb ADDED

@@ -0,0 +1,8 @@
+module Furnace::AVM2::ABC
+  class AS3AlchemyStoreInt32 < Opcode
+    instruction 0x37
+    consume 2
+    produce 0
+  end
+end

data/lib/furnace-avm2/abc/opcodes/alchemy/alchemy_store_int8.rb ADDED

@@ -0,0 +1,8 @@
+module Furnace::AVM2::ABC
+  class AS3AlchemyStoreInt8 < Opcode
+    instruction 0x35
+    consume 2
+    produce 0
+  end
+end

data/lib/furnace-avm2/abc/opcodes/arithmetic/as3_add.rb CHANGED

@@ -1,5 +1,5 @@
 module Furnace::AVM2::ABC
-  class AS3Add < ArithmeticOpcode
+  class AS3Add < Opcode
     instruction 0xa0
     consume 2

data/lib/furnace-avm2/abc/opcodes/arithmetic/as3_add_i.rb CHANGED

@@ -1,5 +1,5 @@
 module Furnace::AVM2::ABC
-  class AS3AddI < ArithmeticOpcode
+  class AS3AddI < Opcode
     instruction 0xc5
     consume 2

data/lib/furnace-avm2/abc/opcodes/arithmetic/as3_declocal.rb CHANGED

@@ -1,5 +1,5 @@
 module Furnace::AVM2::ABC
-  class AS3DecLocal < ArithmeticOpcode
+  class AS3DecLocal < Opcode
     instruction 0x94
     body do

data/lib/furnace-avm2/abc/opcodes/arithmetic/as3_declocal_i.rb CHANGED

@@ -1,5 +1,5 @@
 module Furnace::AVM2::ABC
-  class AS3DecLocalI < ArithmeticOpcode
+  class AS3DecLocalI < Opcode
     instruction 0xc3
     body do

data/lib/furnace-avm2/abc/opcodes/arithmetic/as3_decrement.rb CHANGED

@@ -1,5 +1,5 @@
 module Furnace::AVM2::ABC
-  class AS3Decrement < ArithmeticOpcode
+  class AS3Decrement < Opcode
     instruction 0x93
     consume 1

data/lib/furnace-avm2/abc/opcodes/arithmetic/as3_decrement_i.rb CHANGED

@@ -1,5 +1,5 @@
 module Furnace::AVM2::ABC
-  class AS3DecrementI < ArithmeticOpcode
+  class AS3DecrementI < Opcode
     instruction 0xc1
     consume 1

data/lib/furnace-avm2/abc/opcodes/arithmetic/as3_divide.rb CHANGED

@@ -1,5 +1,5 @@
 module Furnace::AVM2::ABC
-  class AS3Divide < ArithmeticOpcode
+  class AS3Divide < Opcode
     instruction 0xa3
     consume 2

data/lib/furnace-avm2/abc/opcodes/arithmetic/as3_equals.rb CHANGED

@@ -1,5 +1,5 @@
 module Furnace::AVM2::ABC
-  class AS3Equals < ArithmeticOpcode
+  class AS3Equals < Opcode
     instruction 0xab
     ast_type :==

data/lib/furnace-avm2/abc/opcodes/arithmetic/as3_greaterequals.rb CHANGED

@@ -1,5 +1,5 @@
 module Furnace::AVM2::ABC
-  class AS3GreaterEquals < ArithmeticOpcode
+  class AS3GreaterEquals < Opcode
     instruction 0xb0
     ast_type :>=

data/lib/furnace-avm2/abc/opcodes/arithmetic/as3_greaterthan.rb CHANGED

@@ -1,5 +1,5 @@
 module Furnace::AVM2::ABC
-  class AS3GreaterThan < ArithmeticOpcode
+  class AS3GreaterThan < Opcode
     instruction 0xaf
     ast_type :>

data/lib/furnace-avm2/abc/opcodes/arithmetic/as3_inclocal.rb CHANGED

@@ -1,5 +1,5 @@
 module Furnace::AVM2::ABC
-  class AS3IncLocal < ArithmeticOpcode
+  class AS3IncLocal < Opcode
     instruction 0x92
     body do

data/lib/furnace-avm2/abc/opcodes/arithmetic/as3_inclocal_i.rb CHANGED

@@ -1,5 +1,5 @@
 module Furnace::AVM2::ABC
-  class AS3IncLocalI < ArithmeticOpcode
+  class AS3IncLocalI < Opcode
     instruction 0xc2
     body do

data/lib/furnace-avm2/abc/opcodes/arithmetic/as3_increment.rb CHANGED

@@ -1,5 +1,5 @@
 module Furnace::AVM2::ABC
-  class AS3Increment < ArithmeticOpcode
+  class AS3Increment < Opcode
     instruction 0x91
     consume 1

data/lib/furnace-avm2/abc/opcodes/arithmetic/as3_increment_i.rb CHANGED

@@ -1,5 +1,5 @@
 module Furnace::AVM2::ABC
-  class AS3IncrementI < ArithmeticOpcode
+  class AS3IncrementI < Opcode
     instruction 0xc0
     consume 1

data/lib/furnace-avm2/abc/opcodes/arithmetic/as3_lessequals.rb CHANGED

@@ -1,5 +1,5 @@
 module Furnace::AVM2::ABC
-  class AS3LessEquals < ArithmeticOpcode
+  class AS3LessEquals < Opcode
     instruction 0xae
     ast_type :<=

data/lib/furnace-avm2/abc/opcodes/arithmetic/as3_lessthan.rb CHANGED

@@ -1,5 +1,5 @@
 module Furnace::AVM2::ABC
-  class AS3LessThan < ArithmeticOpcode
+  class AS3LessThan < Opcode
     instruction 0xad
     ast_type :<

data/lib/furnace-avm2/abc/opcodes/arithmetic/as3_modulo.rb CHANGED

@@ -1,5 +1,5 @@
 module Furnace::AVM2::ABC
-  class AS3Modulo < ArithmeticOpcode
+  class AS3Modulo < Opcode
     instruction 0xa4
     consume 2

data/lib/furnace-avm2/abc/opcodes/arithmetic/as3_multiply.rb CHANGED

@@ -1,5 +1,5 @@
 module Furnace::AVM2::ABC
-  class AS3Multiply < ArithmeticOpcode
+  class AS3Multiply < Opcode
     instruction 0xa2
     consume 2

data/lib/furnace-avm2/abc/opcodes/arithmetic/as3_multiply_i.rb CHANGED

@@ -1,5 +1,5 @@
 module Furnace::AVM2::ABC
-  class AS3MultiplyI < ArithmeticOpcode
+  class AS3MultiplyI < Opcode
     instruction 0xc7
     consume 2

data/lib/furnace-avm2/abc/opcodes/arithmetic/as3_negate.rb CHANGED

@@ -1,5 +1,5 @@
 module Furnace::AVM2::ABC
-  class AS3Negate < ArithmeticOpcode
+  class AS3Negate < Opcode
     instruction 0x90
     consume 1

data/lib/furnace-avm2/abc/opcodes/arithmetic/as3_negate_i.rb CHANGED

@@ -1,5 +1,5 @@
 module Furnace::AVM2::ABC
-  class AS3NegateI < ArithmeticOpcode
+  class AS3NegateI < Opcode
     instruction 0xc4
     consume 1

data/lib/furnace-avm2/abc/opcodes/arithmetic/as3_not.rb CHANGED

@@ -1,5 +1,5 @@
 module Furnace::AVM2::ABC
-  class AS3Not < ArithmeticOpcode
+  class AS3Not < Opcode
     instruction 0x96
     ast_type :!