raabro 1.0.0 → 1.0.1

data/CHANGELOG.txt

@@ -2,7 +2,13 @@
 = raabro CHANGELOG.txt
 
 
-== raabro 1.0.0  not yet released
+== raabro 1.0.1  released 2015-09-23
+
+- take last parser as default :root
+- provide default .parse for modules including Raabro
+
+
+== raabro 1.0.0  released 2015-09-23
 
 - first complete (hopefully) release
 

data/lib/raabro.rb

@@ -26,7 +26,7 @@
 
 module Raabro
 
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 
   class Input
 
@@ -398,6 +398,38 @@ module Raabro
       r
     end
     alias jseq eseq
+
+    def parse(input, opts={})
+
+      root = self.respond_to?(:root) ? :root : @last
+
+      t =
+        if opts[:all] == false
+          _parse(root, Raabro::Input.new(input, opts))
+        else
+          all(nil, Raabro::Input.new(input, opts), root)
+        end
+
+      return nil if t.result != 1
+
+      t = t.children.first if t.parter == :all
+      t = opts[:shrink] == false ? t : t.shrink!
+
+      return rewrite(t) if respond_to?(:rewrite)
+
+      t
+    end
+
+    attr_accessor :last
+
+    def method_added(name)
+
+      m = method(name)
+      return unless m.arity == 1
+      return unless m.parameters[0][1] == :i || m.parameters[0][1] == :input
+
+      @last = name.to_sym
+    end
   end
   extend ModuleMethods
 

data/spec/sample_xel_spec.rb

@@ -24,7 +24,8 @@ module Sample::Xel include Raabro
 
   def exp(i); alt(:exp, i, :fun, :num); end
 
-  # entry point .parse
+  #alias root exp
+    # not necessary since Raabro takes the last defined parser as the root
 
   def rewrite(tree)
 
@@ -40,15 +41,6 @@ module Sample::Xel include Raabro
         fail ArgumentError.new("cannot rewrite #{tree.to_a.inspect}")
     end
   end
-
-  def parse(input)
-
-    t = all(nil, Raabro::Input.new(input, :prune => true), :exp)
-
-    return nil if t.result != 1
-
-    rewrite(t.children.first.shrink!)
-  end
 end
 
 

data/spec/spec_helper.rb

@@ -44,13 +44,6 @@ module Sample::Cal include Raabro
   def item(i); alt(:item, i, :num, :op); end
 
   def suite(i); jseq(nil, i, :item, :sp); end
-
-  # entry point
-
-  def parse(input)
-
-    all(nil, Raabro::Input.new(input, :prune => true), :suite)
-  end
 end
 
 module Sample::Arith include Raabro
@@ -63,10 +56,5 @@ module Sample::Arith include Raabro
   def substraction(i); seq(:substraction, i, :number, :minus, :op_or_num); end
 
   def op_or_num(i); alt(nil, i, :addition, :substraction, :number); end
-
-  def parse(input)
-
-    all(nil, Raabro::Input.new(input, prune: true), :op_or_num)
-  end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: raabro
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-22 00:00:00.000000000 Z
+date: 2015-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake