furnace-avm2 0.0.3 → 0.0.4

data/Gemfile.lock

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

data/bin/furnace-avm2

@@ -18,7 +18,7 @@ opts = Trollop::options do
   Usage: #{__FILE__} [options]
 EOS
 
-  opt :input,         "Input file",                                 :type => :string
+  opt :input,         "Input file",                                 :type => :string, :required => true
   opt :output,        "Output file",                                :type => :string
   opt :verbose,       "Be verbose",                                 :default => false
 
@@ -37,7 +37,6 @@ EOS
   opt :ast,           "Build AST",                                  :default => false
 end
 
-Trollop::die "Input file is required" unless opts[:input]
 Trollop::die "Stray arguments: #{ARGV}" unless ARGV.empty?
 
 abc = nil

data/furnace-avm2.gemspec

@@ -1,10 +1,9 @@
 # -*- encoding: utf-8 -*-
 $:.push File.expand_path("../lib", __FILE__)
-require "avm2/version"
 
 Gem::Specification.new do |s|
   s.name        = "furnace-avm2"
-  s.version     = AVM2::VERSION
+  s.version     = "0.0.4"
   s.authors     = ["Peter Zotov"]
   s.email       = ["whitequark@whitequark.org"]
   s.homepage    = "http://github.com/whitequark/furnace-avm2"

data/lib/{avm2.rb → furnace-avm2.rb}

@@ -4,10 +4,8 @@ require "furnace/transform"
 
 require "furnace/graphviz"
 
-module AVM2
+module Furnace::AVM2
 end
 
-require "avm2/version"
-
-require "avm2/abc"
-require "avm2/transform"
+require "furnace-avm2/abc"
+require "furnace-avm2/transform"

data/lib/furnace-avm2/abc.rb

@@ -0,0 +1,68 @@
+module Furnace::AVM2::ABC
+  AST = Furnace::AST
+  CFG = Furnace::CFG
+end
+
+require_relative "binary/choice_definition"
+require_relative "binary/record"
+
+require_relative "abc/primitives/record"
+require_relative "abc/primitives/opcode_sequence"
+
+require_relative "abc/opcodes/opcode"
+require_relative "abc/opcodes/contextual_opcode"
+
+require_relative "abc/opcodes/load_store_opcode"
+require_relative "abc/opcodes/arithmetic_opcode"
+require_relative "abc/opcodes/bitwise_opcode"
+require_relative "abc/opcodes/type_conversion_opcode"
+require_relative "abc/opcodes/push_literal_opcode"
+require_relative "abc/opcodes/control_transfer_opcode"
+require_relative "abc/opcodes/function_invocation_opcode"
+require_relative "abc/opcodes/function_return_opcode"
+require_relative "abc/opcodes/exception_opcode"
+
+require_relative "abc/opcodes/property_opcode"
+
+Dir[File.join(File.dirname(__FILE__), "abc", "opcodes", "*", "*.rb")].each do |file|
+  require file
+end
+
+Furnace::AVM2::ABC::Opcode::MAP.freeze
+
+require_relative "abc/metadata/namespace_info"
+require_relative "abc/metadata/ns_set_info"
+require_relative "abc/metadata/multiname_kind_multiname"
+require_relative "abc/metadata/multiname_kind_multinamel"
+require_relative "abc/metadata/multiname_kind_qname"
+require_relative "abc/metadata/multiname_kind_rtqname"
+require_relative "abc/metadata/multiname_kind_rtqnamel"
+require_relative "abc/metadata/multiname_kind_genericname"
+require_relative "abc/metadata/multiname_info"
+require_relative "abc/metadata/const_pool_info"
+
+require_relative "abc/metadata/option_detail"
+require_relative "abc/metadata/option_info"
+require_relative "abc/metadata/method_info"
+
+require_relative "abc/metadata/metadata_info"
+
+require_relative "abc/metadata/trait_slot"
+require_relative "abc/metadata/trait_method"
+require_relative "abc/metadata/trait_class"
+require_relative "abc/metadata/trait_function"
+require_relative "abc/metadata/trait_info"
+
+require_relative "abc/metadata/record_with_traits"
+
+require_relative "abc/metadata/instance_info"
+require_relative "abc/metadata/klass_info"
+
+require_relative "abc/metadata/script_info"
+
+require_relative "abc/metadata/exception_info"
+require_relative "abc/metadata/method_body_info"
+
+require_relative "abc/metadata/file"
+
+Furnace::AVM2::Binary::Record.codegen_each

data/lib/{avm2 → furnace-avm2}/abc/metadata/const_pool_info.rb

@@ -1,4 +1,4 @@
-module AVM2::ABC
+module Furnace::AVM2::ABC
   class ConstPoolInfo < Record
     def self.cpool_array_of(name, type, options={})
       field_size, field_array = :"#{name}_count", :"#{name}s"

data/lib/{avm2 → furnace-avm2}/abc/metadata/exception_info.rb

@@ -1,4 +1,4 @@
-module AVM2::ABC
+module Furnace::AVM2::ABC
   class ExceptionInfo < Record
     vuint30   :from_offset
     vuint30   :to_offset

data/lib/{avm2 → furnace-avm2}/abc/metadata/file.rb

@@ -1,4 +1,4 @@
-module AVM2::ABC
+module Furnace::AVM2::ABC
   class File < Record
     uint16          :minor_version
     uint16          :major_version

data/lib/{avm2 → furnace-avm2}/abc/metadata/instance_info.rb

@@ -1,4 +1,4 @@
-module AVM2::ABC
+module Furnace::AVM2::ABC
   class InstanceInfo < Record
     include RecordWithTraits
 

data/lib/{avm2 → furnace-avm2}/abc/metadata/klass_info.rb

@@ -1,4 +1,4 @@
-module AVM2::ABC
+module Furnace::AVM2::ABC
   class KlassInfo < Record
     include RecordWithTraits
 

data/lib/{avm2 → furnace-avm2}/abc/metadata/metadata_info.rb

@@ -1,4 +1,4 @@
-module AVM2::ABC
+module Furnace::AVM2::ABC
   class MetadataInfo < Record
     vuint30      :name
 

data/lib/{avm2 → furnace-avm2}/abc/metadata/method_body_info.rb

@@ -1,4 +1,4 @@
-module AVM2::ABC
+module Furnace::AVM2::ABC
   class MethodBodyInfo < Record
     root_ref     :method
     vuint30      :max_stack
@@ -21,12 +21,12 @@ module AVM2::ABC
 
     def code_to_ast
       pipeline = Furnace::Transform::Pipeline.new([
-        AVM2::Transform::ASTBuild.new(validate: true),
-        AVM2::Transform::ASTNormalize.new
+        Furnace::AVM2::Transform::ASTBuild.new(validate: true),
+        Furnace::AVM2::Transform::ASTNormalize.new
       ])
 
       ast, = pipeline.run(code, self)
       ast
     end
   end
-end
+end

data/lib/{avm2 → furnace-avm2}/abc/metadata/method_info.rb

@@ -1,4 +1,4 @@
-module AVM2::ABC
+module Furnace::AVM2::ABC
   class MethodInfo < Record
     NEED_ARGUMENTS  = 0x01
     NEED_ACTIVATION = 0x02

data/lib/{avm2 → furnace-avm2}/abc/metadata/multiname_info.rb

@@ -1,4 +1,4 @@
-module AVM2::ABC
+module Furnace::AVM2::ABC
   class MultinameInfo < Record
     XlatTable = {
       :QName       => 0x07,

data/lib/{avm2 → furnace-avm2}/abc/metadata/multiname_kind_genericname.rb

@@ -1,4 +1,4 @@
-module AVM2::ABC
+module Furnace::AVM2::ABC
   # Undocumented
   class MultinameKindGenericName < Record
     vuint30      :name_type

data/lib/{avm2 → furnace-avm2}/abc/metadata/multiname_kind_multiname.rb

@@ -1,4 +1,4 @@
-module AVM2::ABC
+module Furnace::AVM2::ABC
   class MultinameKindMultiname < Record
     const_ref :name,   :string
     const_ref :ns_set, :ns_set

data/lib/{avm2 → furnace-avm2}/abc/metadata/multiname_kind_multinamel.rb

@@ -1,4 +1,4 @@
-module AVM2::ABC
+module Furnace::AVM2::ABC
   class MultinameKindMultinameL < Record
     const_ref :ns_set, :ns_set
 

data/lib/{avm2 → furnace-avm2}/abc/metadata/multiname_kind_qname.rb

@@ -1,4 +1,4 @@
-module AVM2::ABC
+module Furnace::AVM2::ABC
   class MultinameKindQName < Record
     const_ref :ns,   :namespace
     const_ref :name, :string

data/lib/{avm2 → furnace-avm2}/abc/metadata/multiname_kind_rtqname.rb

@@ -1,4 +1,4 @@
-module AVM2::ABC
+module Furnace::AVM2::ABC
   class MultinameKindRTQName < Record
     const_ref :name, :string
 

data/lib/{avm2 → furnace-avm2}/abc/metadata/multiname_kind_rtqnamel.rb

@@ -1,4 +1,4 @@
-module AVM2::ABC
+module Furnace::AVM2::ABC
   class MultinameKindRTQNameL < Record
     def to_s
       "(rt)::(rt)"

data/lib/{avm2 → furnace-avm2}/abc/metadata/namespace_info.rb

@@ -1,4 +1,4 @@
-module AVM2::ABC
+module Furnace::AVM2::ABC
   class NamespaceInfo < Record
     XlatTable = {
       :Namespace          => 0x08,

data/lib/{avm2 → furnace-avm2}/abc/metadata/ns_set_info.rb

@@ -1,4 +1,4 @@
-module AVM2::ABC
+module Furnace::AVM2::ABC
   class NsSetInfo < Record
     const_array_of :ns, :namespace, :plural => :ns
 

data/lib/{avm2 → furnace-avm2}/abc/metadata/option_detail.rb

@@ -1,4 +1,4 @@
-module AVM2::ABC
+module Furnace::AVM2::ABC
   class OptionDetail < Record
     vuint30    :value_idx
     uint8      :value_kind_raw

data/lib/{avm2 → furnace-avm2}/abc/metadata/option_info.rb

@@ -1,4 +1,4 @@
-module AVM2::ABC
+module Furnace::AVM2::ABC
   class OptionInfo < Record
     abc_array_of :option, :nested, :class => OptionDetail
   end

data/lib/{avm2 → furnace-avm2}/abc/metadata/record_with_traits.rb

@@ -1,4 +1,4 @@
-module AVM2::ABC
+module Furnace::AVM2::ABC
   module RecordWithTraits
     TraitInfo::XlatTable.keys.each do |trait_type|
       basename = trait_type.to_s.downcase

data/lib/{avm2 → furnace-avm2}/abc/metadata/script_info.rb

@@ -1,4 +1,4 @@
-module AVM2::ABC
+module Furnace::AVM2::ABC
   class ScriptInfo < Record
     vuint30 :init
 

data/lib/{avm2 → furnace-avm2}/abc/metadata/trait_class.rb

@@ -1,9 +1,10 @@
-module AVM2::ABC
+module Furnace::AVM2::ABC
   class TraitClass < Record
     vuint30 :slot_id
     vuint30 :classi
 
     def to_astlet(trait)
+      :class
     end
   end
 end

data/lib/{avm2 → furnace-avm2}/abc/metadata/trait_function.rb

@@ -1,9 +1,10 @@
-module AVM2::ABC
+module Furnace::AVM2::ABC
   class TraitFunction < Record
     vuint30  :slot_id
     root_ref :method
 
     def to_astlet(trait)
+      :function
     end
   end
 end

data/lib/{avm2 → furnace-avm2}/abc/metadata/trait_info.rb

@@ -1,4 +1,4 @@
-module AVM2::ABC
+module Furnace::AVM2::ABC
   class TraitInfo < Record
     XlatTable = {
       :Slot     => 0,

data/lib/{avm2 → furnace-avm2}/abc/metadata/trait_method.rb

@@ -1,4 +1,4 @@
-module AVM2::ABC
+module Furnace::AVM2::ABC
   class TraitMethod < Record
     vuint30  :disp_id
     root_ref :method

data/lib/{avm2 → furnace-avm2}/abc/metadata/trait_slot.rb

@@ -1,4 +1,4 @@
-module AVM2::ABC
+module Furnace::AVM2::ABC
   class TraitSlot < Record
     XlatTable = {
       :Int                => 0x03,

data/lib/{avm2 → furnace-avm2}/abc/opcodes/arithmetic/as3_add.rb

@@ -1,4 +1,4 @@
-module AVM2::ABC
+module Furnace::AVM2::ABC
   class AS3Add < ArithmeticOpcode
     instruction 0xa0
 

data/lib/{avm2 → furnace-avm2}/abc/opcodes/arithmetic/as3_add_i.rb

@@ -1,4 +1,4 @@
-module AVM2::ABC
+module Furnace::AVM2::ABC
   class AS3AddI < ArithmeticOpcode
     instruction 0xc5
 

data/lib/{avm2 → furnace-avm2}/abc/opcodes/arithmetic/as3_declocal.rb

@@ -1,4 +1,4 @@
-module AVM2::ABC
+module Furnace::AVM2::ABC
   class AS3DecLocal < ArithmeticOpcode
     instruction 0x94
 

data/lib/{avm2 → furnace-avm2}/abc/opcodes/arithmetic/as3_declocal_i.rb

@@ -1,4 +1,4 @@
-module AVM2::ABC
+module Furnace::AVM2::ABC
   class AS3DecLocalI < ArithmeticOpcode
     instruction 0xc3
 

data/lib/{avm2 → furnace-avm2}/abc/opcodes/arithmetic/as3_decrement.rb

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

data/lib/{avm2 → furnace-avm2}/abc/opcodes/arithmetic/as3_decrement_i.rb

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

data/lib/{avm2 → furnace-avm2}/abc/opcodes/arithmetic/as3_divide.rb

@@ -1,4 +1,4 @@
-module AVM2::ABC
+module Furnace::AVM2::ABC
   class AS3Divide < ArithmeticOpcode
     instruction 0xa3
 

data/lib/{avm2 → furnace-avm2}/abc/opcodes/arithmetic/as3_equals.rb

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

data/lib/{avm2 → furnace-avm2}/abc/opcodes/arithmetic/as3_greaterequals.rb

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

data/lib/{avm2 → furnace-avm2}/abc/opcodes/arithmetic/as3_greaterthan.rb

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

data/lib/{avm2 → furnace-avm2}/abc/opcodes/arithmetic/as3_inclocal.rb

@@ -1,4 +1,4 @@
-module AVM2::ABC
+module Furnace::AVM2::ABC
   class AS3IncLocal < ArithmeticOpcode
     instruction 0x92
 

data/lib/{avm2 → furnace-avm2}/abc/opcodes/arithmetic/as3_inclocal_i.rb

@@ -1,4 +1,4 @@
-module AVM2::ABC
+module Furnace::AVM2::ABC
   class AS3IncLocalI < ArithmeticOpcode
     instruction 0xc2
 

data/lib/{avm2 → furnace-avm2}/abc/opcodes/arithmetic/as3_increment.rb

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

data/lib/{avm2 → furnace-avm2}/abc/opcodes/arithmetic/as3_increment_i.rb

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

data/lib/{avm2 → furnace-avm2}/abc/opcodes/arithmetic/as3_lessequals.rb

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

data/lib/{avm2 → furnace-avm2}/abc/opcodes/arithmetic/as3_lessthan.rb

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