furnace 0.2.5 → 0.2.6

data/lib/furnace/ast/node.rb

@@ -1,25 +1,11 @@
 module Furnace::AST
   class Node
-    attr_accessor :type, :parent, :children, :metadata
+    attr_accessor :type, :children, :metadata
 
     def initialize(type, children=[], metadata={})
       @type, @children, @metadata = type.to_sym, children, metadata
     end
 
-    def normalize_hierarchy!
-      @children.each do |child|
-        if child.respond_to? :parent=
-          child.parent = self
-        end
-
-        if child.respond_to? :normalize_hierarchy!
-          child.normalize_hierarchy!
-        end
-      end
-
-      self
-    end
-
     def update(type, children=nil, metadata={})
       @type     = type
       @children = children || @children
@@ -52,18 +38,6 @@ module Furnace::AST
       end
     end
 
-    def index
-      parent.children.find_index(self)
-    end
-
-    def next
-      parent.children[index + 1]
-    end
-
-    def prev
-      parent.children[index - 1]
-    end
-
     def to_s
       "(#{fancy_type} ...)"
     end
@@ -71,6 +45,12 @@ module Furnace::AST
     def to_sexp(indent=0)
       str = "#{"  " * indent}(#{fancy_type}"
 
+      if @metadata[:ellipsis]
+        str << " <omitted>)"
+
+        return str
+      end
+
       children.each do |child|
         if (!children[0].is_a?(Node) && child.is_a?(Node)) ||
             (children[0].is_a?(Node) && child.is_a?(Node) &&
@@ -96,10 +76,24 @@ module Furnace::AST
 
     def fancy_type
       dasherized = @type.to_s.gsub('_', '-')
+
+      if @metadata.any?
+        metainfo = @metadata.dup
+        metainfo.delete :label
+        metainfo.delete :origin
+        metainfo.delete :ellipsis
+
+        if metainfo.any?
+          metainfo = "#{metainfo.inspect}:"
+        else
+          metainfo = nil
+        end
+      end
+
       if @metadata[:label]
-        "#{@metadata[:label]}:#{dasherized}"
+        "#{@metadata[:label]}:#{metainfo}#{dasherized}"
       else
-        dasherized
+        "#{metainfo}#{dasherized}"
       end
     end
   end

data/lib/furnace/ast/strict_visitor.rb

@@ -0,0 +1,20 @@
+module Furnace::AST
+  module StrictVisitor
+    def visit(node)
+      # Invoke a specific handler
+      on_handler = :"on_#{node.type}"
+      if respond_to? on_handler
+        new_node = send on_handler, node
+        node = new_node if new_node
+      end
+
+      node
+    end
+
+    def visit_all(nodes)
+      nodes.map do |node|
+        visit node
+      end
+    end
+  end
+end

data/lib/furnace/ast/visitor.rb

@@ -29,8 +29,6 @@ module Furnace::AST
 
       node.children.delete_if do |child|
         if child.is_a? Node
-          child.parent = node
-
           child.type == :remove
         end
       end

data/lib/furnace/ast.rb

@@ -1,8 +1,8 @@
 require "furnace"
 
 require "furnace/ast/node"
-require "furnace/ast/symbolic_node"
 require "furnace/ast/visitor"
+require "furnace/ast/strict_visitor"
 
 require "furnace/ast/matcher/special"
 require "furnace/ast/matcher/dsl"

data/lib/furnace/cfg/graph.rb

@@ -22,28 +22,32 @@ module Furnace::CFG
     end
 
     def eliminate_unreachable!
-      queue     = [entry]
+      worklist  = Set[ entry, exit ]
       reachable = Set[]
 
-      while queue.any?
-        node = queue.shift
+      while worklist.any?
+        node = worklist.first
+        worklist.delete node
         reachable.add node
 
         node.targets.each do |target|
           unless reachable.include? target
-            queue.push target
+            worklist.add target
           end
         end
 
         if node.exception
           unless reachable.include? node.exception
-            queue.push node.exception
+            worklist.add node.exception
           end
         end
       end
 
       @nodes.each do |node|
-        @nodes.delete node unless reachable.include? node
+        unless reachable.include? node
+          @nodes.delete node
+          yield node if block_given?
+        end
       end
 
       flush
@@ -59,42 +63,41 @@ module Furnace::CFG
         next if target == @exit
 
         # Skip explicitly non-redundant nodes
-        if node.cti && node.cti.metadata[:keep]
+        if node.metadata[:keep]
           next
         end
 
-        if node.targets.count == 1 &&
-            target.sources.count == 1 &&
+        if node.targets.uniq == [target] &&
+            target.sources.uniq == [node] &&
             node.exception == target.exception
 
+          yield node, target if block_given?
+
           node.insns.delete node.cti
-          @nodes.delete node
           @nodes.delete target
+          worklist.delete target
 
-          new_node = Node.new(self,
-              node.label,
-              node.insns + target.insns,
-              target.cti,
-              target.target_labels,
-              target.exception_label)
-          @nodes.add new_node
-          worklist.add new_node
+          node.insns.concat target.insns
+          node.cti           = target.cti
+          node.target_labels = target.target_labels
 
-          if @entry == node
-            @entry = new_node
-          end
+          worklist.add node
 
           flush
         elsif node.targets.count == 1 &&
             node.insns.empty?
+
           target = node.targets.first
 
+          yield target, node if block_given?
+
           node.sources.each do |source|
             index = source.targets.index(node)
             source.target_labels[index] = target.label
           end
 
           @nodes.delete node
+          worklist.delete node
 
           if @entry == node
             @entry = target
@@ -231,6 +234,9 @@ module Furnace::CFG
     def flush
       @source_map = nil
       @label_map.clear
+
+      @dominators = nil
+      @postdominators = nil
     end
 
     def to_graphviz
@@ -239,7 +245,15 @@ module Furnace::CFG
           if node.label == nil
             contents = "<exit>"
           else
-            contents = "<#{node.label.inspect}>\n#{node.insns.map(&:inspect).join("\n")}"
+            contents = "<#{node.label.inspect}>"
+          end
+
+          if node.metadata.any?
+            contents << "\n#{node.metadata.inspect}"
+          end
+
+          if node.insns.any?
+            contents << "\n#{node.insns.map(&:inspect).join("\n")}"
           end
 
           options = {}
@@ -256,7 +270,7 @@ module Furnace::CFG
           end
 
           if node.exception_label
-            graph.edge node.label, node.exception_label, "Exc", color: 'orange'
+            graph.edge node.label, node.exception_label, "", color: 'orange'
           end
         end
       end

data/lib/furnace/cfg/node.rb

@@ -5,14 +5,18 @@ module Furnace::CFG
     attr_accessor :target_labels, :exception_label
     attr_accessor :instructions, :control_transfer_instruction
 
+    attr_accessor :metadata
+
     alias :insns  :instructions
     alias :insns= :instructions=
     alias :cti    :control_transfer_instruction
     alias :cti=   :control_transfer_instruction=
 
     def initialize(cfg, label=nil, insns=[], cti=nil,
-            target_labels=[], exception_label=nil)
+            target_labels=[], exception_label=nil,
+            metadata={})
       @cfg, @label  = cfg, label
+      @metadata = metadata
 
       @instructions = insns
       @control_transfer_instruction = cti
@@ -64,10 +68,10 @@ module Furnace::CFG
         "<#{@label}:#{@instructions.join ", "}>"
       elsif @label
         "<#{@label}>"
-      elsif @insns
-        "<!unlabeled>"
+      elsif @instructions
+        "<!unlabeled:#{@instructions.join ", "}>"
       else
-        "<!exit>"
+        "<!exit#{metadata}>"
       end
     end
   end

data/lib/furnace/graphviz.rb

@@ -29,14 +29,14 @@ class Furnace::Graphviz
       label: label
     })
 
-    @code << %Q{#{name.inspect} #{graphviz_options(options)};\n}
+    @code << %Q{"#{name.inspect}" #{graphviz_options(options)};\n}
   end
 
   def edge(from, to, label="", options={})
     options = options.merge({
       label: label.inspect
     })
-    @code << %Q{#{from.inspect} -> #{to.inspect} #{graphviz_options(options)};\n}
+    @code << %Q{"#{from.inspect}" -> "#{to.inspect}" #{graphviz_options(options)};\n}
   end
 
   def to_s

data/lib/furnace/transform/iterative_process.rb

@@ -0,0 +1,26 @@
+module Furnace
+  module Transform
+    class IterativeProcess
+      def initialize(stages)
+        @stages = stages
+      end
+
+      def transform(*sequence)
+        loop do
+          changed = false
+
+          @stages.each do |stage|
+            return sequence if stage.nil?
+
+            if new_sequence = stage.transform(*sequence)
+              changed = true
+              sequence = new_sequence
+            end
+          end
+
+          return sequence unless changed
+        end
+      end
+    end
+  end
+end

data/lib/furnace/transform/pipeline.rb

@@ -7,6 +7,8 @@ module Furnace
 
       def run(*sequence)
         @stages.each do |stage|
+          break if stage.nil?
+
           sequence = stage.transform *sequence
         end
 

data/lib/furnace/version.rb

@@ -1,3 +1,3 @@
 module Furnace
-  VERSION = "0.2.5"
+  VERSION = "0.2.6"
 end

data/lib/furnace.rb

@@ -8,5 +8,6 @@ require "furnace/cfg"
 require "furnace/code"
 
 require "furnace/transform/pipeline"
+require "furnace/transform/iterative_process"
 
 require "furnace/graphviz"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: furnace
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-04 00:00:00.000000000 Z
+date: 2012-09-30 00:00:00.000000000 Z
 dependencies: []
 description: Furnace is a static code analysis framework for dynamic languages, aimed
   at efficient type and behavior inference.
@@ -30,7 +30,7 @@ files:
 - lib/furnace/ast/matcher/dsl.rb
 - lib/furnace/ast/matcher/special.rb
 - lib/furnace/ast/node.rb
-- lib/furnace/ast/symbolic_node.rb
+- lib/furnace/ast/strict_visitor.rb
 - lib/furnace/ast/visitor.rb
 - lib/furnace/cfg.rb
 - lib/furnace/cfg/graph.rb
@@ -43,6 +43,7 @@ files:
 - lib/furnace/code/terminal_token.rb
 - lib/furnace/code/token.rb
 - lib/furnace/graphviz.rb
+- lib/furnace/transform/iterative_process.rb
 - lib/furnace/transform/pipeline.rb
 - lib/furnace/version.rb
 homepage: http://github.com/whitequark/furnace
@@ -70,3 +71,4 @@ signing_key:
 specification_version: 3
 summary: A static code analysis framework
 test_files: []
+has_rdoc: 

data/lib/furnace/ast/symbolic_node.rb

@@ -1,34 +0,0 @@
-module Furnace::AST
-  class SymbolicNode
-    def initialize(name)
-      @name = name.to_sym
-    end
-
-    def to_sym
-      @name
-    end
-
-    def ===(name)
-      @name == name.to_sym
-    end
-
-    def inspect
-      @name.to_s
-    end
-  end
-
-  class MethodName < SymbolicNode
-    def inspect
-      ".#{@name}"
-    end
-  end
-
-  class LocalVariable < SymbolicNode
-    def inspect
-      "%#{@name}"
-    end
-  end
-
-  class Constant < SymbolicNode
-  end
-end