peg 0.0.1 → 0.0.4

data/lib/peg.rb

@@ -377,32 +377,27 @@ module PEG
 
   class ReferenceResolver
     def initialize(rules)
-      @rules = rules
+      rules = rules.map {|rule| [rule.name, rule]}
+      @rules = Hash[rules]
     end
 
     def resolve
-      _resolve!(@rules[0])
+      name, rule = @rules.first
+      _resolve(rule)
     end
 
-    def _resolve!(rule)
+    def _resolve(rule)
       if rule.class == Reference
-        resolved_rule = reference(rule.reference)
-        if resolved_rule.class == Reference
-          _resolve!(resolved_rule)
-        else
-          resolved_rule
-        end
-      elsif rule.children.length > 0
-        rule.children.map! {|child| _resolve!(child)}
-        rule
+        rule = @rules[rule.reference]
+        _resolve(rule)
       else
+        old_children = rule.children
+        rule.children = []  # avoid infinite reqursion of _resolve
+        new_children = old_children.map {|child| _resolve(child)}
+        rule.children = new_children
         rule
       end
     end
-
-    def reference(name)
-      @rules.find {|r| r.name == name} || raise("rule `#{name}` not found")
-    end
   end
 
   class Language
@@ -421,16 +416,30 @@ module PEG
       @@default = block
     end
 
+    def to_lambda(&block)
+      obj = Object.new
+      obj.define_singleton_method(:_, &block)
+      return obj.method(:_).to_proc
+    end
+
     def eval(source)
-      grammar_source = @@rules.values.join("\n")
-      node = Grammar.new(grammar_source).parse(source)
-      _eval(node)
+      if source.class == String
+        grammar_source = @@rules.values.join("\n")
+        source = Grammar.new(grammar_source).parse(source)
+      end
+      _eval(source)
     end
 
     def _eval(node)
-      block = @@blocks.fetch(node.name, @@default)
-      children = node.children.map {|child| _eval(child)}
-      instance_exec(node, children, &block)
+      block = @@blocks[node.name] || @@default
+      if block.arity == 2
+        children = node.children.map {|child| _eval(child)}
+        instance_exec(node, children, &block)
+      elsif block.arity == 1
+        instance_exec(node, &block)
+      else
+        raise "`rule` expects a block with signature |node| or |node, children|"
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: peg
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-02 00:00:00.000000000 Z
+date: 2013-08-12 00:00:00.000000000 Z
 dependencies: []
 description: Parsing Expression Grammar implmentation
 email: vladimir@keleshev.com