furnace-avm2 0.0.9 → 0.9.0

data/lib/furnace-avm2/source/implementation_tokens/return_token.rb

@@ -0,0 +1,16 @@
+module Furnace::AVM2::Tokens
+  class ReturnToken < Furnace::Code::SurroundedToken
+
+    def text_before
+      if @children.any?
+        "return "
+      else
+        "return"
+      end
+    end
+
+    def text_after
+      ";\n"
+    end
+  end
+end

data/lib/furnace-avm2/source/implementation_tokens/rtname_token.rb

@@ -0,0 +1,9 @@
+module Furnace::AVM2::Tokens
+  class RTNameToken < Furnace::Code::SeparatedToken
+    include IsSimple
+
+    def text_between
+      "::"
+    end
+  end
+end

data/lib/furnace-avm2/source/implementation_tokens/statement_token.rb

@@ -0,0 +1,8 @@
+module Furnace::AVM2::Tokens
+  class StatementToken < Furnace::Code::SurroundedToken
+
+    def text_after
+      ";\n"
+    end
+  end
+end

data/lib/furnace-avm2/source/implementation_tokens/super_token.rb

@@ -0,0 +1,9 @@
+module Furnace::AVM2::Tokens
+  class SuperToken < Furnace::Code::TerminalToken
+    include IsSimple
+
+    def to_text
+      "super"
+    end
+  end
+end

data/lib/furnace-avm2/source/implementation_tokens/switch_token.rb

@@ -0,0 +1,9 @@
+require_relative 'control_flow_token'
+
+module Furnace::AVM2::Tokens
+  class SwitchToken < ControlFlowToken
+    def keyword
+      'switch'
+    end
+  end
+end

data/lib/furnace-avm2/source/implementation_tokens/ternary_operator_token.rb

@@ -0,0 +1,13 @@
+module Furnace::AVM2::Tokens
+  class TernaryOperatorToken < Furnace::Code::NonterminalToken
+    include IsComplex
+
+    def to_text
+      "#{@children[0].to_text} ? #{@children[1].to_text} : #{@children[2].to_text}"
+    end
+
+    def to_structure
+      structurize "... ? ... : ..."
+    end
+  end
+end

data/lib/furnace-avm2/source/implementation_tokens/throw_token.rb

@@ -0,0 +1,12 @@
+module Furnace::AVM2::Tokens
+  class ThrowToken < Furnace::Code::SurroundedToken
+
+    def text_before
+      "throw "
+    end
+
+    def text_after
+      ";\n"
+    end
+  end
+end

data/lib/furnace-avm2/source/implementation_tokens/typeof_token.rb

@@ -0,0 +1,13 @@
+module Furnace::AVM2::Tokens
+  class TypeOfToken < Furnace::Code::SurroundedToken
+    include IsSimple
+
+    def text_before
+      "typeof("
+    end
+
+    def text_after
+      ")"
+    end
+  end
+end

data/lib/furnace-avm2/source/implementation_tokens/unary_operator_token.rb

@@ -0,0 +1,14 @@
+module Furnace::AVM2::Tokens
+  class UnaryOperatorToken < Furnace::Code::SurroundedToken
+    include IsSimple
+
+    def initialize(origin, children, operator, options={})
+      super(origin, children, options)
+      @operator = operator
+    end
+
+    def text_before
+      @operator.to_s
+    end
+  end
+end

data/lib/furnace-avm2/source/implementation_tokens/unary_post_operator_token.rb

@@ -0,0 +1,14 @@
+module Furnace::AVM2::Tokens
+  class UnaryPostOperatorToken < Furnace::Code::SurroundedToken
+    include IsSimple
+
+    def initialize(origin, children, operator, options={})
+      super(origin, children, options)
+      @operator = operator
+    end
+
+    def text_after
+      @operator.to_s
+    end
+  end
+end

data/lib/furnace-avm2/source/implementation_tokens/variable_name_token.rb

@@ -0,0 +1,14 @@
+module Furnace::AVM2::Tokens
+  class VariableNameToken < Furnace::Code::TerminalToken
+    include IsSimple
+
+    def initialize(origin, name, options={})
+      super(origin, options)
+      @name = name
+    end
+
+    def to_text
+      @name
+    end
+  end
+end

data/lib/furnace-avm2/source/implementation_tokens/while_token.rb

@@ -0,0 +1,9 @@
+require_relative 'control_flow_token'
+
+module Furnace::AVM2::Tokens
+  class WhileToken < ControlFlowToken
+    def keyword
+      'while'
+    end
+  end
+end

data/lib/furnace-avm2/transform.rb

@@ -1,6 +1,10 @@
 module Furnace::AVM2::Transform
   AST = Furnace::AST
+  CFG = Furnace::CFG
 end
 
 require_relative "transform/ast_build"
-require_relative "transform/ast_normalize"
+require_relative "transform/ast_normalize"
+require_relative "transform/cfg_build"
+require_relative "transform/cfg_reduce"
+require_relative "transform/nf_normalize"

data/lib/furnace-avm2/transform/ast_build.rb

@@ -1,5 +1,7 @@
 module Furnace::AVM2
   module Transform
+    # I'm not exactly proud of this code, but it works... for now. I really should
+    # rework it if I want to expect it to work good.
     class ASTBuild
       CONDITIONAL_OPERATORS = [ :if_eq,  :if_false, :if_true,      :if_ge,        :if_gt,
                                 :if_le,  :if_lt,    :if_ne,        :if_nge,       :if_ngt,
@@ -63,20 +65,33 @@ module Furnace::AVM2
           produce.(expr)
         end
 
-        finalize_complex_expr = lambda do |opcode, worklist, valid_types, expected_depth=nil|
+        finalize_complex_expr = lambda do |opcode, worklist, valid_types, expected_depth=nil, wrap_to=nil|
           while worklist.last == opcode.offset
             extend_complex_expr.(valid_types, expected_depth)
+
+            if wrap_to
+              node, *prepend = *wrap_to
+
+              expr, = consume.(1)
+              expr = AST::Node.new(node, [*prepend, expr])
+              produce.(expr)
+            end
+
             worklist.pop
           end
         end
 
         expand_conditionals = lambda do
+          expressions = []
+
           while stack.any? && CONDITIONAL_OPERATORS.include?(stack.last.type)
             conditional, = consume.(1)
 
             jump_node = AST::Node.new(:jump_if, [ true, conditional.metadata[:offset], conditional ])
-            emit.(jump_node)
+            expressions.unshift jump_node
           end
+
+          ast.children.concat expressions
         end
 
         code.each do |opcode|
@@ -88,7 +103,7 @@ module Furnace::AVM2
           end
 
           finalize_complex_expr.(opcode, shortjump, [ :and, :or ], 1)
-          finalize_complex_expr.(opcode, ternary, CONDITIONAL_OPERATORS)
+          finalize_complex_expr.(opcode, ternary, CONDITIONAL_OPERATORS, nil, [:ternary_if, false])
 
           if dup == 1 && (opcode.is_a?(ABC::AS3CoerceB) ||
                   opcode.is_a?(ABC::AS3IfTrue) || opcode.is_a?(ABC::AS3IfFalse))
@@ -134,7 +149,7 @@ module Furnace::AVM2
             end
           elsif opcode.is_a?(ABC::AS3Jump)
             if opcode.body.jump_offset == 0
-              node = AST::Node.new(:jump_target, [], label: opcode.offset)
+              node = AST::Node.new(:nop, [], label: opcode.offset)
               emit.(node)
             elsif stack.any? && !CONDITIONAL_OPERATORS.include?(stack.last.type)
               extend_complex_expr.(CONDITIONAL_OPERATORS)
@@ -157,11 +172,11 @@ module Furnace::AVM2
             if dup
               spurious += 1
 
-              save_node = AST::Node.new(:set_spurious, [ spurious, *consume.(1) ])
+              save_node = AST::Node.new(:set_local, [ -spurious, *consume.(1) ])
               emit.(save_node)
 
               (1 + dup).times do
-                load_node = AST::Node.new(:get_spurious, [ spurious ])
+                load_node = AST::Node.new(:get_local, [ -spurious ])
                 produce.(load_node)
               end
 
@@ -198,7 +213,7 @@ module Furnace::AVM2
           end
         end
 
-        [ ast.normalize_hierarchy!, method ]
+        ast.normalize_hierarchy!
       end
     end
   end

data/lib/furnace-avm2/transform/ast_normalize.rb

@@ -3,10 +3,10 @@ module Furnace::AVM2
     class ASTNormalize
       include AST::Visitor
 
-      def transform(ast, method)
+      def transform(ast)
         visit ast
 
-        [ ast, method ]
+        ast
       end
 
       # (pop x) -> (jump-target) x
@@ -15,7 +15,7 @@ module Furnace::AVM2
 
         node.update(:expand, [
           child,
-          AST::Node.new(:jump_target, [], node.metadata)
+          AST::Node.new(:nop, [], node.metadata)
         ], nil)
       end
 
@@ -31,32 +31,73 @@ module Furnace::AVM2
 
       # (if-* a b) -> (*' a b)
       IF_MAPPING = {
-        :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],
+        :eq        => [false, :==],
+        :ne        => [false, :!=],
+        :ge        => [false, :>=],
+        :nge       => [true,  :>=],
+        :gt        => [false, :>],
+        :ngt       => [true,  :>],
+        :le        => [false, :<=],
+        :nle       => [true,  :<=],
+        :lt        => [false, :<],
+        :nlt       => [true,  :<],
+        :strict_eq => [false, :===],
+        :strict_ne => [false, :"!=="],
+        :true      => [false, :expand],
+        :false     => [true,  :expand]
       }
       IF_MAPPING.each do |cond, (reverse, comp)|
         define_method :"on_if_#{cond}" do |node|
           node.update(comp)
           node.parent.children[0] = !node.parent.children[0] if reverse
+
+          if node.parent.type == :ternary_if && comp == :expand
+            node.parent.update(:ternary_if_boolean)
+          end
+        end
+      end
+
+      # (ternary-if * (op a b x y)) -> (ternary-if-boolean * (op a b) x y)
+      def on_ternary_if(node)
+        comparsion, op = node.children
+        node.children.concat op.children.slice!(2..-1)
+
+        on_ternary_if_boolean(node)
+      end
+
+      # (ternary-if-boolean true  (op a b) x y) -> (ternary (op a b) x y)
+      # (ternary-if-boolean false (op a b) x y) -> (ternary (op a b) y x)
+      def on_ternary_if_boolean(node)
+        comparsion, condition, if_true, if_false = node.children
+        if comparsion
+          node.update(:ternary, [ condition, if_true, if_false ])
+        else
+          node.update(:ternary, [ condition, if_false, if_true ])
+        end
+      end
+
+      # (&& (coerce-b ...) (coerce-b ...)) -> (&& ... ...)
+      def fix_boolean(node)
+        node.children.map! do |child|
+          if child.is_a?(AST::Node) &&
+                child.type == :coerce_b
+            child.children.first
+          else
+            child
+          end
         end
       end
+      alias :on_and     :fix_boolean
+      alias :on_or      :fix_boolean
+      alias :on_jump_if :fix_boolean
 
-      # TEMPORARY: (jump-target) -> x
-      def on_jump_target(node)
-        node.update(:remove)
+      def replace_with_nop(node)
+        node.update(:nop)
       end
+      alias :on_label       :replace_with_nop
+      alias :on_debug       :replace_with_nop
+      alias :on_debug_file  :replace_with_nop
+      alias :on_debug_line  :replace_with_nop
     end
   end
 end

data/lib/furnace-avm2/transform/cfg_build.rb

@@ -0,0 +1,86 @@
+module Furnace::AVM2
+  module Transform
+    class CFGBuild
+      include AST::Visitor
+
+      def transform(ast)
+        @ast = ast
+        visit @ast
+
+        @cfg = CFG::Graph.new
+
+        @pending_label = nil
+        @pending_queue = []
+
+        @jumps = []
+
+        @ast.children.each_with_index do |node, index|
+          @pending_label ||= node.metadata[:label]
+          @pending_queue << node if ![:nop, :jump].include? node.type
+
+          next_node  = @ast.children[index + 1]
+          next_label = next_node.metadata[:label] if next_node
+
+          case node.type
+          when :return_value, :return_void
+            cutoff(nil, [nil])
+
+          when :jump
+            @jumps << node.children[0]
+            cutoff(nil, [node.children.delete_at(0)])
+
+          when :jump_if
+            @jumps << node.children[1]
+            cutoff(node, [node.children.delete_at(1), next_label])
+
+          else
+            if @jumps.include? next_label
+              cutoff(nil, [next_label])
+            end
+          end
+        end
+
+        exit_node = CFG::Node.new(@cfg)
+        @cfg.nodes.add exit_node
+        @cfg.exit = exit_node
+
+        @cfg.eliminate_unreachable!
+        @cfg.merge_redundant!
+
+        @cfg
+      end
+
+      # propagate labels
+      def on_any(node)
+        return if node == @ast
+
+        label = nil
+
+        node.children.each do |child|
+          if child.is_a?(AST::Node) && child.metadata[:label]
+            if label.nil? || child.metadata[:label] < label
+              label = child.metadata[:label]
+            end
+
+            child.metadata.delete :label
+          end
+        end
+
+        node.metadata[:label] = label if label
+      end
+
+      def cutoff(cti, targets)
+        node = CFG::Node.new(@cfg, @pending_label, @pending_queue, cti, targets)
+
+        if @cfg.nodes.empty?
+          @cfg.entry = node
+        end
+
+        @cfg.nodes.add node
+
+        @pending_label = nil
+        @pending_queue = []
+      end
+    end
+  end
+end