furnace 0.0.4 → 0.0.6

data/lib/furnace/ast/matcher/dsl.rb

@@ -0,0 +1,50 @@
+module Furnace::AST
+  class MatcherDSL
+    SpecialAny         = MatcherSpecial.new(:any)
+    SpecialSkip        = MatcherSpecial.new(:skip)
+    SpecialEach        = MatcherSpecial.define(:each)
+    SpecialEither      = MatcherSpecial.define(:either)
+    SpecialEitherMulti = MatcherSpecial.define(:either_multi)
+    SpecialMaybe       = MatcherSpecial.define(:maybe)
+
+    def any
+      SpecialAny
+    end
+
+    def skip
+      SpecialSkip
+    end
+
+    def each
+      SpecialEach
+    end
+
+    def either
+      SpecialEither
+    end
+
+    def either_multi
+      SpecialEitherMulti
+    end
+
+    def maybe
+      SpecialMaybe
+    end
+
+    def map(name)
+      ->(hash) { MatcherSpecial.new(:map, [name, hash]) }
+    end
+
+    def capture(name)
+      MatcherSpecial.new(:capture, name)
+    end
+
+    def capture_rest(name)
+      MatcherSpecial.new(:capture_rest, name)
+    end
+
+    def backref(name)
+      MatcherSpecial.new(:backref, name)
+    end
+  end
+end

data/lib/furnace/ast/matcher.rb

@@ -3,7 +3,7 @@ module Furnace::AST
 
   class Matcher
     def initialize(&block)
-      @pattern = self.class.class_exec(&block)
+      @pattern = MatcherDSL.new.instance_exec(&block)
     end
 
     def match(object, captures={})
@@ -53,55 +53,42 @@ module Furnace::AST
       end
     end
 
-    SpecialAny    = MatcherSpecial.new(:any)
-    SpecialSkip   = MatcherSpecial.new(:skip)
-    SpecialSubset = MatcherSpecial.define(:subset)
-
-    class << self
-      def any
-        SpecialAny
-      end
-
-      def skip
-        SpecialSkip
-      end
-
-      def subset
-        SpecialSubset
-      end
-
-      def capture(name)
-        MatcherSpecial.new(:capture, name)
-      end
-
-      def backref(name)
-        MatcherSpecial.new(:backref, name)
-      end
-    end
-
     protected
 
     def submatch(array, pattern, captures)
       matches = true
       nested_captures = captures.dup
+      index   = 0
 
-      pattern.each_with_index do |nested_pattern, index|
-        return false if index > array.length
+      pattern.each_with_index do |nested_pattern|
+        return nil if index > array.length
 
         case nested_pattern
         when Array
           matches &&= genmatch(array[index], nested_pattern, nested_captures)
-        when SpecialAny
+          index += 1
+        when MatcherDSL::SpecialAny
           # it matches
-        when SpecialSkip
+          index += 1
+        when MatcherDSL::SpecialSkip
           # it matches all remaining elements
-          break
+          index = array.length
         when MatcherSpecial.kind(:capture)
           # it matches and captures
           nested_captures[nested_pattern.param] = array[index]
+          index += 1
+        when MatcherSpecial.kind(:capture_rest)
+          # it matches and captures all remaining
+          nested_captures[nested_pattern.param] = array[index..-1]
+          index = array.length
         when MatcherSpecial.kind(:backref)
           matches &&= (nested_captures[nested_pattern.param] == array[index])
-        when MatcherSpecial.kind(:subset)
+          index += 1
+        when MatcherSpecial.kind(:maybe)
+          if advance = submatch(array[index..-1], nested_pattern.param, nested_captures)
+            index += advance
+          end
+        when MatcherSpecial.kind(:each)
           all_submatches = true
 
           workset = Set.new array[index..-1]
@@ -122,9 +109,60 @@ module Furnace::AST
             break unless all_submatches
           end
 
+          index += 1
           matches &&= all_submatches
+        when MatcherSpecial.kind(:either)
+          sub_found = false
+
+          nested_pattern.param.each do |subset_pattern|
+            if genmatch(array[index], subset_pattern, nested_captures)
+              sub_found = true
+              index += 1
+              break
+            end
+          end
+
+          matches &&= sub_found
+        when MatcherSpecial.kind(:either_multi)
+          sub_found = false
+
+          nested_pattern.param.each do |subset_pattern|
+            if matched = genmatch(array[index..-1], subset_pattern, nested_captures)
+              sub_found = true
+              index += matched
+              break
+            end
+          end
+
+          matches &&= sub_found
+        when MatcherSpecial.kind(:map)
+          captures_key, patterns = nested_pattern.param
+          nested_captures[captures_key] = []
+
+          while index < array.length
+            sub_found = false
+
+            patterns.each do |subset_key, subset_pattern|
+              subset_captures = captures.dup
+
+              if matched = submatch(array[index..-1], subset_pattern, subset_captures)
+                if subset_key
+                  nested_captures[captures_key].push [subset_key, subset_captures]
+                end
+
+                sub_found = true
+                index += matched
+
+                break
+              end
+            end
+
+            matches &&= sub_found
+            break unless matches
+          end
         else
-          matches &&= (array[index] == nested_pattern)
+          matches &&= (nested_pattern === array[index])
+          index += 1
         end
 
         break unless matches
@@ -132,7 +170,7 @@ module Furnace::AST
 
       captures.replace(nested_captures) if matches
 
-      matches
+      index if matches
     end
 
     def genmatch(astlet, pattern, captures)
@@ -144,26 +182,14 @@ module Furnace::AST
         end
       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, captures)
-          else
-            false
-          end
-        else
-          false
-        end
+      if pattern === astlet
+        true
+      elsif astlet.is_a? Node
+        submatch([astlet.type].concat(astlet.children), pattern, captures)
+      elsif astlet.is_a? Array
+        submatch(astlet, pattern, captures)
       else
-        # Match an array
-        if astlet.is_a? Array
-          submatch(astlet, pattern, captures)
-        else
-          false
-        end
+        false
       end
     end
   end

data/lib/furnace/ast.rb

@@ -4,5 +4,6 @@ require "furnace/ast/node"
 require "furnace/ast/symbolic_node"
 require "furnace/ast/visitor"
 
-require "furnace/ast/matcher_special"
+require "furnace/ast/matcher/special"
+require "furnace/ast/matcher/dsl"
 require "furnace/ast/matcher"

data/lib/furnace/version.rb

@@ -1,3 +1,3 @@
 module Furnace
-  VERSION = "0.0.4"
+  VERSION = "0.0.6"
 end

metadata

@@ -1,33 +1,25 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: furnace
-version: !ruby/object:Gem::Version 
-  hash: 246344429
+version: !ruby/object:Gem::Version
+  version: 0.0.6
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 4
-  version: 0.0.4
 platform: ruby
-authors: 
+authors:
 - Peter Zotov
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-01-28 00:00:00 Z
+date: 2012-02-17 00:00:00.000000000 Z
 dependencies: []
-
-description: Furnace is a static code analysis framework for dynamic languages, aimed at efficient type and behavior inference.
-email: 
+description: Furnace is a static code analysis framework for dynamic languages, aimed
+  at efficient type and behavior inference.
+email:
 - whitequark@whitequark.org
-executables: 
+executables:
 - furnace
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rvmrc
 - Gemfile
@@ -44,7 +36,8 @@ files:
 - lib/furnace/anf/return_node.rb
 - lib/furnace/ast.rb
 - lib/furnace/ast/matcher.rb
-- lib/furnace/ast/matcher_special.rb
+- 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/visitor.rb
@@ -66,36 +59,27 @@ files:
 - lib/furnace/version.rb
 homepage: http://github.com/whitequark/furnace
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 881230260
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 881230260
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.12
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: A static code analysis framework
 test_files: []
-
+has_rdoc: