furnace 0.0.1 → 0.0.2

data/lib/furnace/ast/matcher.rb

@@ -0,0 +1,116 @@
+module Furnace::AST
+  class Matcher
+    SpecialAny    = MatcherSpecial.new(:any)
+    SpecialSubset = MatcherSpecial.define(:subset)
+
+    def initialize(&block)
+      @pattern = self.class.class_exec(&block)
+    end
+
+    def match(object)
+      genmatch(object.to_astlet, @pattern)
+    end
+
+    def find_one(collection)
+      collection.find do |elem|
+        result = match elem
+        yield elem, result if block_given? && result
+        result
+      end
+    end
+
+    def find_all(collection)
+      collection.select do |elem|
+        result = match elem
+        yield elem, result if block_given? && result
+        result
+      end
+    end
+
+    class << self
+      def any
+        SpecialAny
+      end
+
+      def subset
+        SpecialSubset
+      end
+
+      def capture(name)
+        MatcherSpecial.new(:capture, name)
+      end
+    end
+
+    protected
+
+    def submatch(array, pattern)
+      matches = true
+
+      pattern.each_with_index do |subpattern, index|
+        if array[index].nil?
+          return false
+        end
+
+        case subpattern
+        when SpecialAny
+          # it matches
+        when MatcherSpecial
+          if subpattern.type == :subset
+            all_submatches = true
+
+            subpattern.params.each do |pattern_case|
+              submatches = false
+              array[index..-1].each do |subset_elem|
+                submatches ||= genmatch(subset_elem, pattern_case)
+                break if submatches
+              end
+
+              all_submatches &&= submatches
+              break unless all_submatches
+            end
+
+            matches &&= all_submatches
+          end
+        when Array
+          matches &&= genmatch(array[index], subpattern)
+        else
+          matches &&= array[index] == subpattern
+        end
+
+        break unless matches
+      end
+
+      matches
+    end
+
+    def genmatch(astlet, pattern)
+#       if astlet.respond_to? :to_sexp
+#         puts "match #{astlet.to_sexp} of #{pattern}"
+#       else
+#         puts "match #{astlet} of #{pattern}"
+#       end
+
+      if pattern.first.is_a?(Symbol)
+        # Match an astlet
+        type, *rest = pattern
+
+        if astlet.is_a? Node
+          if astlet.type == type
+            submatch(astlet.children, rest)
+          else
+            false
+          end
+        else
+          false
+        end
+      else
+        # Match an array
+        if astlet.is_a? Array
+          submatch(astlet, pattern)
+        else
+          false
+        end
+      end
+    end
+  end
+end

data/lib/furnace/ast/matcher_special.rb

@@ -0,0 +1,13 @@
+module Furnace::AST
+  class MatcherSpecial
+    attr_reader :type, :params
+
+    def initialize(type, params=nil)
+      @type, @params = type, params
+    end
+
+    def self.define(type)
+      lambda { |*args| new(type, args) }
+    end
+  end
+end

data/lib/furnace/ast/node.rb

@@ -1,70 +1,96 @@
-module Furnace
-  module AST
-    class Node
-      attr_accessor :type, :parent, :children, :metadata
+module Furnace::AST
+  class Node
+    attr_accessor :type, :parent, :children, :metadata
 
-      def initialize(type, children=[], metadata={})
-        @type, @children, @metadata = type.to_sym, children, metadata
-      end
-
-      def update(type, children=nil, metadata={})
-        @type     = type
-        @children = children || @children
+    def initialize(type, children=[], metadata={})
+      @type, @children, @metadata = type.to_sym, children, metadata
+    end
 
-        # If something non-nil is passed, including default value, then merge.
-        # Else, clear metadata store.
-        if metadata
-          @metadata.merge!(metadata)
-        else
-          @metadata = {}
+    def normalize_hierarchy!
+      @children.each do |child|
+        if child.respond_to? :parent=
+          child.parent = self
         end
 
-        self
+        if child.respond_to? :normalize_hierarchy!
+          child.normalize_hierarchy!
+        end
       end
 
-      def index
-        parent.children.find_index(self)
-      end
+      self
+    end
 
-      def next
-        parent.children[index + 1]
-      end
+    def update(type, children=nil, metadata={})
+      @type     = type
+      @children = children || @children
 
-      def prev
-        parent.children[index - 1]
+      # If something non-nil is passed, including default value, then merge.
+      # Else, clear metadata store.
+      if metadata
+        @metadata.merge!(metadata)
+      else
+        @metadata = {}
       end
 
-      def to_s
-        "(#{fancy_type} ...)"
-      end
+      self
+    end
 
-      def to_sexp(indent=0)
-        str = "#{"  " * indent}(#{fancy_type}"
+    def dup
+      node = super
+      node.children = @children.dup
+      node.metadata = @metadata.dup
+      node
+    end
 
-        children.each do |child|
-          if child.is_a? Node
-            str << "\n#{child.to_sexp(indent + 1)}"
-          else
-            str << " #{child.inspect}"
-          end
-        end
+    def index
+      parent.children.find_index(self)
+    end
 
-        str << ")"
+    def next
+      parent.children[index + 1]
+    end
 
-        str
-      end
-      alias :inspect :to_sexp
+    def prev
+      parent.children[index - 1]
+    end
 
-      protected
+    def to_s
+      "(#{fancy_type} ...)"
+    end
 
-      def fancy_type
-        dasherized = @type.to_s.gsub('_', '-')
-        if @metadata[:label]
-          "#{@metadata[:label]}:#{dasherized}"
+    def to_sexp(indent=0)
+      str = "#{"  " * indent}(#{fancy_type}"
+
+      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])
+          str << "\n#{child.to_sexp(indent + 1)}"
         else
-          dasherized
+          str << " #{child.inspect}"
         end
       end
+
+      str << ")"
+
+      str
+    end
+    alias :inspect :to_sexp
+
+    def to_astlet
+      self
+    end
+
+    protected
+
+    def fancy_type
+      dasherized = @type.to_s.gsub('_', '-')
+      if @metadata[:label]
+        "#{@metadata[:label]}:#{dasherized}"
+      else
+        dasherized
+      end
     end
   end
 end

data/lib/furnace/ast/symbolic_node.rb

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

data/lib/furnace/ast/visitor.rb

@@ -1,42 +1,40 @@
-module Furnace
-  module AST
-    module Visitor
-      def visit(node)
-        node.children.map! do |child|
-          if child.is_a? Node
-            visit child
-
-            if child.type == :expand
-              child = child.children
-            end
+module Furnace::AST
+  module Visitor
+    def visit(node)
+      node.children.map! do |child|
+        if child.is_a? Node
+          visit child
+
+          if child.type == :expand
+            child = child.children
           end
-
-          child
         end
 
-        node.children.flatten!
+        child
+      end
 
-        node.children.delete_if do |child|
-          if child.is_a? Node
-            child.parent = node
+      node.children.flatten!
 
-            child.type == :remove
-          end
-        end
+      node.children.delete_if do |child|
+        if child.is_a? Node
+          child.parent = node
 
-        # Invoke a specific handler
-        on_handler = :"on_#{node.type}"
-        if respond_to? on_handler
-          send on_handler, node
+          child.type == :remove
         end
+      end
 
-        # Invoke a generic handler
-        if respond_to? :on_any
-          send :on_any, node
-        end
+      # Invoke a specific handler
+      on_handler = :"on_#{node.type}"
+      if respond_to? on_handler
+        send on_handler, node
+      end
 
-        node
+      # Invoke a generic handler
+      if respond_to? :on_any
+        send :on_any, node
       end
+
+      node
     end
   end
 end

data/lib/furnace/ast.rb

@@ -0,0 +1,6 @@
+require "furnace/ast/node"
+require "furnace/ast/symbolic_node"
+require "furnace/ast/visitor"
+
+require "furnace/ast/matcher_special"
+require "furnace/ast/matcher"

data/lib/furnace/cfg/edge.rb

@@ -1,36 +1,34 @@
-module Furnace
-  module CFG
-    class Edge
-      attr_accessor :source_operation, :source_label, :target_label
+module Furnace::CFG
+  class Edge
+    attr_accessor :source_operation, :source_label, :target_label
 
-      def initialize(cfg, source_operation, source_label, target_label)
-        @cfg, @source_operation, @source_label, @target_label =
-            cfg, source_operation, source_label, target_label
-      end
+    def initialize(cfg, source_operation, source_label, target_label)
+      @cfg, @source_operation, @source_label, @target_label =
+          cfg, source_operation, source_label, target_label
+    end
 
-      def source
-        @cfg.find_node(@source_label)
-      end
+    def source
+      @cfg.find_node(@source_label)
+    end
 
-      def target
-        @cfg.find_node(@target_label) if @target_label
-      end
+    def target
+      @cfg.find_node(@target_label) if @target_label
+    end
 
-      def source=(node)
-        @source_label = node.label
-      end
+    def source=(node)
+      @source_label = node.label
+    end
 
-      def target=(node)
-        if node
-          @target_label = node.label
-        else
-          @target_label = nil
-        end
+    def target=(node)
+      if node
+        @target_label = node.label
+      else
+        @target_label = nil
       end
+    end
 
-      def inspect
-        "<#{@source_label.inspect} -> #{@target_label.inspect}>"
-      end
+    def inspect
+      "<#{@source_label.inspect} -> #{@target_label.inspect}>"
     end
   end
 end

data/lib/furnace/cfg/graph.rb

@@ -1,57 +1,55 @@
-module Furnace
-  module CFG
-    class Graph
-      attr_reader :nodes, :edges
+module Furnace::CFG
+  class Graph
+    attr_reader :nodes, :edges
 
-      def initialize
-        @nodes = Set.new
-        @edges = Set.new
+    def initialize
+      @nodes = Set.new
+      @edges = Set.new
 
-        @pending_label      = nil
-        @pending_operations = []
-      end
-
-      def find_node(label)
-        if node = @nodes.find { |n| n.label == label }
-          node
-        else
-          raise "Cannot find CFG node #{label}"
-        end
-      end
+      @pending_label      = nil
+      @pending_operations = []
+    end
 
-      def expand(label, operation)
-        @pending_label ||= label
-        @pending_operations << operation
+    def find_node(label)
+      if node = @nodes.find { |n| n.label == label }
+        node
+      else
+        raise "Cannot find CFG node #{label}"
       end
+    end
 
-      def transfer(targets)
-        return unless @pending_label
+    def expand(label, operation)
+      @pending_label ||= label
+      @pending_operations << operation
+    end
 
-        @nodes << CFG::Node.new(self, @pending_label, @pending_operations)
+    def transfer(targets)
+      return unless @pending_label
 
-        targets.each do |operation, target|
-          @edges << CFG::Edge.new(self, operation, @pending_label, target)
-        end
+      @nodes << Node.new(self, @pending_label, @pending_operations)
 
-        @pending_label      = nil
-        @pending_operations = []
+      targets.each do |operation, target|
+        @edges << Edge.new(self, operation, @pending_label, target)
       end
 
-      def to_graphviz
-        Graphviz.new do |graph|
-          @nodes.each do |node|
-            graph.node node.label, node.operations.map(&:inspect).join("\n")
-          end
+      @pending_label      = nil
+      @pending_operations = []
+    end
 
-          @edges.each do |edge|
-            if edge.source_operation.nil?
-              label = "~"
-            else
-              label = edge.source_operation
-            end
+    def to_graphviz
+      Furnace::Graphviz.new do |graph|
+        @nodes.each do |node|
+          graph.node node.label, node.operations.map(&:inspect).join("\n")
+        end
 
-            graph.edge edge.source_label, edge.target_label, label
+        @edges.each do |edge|
+          if edge.source_operation.nil?
+            label = "~"
+          else
+            label = edge.source_operation
           end
+
+          graph.edge edge.source_label, edge.target_label, label
         end
       end
     end

data/lib/furnace/cfg/node.rb

@@ -1,38 +1,36 @@
-module Furnace
-  module CFG
-    class Node
-      attr_reader :label, :operations
+module Furnace::CFG
+  class Node
+    attr_reader :label, :operations
 
-      def initialize(cfg, label, operations)
-        @cfg, @label, @operations = cfg, label, operations
-      end
+    def initialize(cfg, label, operations)
+      @cfg, @label, @operations = cfg, label, operations
+    end
 
-      def entering_edges
-        @cfg.edges.select { |e| e.target == self }
-      end
+    def entering_edges
+      @cfg.edges.select { |e| e.target == self }
+    end
 
-      def leaving_edges
-        @cfg.edges.select { |e| e.source == self }
-      end
+    def leaving_edges
+      @cfg.edges.select { |e| e.source == self }
+    end
 
-      def leaving_edge(source)
-        leaving_edges.find { |e| e.source_operation == source }
-      end
+    def leaving_edge(source)
+      leaving_edges.find { |e| e.source_operation == source }
+    end
 
-      def default_leaving_edge
-        leaving_edge(nil)
-      end
+    def default_leaving_edge
+      leaving_edge(nil)
+    end
 
-      def ==(other)
-        self.label == other.label
-      end
+    def ==(other)
+      self.label == other.label
+    end
 
-      def inspect
-        if @label
-          "<#{@label}:#{@operations.map(&:inspect).join ", "}>"
-        else
-          "<!exit>"
-        end
+    def inspect
+      if @label
+        "<#{@label}:#{@operations.map(&:inspect).join ", "}>"
+      else
+        "<!exit>"
       end
     end
   end

data/lib/furnace/cfg.rb

@@ -0,0 +1,5 @@
+require "set"
+
+require "furnace/cfg/edge"
+require "furnace/cfg/graph"
+require "furnace/cfg/node"

data/lib/furnace/transform/pipeline.rb

@@ -1,7 +1,7 @@
 module Furnace
   module Transform
     class Pipeline
-      def initialize(*stages)
+      def initialize(stages)
         @stages = stages
       end
 

data/lib/furnace/transform.rb

@@ -0,0 +1,14 @@
+module Furnace::Transform
+end
+
+require "furnace/transform/pipeline"
+
+require "furnace/transform/rubinius/ast_build"
+require "furnace/transform/rubinius/ast_normalize"
+
+require "furnace/transform/generic/label_normalize"
+require "furnace/transform/generic/cfg_build"
+require "furnace/transform/generic/cfg_normalize"
+require "furnace/transform/generic/anf_build"
+
+require "furnace/transform/optimizing/fold_constants"

data/lib/furnace/version.rb

@@ -1,3 +1,3 @@
 module Furnace
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/furnace.rb

@@ -1,14 +1,7 @@
 require "furnace/version"
 
-require "set"
-
-require "furnace/ast/node"
-require "furnace/ast/symbolic_node"
-require "furnace/ast/visitor"
-
-require "furnace/cfg/node"
-require "furnace/cfg/edge"
-require "furnace/cfg/graph"
+require "furnace/ast"
+require "furnace/cfg"
 
 require "furnace/anf/node"
 require "furnace/anf/edge"
@@ -18,17 +11,7 @@ require "furnace/anf/if_node"
 require "furnace/anf/return_node"
 require "furnace/anf/graph"
 
-require "furnace/transform/pipeline"
-
-require "furnace/transform/rubinius/ast_build"
-require "furnace/transform/rubinius/ast_normalize"
-
-require "furnace/transform/generic/label_normalize"
-require "furnace/transform/generic/cfg_build"
-require "furnace/transform/generic/cfg_normalize"
-require "furnace/transform/generic/anf_build"
-
-require "furnace/transform/optimizing/fold_constants"
+require "furnace/transform"
 
 require "furnace/graphviz"
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: furnace
 version: !ruby/object:Gem::Version 
-  hash: 880347952
+  hash: 988111682
   prerelease: 
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Peter Zotov
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-13 00:00:00 Z
+date: 2012-01-26 00:00:00 Z
 dependencies: []
 
 description: Furnace aims to compile Ruby code into small static executables by restricting its metaprogramming features.
@@ -42,13 +42,18 @@ files:
 - lib/furnace/anf/let_node.rb
 - lib/furnace/anf/node.rb
 - lib/furnace/anf/return_node.rb
+- lib/furnace/ast.rb
+- lib/furnace/ast/matcher.rb
+- lib/furnace/ast/matcher_special.rb
 - lib/furnace/ast/node.rb
 - lib/furnace/ast/symbolic_node.rb
 - lib/furnace/ast/visitor.rb
+- lib/furnace/cfg.rb
 - lib/furnace/cfg/edge.rb
 - lib/furnace/cfg/graph.rb
 - lib/furnace/cfg/node.rb
 - lib/furnace/graphviz.rb
+- lib/furnace/transform.rb
 - lib/furnace/transform/generic/anf_build.rb
 - lib/furnace/transform/generic/cfg_build.rb
 - lib/furnace/transform/generic/cfg_normalize.rb