furnace-avm2 0.0.2 → 0.0.3

data/Gemfile.lock

@@ -1,14 +1,14 @@
 PATH
   remote: .
   specs:
-    furnace-avm2 (0.0.1)
-      furnace
+    furnace-avm2 (0.0.2)
+      furnace (>= 0.0.4)
       trollop
 
 GEM
   remote: http://rubygems.org/
   specs:
-    furnace (0.0.3)
+    furnace (0.0.4)
     trollop (1.16.2)
 
 PLATFORMS

data/lib/avm2/abc/metadata/instance_info.rb

@@ -24,6 +24,10 @@ module AVM2::ABC
 
     abc_array_of   :trait, :nested, :class => TraitInfo
 
+    def klass
+      root.klasses[root.instances.index(self)]
+    end
+
     def to_astlet
       if interface?
         root = AST::Node.new(:interface)

data/lib/avm2/abc/metadata/klass_info.rb

@@ -1,7 +1,19 @@
 module AVM2::ABC
   class KlassInfo < Record
+    include RecordWithTraits
+
     root_ref     :initializer, :method
 
     abc_array_of :trait, :nested, :class => TraitInfo
+
+    def to_astlet
+      root = AST::Node.new(:klass)
+
+      if traits.any?
+        root.children << AST::Node.new(:traits, traits.map(&:to_astlet))
+      end
+
+      root.normalize_hierarchy!
+    end
   end
 end

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

@@ -27,9 +27,8 @@ module AVM2::ABC
 
     def to_astlet(index, name=nil)
       root = AST::Node.new(:method)
-      root.metadata = { origin: self }
+      root.metadata = { method: self, label: index }
 
-      root.children << index
       root.children << name || self.name
 
       if return_type

data/lib/avm2/abc/metadata/option_detail.rb

@@ -1,26 +1,6 @@
 module AVM2::ABC
   class OptionDetail < 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,
-    }
-
-    vuint30    :val
-
-    uint8      :kind_raw
-    xlat_field :kind
+    vuint30    :value_idx
+    uint8      :value_kind_raw
   end
 end

data/lib/avm2/abc/metadata/record_with_traits.rb

@@ -1,9 +1,27 @@
 module AVM2::ABC
   module RecordWithTraits
     TraitInfo::XlatTable.keys.each do |trait_type|
-      define_method :"#{trait_type.to_s.downcase}_traits" do
+      basename = trait_type.to_s.downcase
+
+      define_method :"#{basename}_traits" do
         traits.select { |trait| trait.kind == trait_type }
       end
+
+      define_method :"#{basename}_trait" do |name|
+        case name
+        when String
+          traits.find { |trait| trait.name.to_s == name }
+        when AST::Node
+          traits.find { |trait| trait.name.to_astlet == name }
+        else
+          traits.find { |trait| trait.name == name }
+        end
+      end
+
+      define_method :"#{basename}_trait!" do |name|
+        send(:"#{basename}_trait", name) or
+            raise "trait #{name} not found"
+      end
     end
 
     def codes_to_ast

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

@@ -1,13 +1,71 @@
 module AVM2::ABC
   class TraitSlot < Record
-    vuint30   :idx
-    const_ref :type,   :multiname
+    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,
+    }
 
-    vuint30   :value_idx
-    uint8     :value_kind, :if => lambda { value_idx != 0 }
+    vuint30    :idx
+    const_ref  :type,   :multiname
+
+    vuint30    :value_idx
+
+    uint8      :value_kind_raw, :if => lambda { value_idx != 0 }
+    xlat_field :value_kind
 
     def to_astlet(trait)
-      AST::Node.new(:slot, [ trait.name.to_astlet, type.to_astlet, idx ])
+      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(:integer, [ root.constant_pool.doubles[value_idx - 1] ])
+        when :Utf8
+          AST::Node.new(:integer, [ 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
+      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
 end

data/lib/avm2/abc/opcodes/arithmetic/as3_equals.rb

@@ -1,6 +1,7 @@
 module AVM2::ABC
   class AS3Equals < ArithmeticOpcode
     instruction 0xab
+    ast_type :==
 
     consume 2
     produce 1

data/lib/avm2/abc/opcodes/arithmetic/as3_greaterequals.rb

@@ -1,6 +1,7 @@
 module AVM2::ABC
   class AS3GreaterEquals < ArithmeticOpcode
     instruction 0xb0
+    ast_type :>=
 
     consume 2
     produce 1

data/lib/avm2/abc/opcodes/arithmetic/as3_greaterthan.rb

@@ -1,6 +1,7 @@
 module AVM2::ABC
   class AS3GreaterThan < ArithmeticOpcode
     instruction 0xaf
+    ast_type :>
 
     consume 2
     produce 1

data/lib/avm2/abc/opcodes/arithmetic/as3_lessequals.rb

@@ -1,6 +1,7 @@
 module AVM2::ABC
   class AS3LessEquals < ArithmeticOpcode
     instruction 0xae
+    ast_type :<=
 
     consume 2
     produce 1

data/lib/avm2/abc/opcodes/arithmetic/as3_lessthan.rb

@@ -1,6 +1,7 @@
 module AVM2::ABC
   class AS3LessThan < ArithmeticOpcode
     instruction 0xad
+    ast_type :<
 
     consume 2
     produce 1

data/lib/avm2/abc/opcodes/arithmetic/as3_not.rb

@@ -1,6 +1,7 @@
 module AVM2::ABC
   class AS3Not < ArithmeticOpcode
     instruction 0x96
+    ast_type :!
 
     consume 1
     produce 1

data/lib/avm2/abc/opcodes/arithmetic/as3_strictequals.rb

@@ -1,6 +1,7 @@
 module AVM2::ABC
   class AS3StrictEquals < ArithmeticOpcode
     instruction 0xac
+    ast_type :===
 
     consume 2
     produce 1

data/lib/avm2/abc/opcodes/opcode.rb

@@ -47,6 +47,8 @@ module AVM2::ABC
       MAP[encoding] = self
     end
 
+    define_property :ast_type
+
     define_property :consume_context, :accessor => :consumes_context
     define_property :consume,         :accessor => :consumes
     define_property :produce,         :accessor => :produces

data/lib/avm2/transform/ast_normalize.rb

@@ -31,8 +31,20 @@ module AVM2
 
       # (if-* a b) -> (*' a b)
       IF_MAPPING = {
-        :eq  => [false, :equals],
-        :nge => [true,  :greaterequals],
+        :eq       => [false, :==],
+        :ne       => [true,  :==],
+        :ge       => [false, :>=],
+        :nge      => [true,  :>=],
+        :gt       => [false, :>],
+        :ngt      => [true,  :>],
+        :le       => [false, :<=],
+        :nle      => [true,  :<=],
+        :lt       => [false, :<],
+        :nlt      => [true,  :<],
+        :stricteq => [false, :===],
+        :strictne => [true,  :===],
+        :true     => [false, :expand],
+        :false    => [true,  :expand],
       }
       IF_MAPPING.each do |cond, (reverse, comp)|
         define_method :"on_if_#{cond}" do |node|

data/lib/avm2/version.rb

@@ -1,3 +1,3 @@
 module AVM2
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: furnace-avm2
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-28 00:00:00.000000000 Z
+date: 2012-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: furnace
-  requirement: &84387770 !ruby/object:Gem::Requirement
+  requirement: &79918900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.0.4
   type: :runtime
   prerelease: false
-  version_requirements: *84387770
+  version_requirements: *79918900
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &84385470 !ruby/object:Gem::Requirement
+  requirement: &79918360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *84385470
+  version_requirements: *79918360
 description: furnace-avm2 allows one to load, modify and write backFlash ActionScript3
   bytecode. It can also decompile it.
 email: