furnace 0.2.6 → 0.3.0.beta1

data/lib/furnace/ast/node.rb

@@ -1,36 +1,33 @@
 module Furnace::AST
   class Node
-    attr_accessor :type, :children, :metadata
+    attr_reader :type, :children
 
-    def initialize(type, children=[], metadata={})
-      @type, @children, @metadata = type.to_sym, children, metadata
+    def initialize(type, children=[], properties={})
+      @type, @children = type.to_sym, children.to_a
+      properties.each do |name, value|
+        instance_variable_set :"@#{name}", value
+      end
+      freeze
     end
 
-    def update(type, children=nil, metadata={})
-      @type     = type
-      @children = children || @children
+    def update(type=nil, children=nil, properties={})
+      new_type     = type     || @type
+      new_children = children || @children
 
-      # If something non-nil is passed, including default value, then merge.
-      # Else, clear metadata store.
-      if metadata
-        @metadata.merge!(metadata)
+      if @type == new_type &&
+          @children == new_children &&
+          properties.empty?
+        self
       else
-        @metadata = {}
+        dup.send :initialize, new_type, new_children, properties
       end
-
-      self
-    end
-
-    def dup
-      node = super
-      node.children = @children.dup
-      node.metadata = @metadata.dup
-      node
     end
 
     def ==(other)
-      if other.respond_to? :to_astlet
-        other = other.to_astlet
+      if equal?(other)
+        true
+      elsif other.respond_to? :to_ast
+        other = other.to_ast
         other.type == self.type &&
           other.children == self.children
       else
@@ -45,17 +42,10 @@ 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) &&
-              child.children.any? { |c| c.is_a?(Node) || c.is_a?(Array) }) ||
-            (child.is_a?(Node) && child.metadata[:label])
+              child.children.any? { |c| c.is_a?(Node) || c.is_a?(Array) })
           str << "\n#{child.to_sexp(indent + 1)}"
         else
           str << " #{child.inspect}"
@@ -68,33 +58,14 @@ module Furnace::AST
     end
     alias :inspect :to_sexp
 
-    def to_astlet
+    def to_ast
       self
     end
 
     protected
 
     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]}:#{metainfo}#{dasherized}"
-      else
-        "#{metainfo}#{dasherized}"
-      end
+      @type.to_s.gsub('_', '-')
     end
   end
 end

data/lib/furnace/ast/strict_visitor.rb

@@ -1,10 +1,15 @@
 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
+      if node
+        # Invoke a specific handler
+        on_handler = :"on_#{node.type}"
+        if respond_to? on_handler
+          new_node = send on_handler, node
+        else
+          new_node = handler_missing(node)
+        end
+
         node = new_node if new_node
       end
 
@@ -16,5 +21,8 @@ module Furnace::AST
         visit node
       end
     end
+
+    def handler_missing(node)
+    end
   end
 end

data/lib/furnace/cfg/graph.rb

@@ -128,6 +128,8 @@ module Furnace::CFG
           # Are we computing dominators or postdominators?
           if forward
             edges = node.sources + node.exception_sources
+          elsif node.exception.nil?
+            edges = node.targets
           else
             edges = node.targets + [ node.exception ]
           end

data/lib/furnace/version.rb

@@ -1,3 +1,3 @@
 module Furnace
-  VERSION = "0.2.6"
+  VERSION = "0.3.0.beta1"
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: furnace
 version: !ruby/object:Gem::Version
-  version: 0.2.6
-  prerelease: 
+  version: 0.3.0.beta1
+  prerelease: 6
 platform: ruby
 authors:
 - Peter Zotov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-30 00:00:00.000000000 Z
+date: 2012-10-31 00:00:00.000000000 Z
 dependencies: []
 description: Furnace is a static code analysis framework for dynamic languages, aimed
   at efficient type and behavior inference.
@@ -61,14 +61,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A static code analysis framework
 test_files: []
-has_rdoc: