furnace-avm2 0.0.9 → 0.9.0

data/lib/furnace-avm2/abc/metadata/method_info.rb

@@ -7,23 +7,24 @@ module Furnace::AVM2::ABC
     SET_DXNS        = 0x40
     HAS_PARAM_NAMES = 0x80
 
-    vuint30     :param_count, :value => lambda { param_types.count }
+    vuint30       :param_count, :value => lambda { param_types.count }
 
-    const_ref   :return_type, :multiname
-    const_array :param_types, :multiname, :initial_length => :param_count
+    const_ref     :return_type, :multiname
+    const_array   :param_types, :multiname, :initial_length => :param_count
 
-    const_ref   :name, :string
+    const_ref     :name, :string
 
-    uint8       :flags
-    flag        :needs_arguments,  :flags, NEED_ARGUMENTS
-    flag        :needs_activation, :flags, NEED_ACTIVATION
-    flag        :needs_rest,       :flags, NEED_REST
-    flag        :has_optional,     :flags, HAS_OPTIONAL
-    flag        :set_dxns,         :flags, SET_DXNS
-    flag        :has_param_names,  :flags, HAS_PARAM_NAMES
+    uint8         :flags
+    flag          :needs_arguments,  :flags, NEED_ARGUMENTS
+    flag          :needs_activation, :flags, NEED_ACTIVATION
+    flag          :needs_rest,       :flags, NEED_REST
+    flag          :has_defaults,     :flags, HAS_OPTIONAL
+    flag          :set_dxns,         :flags, SET_DXNS
+    flag          :has_param_names,  :flags, HAS_PARAM_NAMES
 
-    nested      :options, :class => OptionInfo, :if => lambda { flags & HAS_OPTIONAL != 0 }
-    const_array :param_names, :string, :initial_length => :param_count, :if => lambda { flags & HAS_PARAM_NAMES != 0 }
+    abc_array_of  :default, :nested, :class => DefaultValue, :if => :has_defaults?
+
+    const_array   :param_names, :string, :initial_length => :param_count, :if => :has_param_names?
 
     def to_astlet(index, name=nil)
       root = AST::Node.new(:method)
@@ -53,5 +54,11 @@ module Furnace::AVM2::ABC
 
       root.normalize_hierarchy!
     end
+
+    def collect_ns
+      ns = param_types.compact.map(&:collect_ns).reduce([], :+)
+      ns += return_type.collect_ns if return_type
+      ns
+    end
   end
 end

data/lib/furnace-avm2/abc/metadata/multiname_info.rb

@@ -38,5 +38,11 @@ module Furnace::AVM2::ABC
     def to_s
       data.to_s
     end
+
+    def to_astlet(*args)
+      node = data.to_astlet(*args)
+      node.metadata[:origin] = self
+      node
+    end
   end
 end

data/lib/furnace-avm2/abc/metadata/multiname_kind_genericname.rb

@@ -1,16 +1,19 @@
 module Furnace::AVM2::ABC
   # Undocumented
   class MultinameKindGenericName < Record
-    vuint30      :name_type
-
-    abc_array_of :parameter, :vuint30
+    const_ref      :name,      :multiname
+    const_array_of :parameter, :multiname
 
     def to_s
-      "(genericname)"
+      "#{name.to_s}<#{parameters.map(&:to_s).join(",")}>"
     end
 
     def to_astlet
-      AST::Node.new(:generic, [ name_type, parameters ])
+      AST::Node.new(:generic, [ name.to_astlet, parameters.map(&:to_astlet) ])
+    end
+
+    def collect_ns
+      [ *name.collect_ns, *parameters.map(&:collect_ns).reduce([], :+) ]
     end
   end
 end

data/lib/furnace-avm2/abc/metadata/multiname_kind_multiname.rb

@@ -11,6 +11,10 @@ module Furnace::AVM2::ABC
       AST::Node.new(:m, [ ns_set.to_astlet, name ])
     end
 
+    def collect_ns
+      ns_set.ns
+    end
+
     def context_size
       0
     end

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

@@ -12,7 +12,7 @@ module Furnace::AVM2::ABC
     end
 
     def to_astlet
-      node = AST::Node.new(:q)
+      node = AST::Node.new(:q, [])
 
       if ns && ns.name == ""
       elsif ns
@@ -37,6 +37,10 @@ module Furnace::AVM2::ABC
       end
     end
 
+    def collect_ns
+      [ ns ]
+    end
+
     def context_size
       0
     end

data/lib/furnace-avm2/abc/metadata/record_with_value.rb

@@ -0,0 +1,90 @@
+module Furnace::AVM2::ABC
+  module RecordWithValue
+    XlatTable = {
+      :Int                => 0x03,
+      :UInt               => 0x04,
+      :Double             => 0x06,
+      :Utf8               => 0x01,
+      :True               => 0x0B,
+      :False              => 0x0A,
+      :Null               => 0x0C,
+      :Undefined          => 0x00,
+      :Namespace          => 0x08,
+      :PackageNamespace   => 0x16,
+      :PackageInternalNs  => 0x17,
+      :ProtectedNamespace => 0x18,
+      :ExplicitNamespace  => 0x19,
+      :StaticProtectedNs  => 0x1A,
+      :PrivateNs          => 0x05,
+    }
+
+    def value
+      if value_idx > 0
+        case value_kind
+        when :Int
+          AST::Node.new(:integer, [ root.constant_pool.ints[value_idx - 1] ])
+        when :UInt
+          AST::Node.new(:integer, [ root.constant_pool.uints[value_idx - 1] ])
+        when :Double
+          AST::Node.new(:double, [ root.constant_pool.doubles[value_idx - 1] ])
+        when :Utf8
+          AST::Node.new(:string, [ root.constant_pool.strings[value_idx - 1] ])
+        when :True
+          AST::Node.new(:true)
+        when :False
+          AST::Node.new(:false)
+        when :Null
+          AST::Node.new(:null)
+        when :Undefined
+          AST::Node.new(:undefined)
+        else
+          raise "unknown value kind #{value_kind}"
+        end
+      else
+        nil
+      end
+    end
+
+    def ruby_value
+      if value_idx > 0
+        case value_kind
+        when :Int
+          root.constant_pool.ints[value_idx - 1]
+        when :UInt
+          root.constant_pool.uints[value_idx - 1]
+        when :Double
+          root.constant_pool.doubles[value_idx - 1]
+        when :Utf8
+          root.constant_pool.strings[value_idx - 1]
+        when :True
+          true
+        when :False
+          false
+        when :Null
+          nil
+        when :Namespace
+          :"%%Namespace"
+        else
+          raise "unknown value kind #{value_kind}"
+        end
+      else
+        nil
+      end
+    end
+
+    def printable_value
+      if value_idx > 0
+        case value_kind
+        when :Null
+          "null"
+        when :Undefined
+          "undefined"
+        when :Int, :UInt, :Double, :Utf8, :True, :False
+          ruby_value.inspect
+        end
+      else
+        nil
+      end
+    end
+  end
+end

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

@@ -1,7 +1,31 @@
 module Furnace::AVM2::ABC
   class ScriptInfo < Record
-    vuint30 :init
+    include InitializerBody
+
+    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
+    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))
+    end
+
+    def any_code?
+      non_init_traits.any?
+    end
+
+    def non_init_traits
+      traits.reject { |trait| trait.kind == :Class }
+    end
   end
 end

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

@@ -1,10 +1,14 @@
 module Furnace::AVM2::ABC
   class TraitClass < Record
-    vuint30 :slot_id
-    vuint30 :classi
+    vuint30  :slot_id
+    root_ref :klass,   :klass, :plural => :klasses
 
     def to_astlet(trait)
-      :class
+      AST::Node.new(:class, [trait.name.to_astlet, klass.instance.name.to_astlet])
+    end
+
+    def collect_ns
+      []
     end
   end
 end

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

@@ -10,9 +10,9 @@ module Furnace::AVM2::ABC
       :Const    => 6
     }
 
-    FINAL    = 0x01
-    OVERRIDE = 0x02
-    METADATA = 0x04
+    TRAIT_FINAL    = 0x01
+    TRAIT_OVERRIDE = 0x02
+    TRAIT_METADATA = 0x04
 
     attr_accessor :kind_raw
 
@@ -34,6 +34,10 @@ module Furnace::AVM2::ABC
     const_ref  :name, :multiname
 
     attributes :attributes
+    flag       :final,      :attributes, TRAIT_FINAL
+    flag       :override,   :attributes, TRAIT_OVERRIDE
+    flag       :metadata,   :attributes, TRAIT_METADATA
+
     xlat_field :kind
 
     choice     :data, :selection => :kind do
@@ -46,7 +50,7 @@ module Furnace::AVM2::ABC
       variant :Const,    :nested, :class => TraitSlot
     end
 
-    abc_array_of :metadata, :vuint30, :plural => :metadata, :if => lambda { attributes & METADATA != 0 }
+    abc_array_of :metadata, :vuint30, :plural => :metadata, :if => :metadata?
 
     def method_missing(method, *args, &block)
       data.send(method, *args, &block)

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

@@ -10,5 +10,9 @@ module Furnace::AVM2::ABC
     def to_astlet(trait)
       method.to_astlet(method_idx, trait.name.to_astlet)
     end
+
+    def collect_ns
+      method.collect_ns
+    end
   end
 end

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

@@ -1,22 +1,6 @@
 module Furnace::AVM2::ABC
   class TraitSlot < Record
-    XlatTable = {
-      :Int                => 0x03,
-      :UInt               => 0x04,
-      :Double             => 0x06,
-      :Utf8               => 0x01,
-      :True               => 0x0B,
-      :False              => 0x0A,
-      :Null               => 0x0C,
-      :Undefined          => 0x00,
-      :Namespace          => 0x08,
-      :PackageNamespace   => 0x16,
-      :PackageInternalNs  => 0x17,
-      :ProtectedNamespace => 0x18,
-      :ExplicitNamespace  => 0x19,
-      :StaticProtectedNs  => 0x1A,
-      :PrivateNs          => 0x05,
-    }
+    include RecordWithValue
 
     vuint30    :idx
     const_ref  :type,   :multiname
@@ -30,41 +14,11 @@ module Furnace::AVM2::ABC
       AST::Node.new(:slot, [ (trait.name ? trait.name.to_astlet : nil), (type ? type.to_astlet : nil), value, idx ])
     end
 
-    def value
-      if value_idx > 0
-        case value_kind
-        when :Int
-          AST::Node.new(:integer, [ root.constant_pool.ints[value_idx - 1] ])
-        when :UInt
-          AST::Node.new(:integer, [ root.constant_pool.uints[value_idx - 1] ])
-        when :Double
-          AST::Node.new(:double, [ root.constant_pool.doubles[value_idx - 1] ])
-        when :Utf8
-          AST::Node.new(:string, [ root.constant_pool.strings[value_idx - 1] ])
-        when :True
-          AST::Node.new(:true)
-        when :False
-          AST::Node.new(:false)
-        when :Null
-          AST::Node.new(:null)
-        when :Undefined
-          AST::Node.new(:undefined)
-        else
-          raise "unknown value kind #{value_kind}"
-        end
+    def collect_ns
+      if type
+        type.collect_ns
       else
-        nil
-      end
-    end
-
-    def ruby_value
-      astlet_value = self.value
-      if astlet_value
-        if astlet_value.children.count > 0
-          astlet_value.children.first
-        else
-          astlet_value.name
-        end
+        []
       end
     end
   end

data/lib/furnace-avm2/abc/opcodes/bitwise/as3_lshift.rb

@@ -1,5 +1,5 @@
 module Furnace::AVM2::ABC
-  class AS3LShift < BitwiseOpcode
+  class AS3Lshift < BitwiseOpcode
     instruction 0xa5
 
     consume 2

data/lib/furnace-avm2/abc/opcodes/bitwise/as3_rshift.rb

@@ -1,5 +1,5 @@
 module Furnace::AVM2::ABC
-  class AS3RShift < BitwiseOpcode
+  class AS3Rshift < BitwiseOpcode
     instruction 0xa6
 
     consume 2

data/lib/furnace-avm2/abc/opcodes/bitwise/as3_urshift.rb

@@ -1,5 +1,5 @@
 module Furnace::AVM2::ABC
-  class AS3URShift < BitwiseOpcode
+  class AS3Urshift < BitwiseOpcode
     instruction 0xa7
 
     consume 2

data/lib/furnace-avm2/abc/opcodes/debug/as3_debug.rb

@@ -0,0 +1,15 @@
+module Furnace::AVM2::ABC
+  class AS3Debug < Opcode
+    instruction 0xef
+
+    body do
+      uint8   :debug_type
+      vuint30 :index
+      uint8   :reg
+      vuint30 :extra
+    end
+
+    consume 0
+    produce 0
+  end
+end

data/lib/furnace-avm2/abc/opcodes/debug/as3_debugfile.rb

@@ -0,0 +1,12 @@
+module Furnace::AVM2::ABC
+  class AS3DebugFile < Opcode
+    instruction 0xf1
+
+    body do
+      vuint30 :index
+    end
+
+    consume 0
+    produce 0
+  end
+end

data/lib/furnace-avm2/abc/opcodes/debug/as3_debugline.rb

@@ -0,0 +1,12 @@
+module Furnace::AVM2::ABC
+  class AS3DebugLine < Opcode
+    instruction 0xf0
+
+    body do
+      vuint30 :linenum
+    end
+
+    consume 0
+    produce 0
+  end
+end

data/lib/furnace-avm2/abc/opcodes/function_invocation/as3_callproplex.rb

@@ -0,0 +1,21 @@
+module Furnace::AVM2::ABC
+  class AS3CallPropertyLex < Opcode
+    include ContextualOpcode
+
+    instruction 0x4c
+
+    implicit_operand false
+
+    body do
+      const_ref :property, :multiname
+      vuint30   :arg_count
+    end
+
+    consume { body.arg_count }
+    produce 1
+
+    def disassemble_parameters
+      "#{body.property.to_s}(#{body.arg_count})"
+    end
+  end
+end