pratt_parser 0.0.3 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e4efc171572cb5d16bf779face5ad265fcb0972
-  data.tar.gz: 1d735d195b81a1c7244232a3f104764d5f29262c
+  metadata.gz: 3e0997841c5a281d0c96da0544ba921381e27bf0
+  data.tar.gz: bd6594ea8c4174a973c62270e1c06d17edb45db8
 SHA512:
-  metadata.gz: acd4bbdfc592f343074a53a29eee714a90f780c5655a4dc5ea7ade6ec68690850553b9759feaea59a96b3bac5071f1f70eda1fd930b2946e51b4c8ef057966e4
-  data.tar.gz: bbf0d65f906a6579c33f15850e28ab34afece42722adc30cd27368377d71bee894ea0881c4d0f5c93157f423084e1f473be40777ff8ef3cf65f930e8695d942e
+  metadata.gz: 2c9fea5f8b437b4b6a1487d3b5123eab152f7a1aa068ba5ded4340f52a69adb9353419cabc07f275bb4012916248a60aa28b3fe196a546e49a09682cec52c6d5
+  data.tar.gz: fb381c4cf7553639cfa6d4581d0101c62a90cc0603a29629bb5b16550567f624d75185ec1943de14233caa5ff9f7b88426aaf8958d9121fcb3cdacd558f24fb6

data/CHANGELOG

@@ -1,3 +1,9 @@
+## 0.1.0 ##
+
+  * Add postfix factorial operator to examples.
+  * PrattParser#expect and #if? can now take a block so token
+    expectations can be based on something more general than class.
+
 ## 0.0.3 ##
 
   * examples/tree.rb supports prefix + and -.

data/README.md

@@ -4,7 +4,7 @@ Pratt Parser
 [![Gem Version](https://badge.fury.io/rb/pratt_parser.svg)](http://badge.fury.io/rb/pratt_parser)
 [![Build Status](https://travis-ci.org/tommay/pratt_parser.svg)](https://travis-ci.org/tommay/pratt_parser)
 
-A Pratt Parser.  Just a simple parsing framework.
+A Pratt Parser.  Just a simple parsing engine.
 
 Define tokens that describe your language and combine terms.  Write a
 Lexer (an Enumerator) that produces a stream of tokens.  Instantiate a

data/Rakefile

@@ -14,6 +14,10 @@ task :install => :gem do
   sh "gem install pratt_parser"
 end
 
+task :push => [:clean, :gem] do
+  sh "gem push pratt_parser-*.gem"
+end
+
 task :clean do
-  sh "rm *.gem"
+  sh "rm -f *.gem"
 end

data/examples/expression_evaluator.rb

@@ -47,6 +47,17 @@ class PrattEvaluator
       end
     end
 
+    class PostfixToken < Token
+      def initialize(lbp, &block)
+        super(lbp)
+        @block = block
+      end
+
+      def led(parser, left)
+        @block.call(left)
+      end
+    end
+
     class DigitToken < Token
       def initialize(lbp, value)
         super(lbp)
@@ -83,6 +94,14 @@ class PrattEvaluator
       token(char, InfixToken.new(lbp, associates, &block))
     end
 
+    def self.postfix(char, lbp, &block)
+      token(char, PostfixToken.new(lbp, &block))
+    end
+
+    def self.factorial(n)
+      n <= 1 ? 1 : n * factorial(n - 1)
+    end
+
     token("(", LeftParenToken.new(1))
     token(")", RightParenToken.new(1))
 
@@ -92,6 +111,7 @@ class PrattEvaluator
     infix("*", 30, &:*)
     infix("/", 30, &:/)
     infix("^", 40, :right, &:**)
+    postfix("!", 50) {|left| factorial(left)}
 
     (0..9).each do |d|
       token(d.to_s, DigitToken.new(100, d.to_f))

data/examples/tree.rb

@@ -115,12 +115,23 @@ class TreeBuilder
 
     class BifixToken < InfixToken
       def nud(parser)
-        # Bind super-right to the right.
+        # Bind super-tight to the right.
         right = parser.expression(1000000)
         UnaryNode.new(@operator, right)
       end
     end
 
+    class PostfixToken < Token
+      def initialize(function, lbp)
+        super(lbp)
+        @function = function
+      end
+
+      def led(parser, left)
+        UnaryNode.new(@function, left)
+      end
+    end
+
     class DigitToken < Token
       def initialize(lbp, value)
         super(lbp)
@@ -161,6 +172,10 @@ class TreeBuilder
       token(char, BifixToken.new(char, lbp, :left))
     end
 
+    def self.postfix(char, lbp, function, &block)
+      token(char, PostfixToken.new(function, lbp))
+    end
+
     token("(", LeftParenToken.new(1))
     token(")", RightParenToken.new(1))
 
@@ -170,6 +185,7 @@ class TreeBuilder
     infix("*", 30)
     infix("/", 30)
     infix("^", 40, :right)
+    postfix("!", 50, "factorial")
 
     (0..9).each do |d|
       token(d.to_s, DigitToken.new(100, d))

data/lib/pratt_parser.rb

@@ -63,15 +63,21 @@ class PrattParser
     left
   end
 
-  def expect(expected_token_class)
-    if @token.class != expected_token_class
-      raise "Expected #{expected_token_class}, got #{@token.class}"
+  def expect(expected_token_class = nil, &block)
+    block ||= lambda do |token|
+      if token.class != expected_token_class
+        raise "Expected #{expected_token_class}, got #{token.class}"
+      end
     end
+    block.call(@token)
     @token = @lexer.next
   end
 
-  def if?(token_class)
-    if @token.class == token_class
+  def if?(token_class, &block)
+    block ||= lambda do |token|
+      token.class == token_class
+    end
+    if block.call(@token)
       @token = @lexer.next
     end
   end

data/pratt_parser.gemspec

@@ -8,9 +8,8 @@ Gem::Specification.new do |gem|
   gem.test_files       = `git ls-files -- spec/*`.split("\n")
   gem.name             = "pratt_parser"
   gem.require_paths    = ["lib"]
-  gem.version          = "0.0.3"
+  gem.version          = "0.1.0"
+  gem.license          = "MIT"
   # Needs Enumerator which was added in 1.9.
   gem.required_ruby_version = ">= 1.9"
-  gem.license          = "MIT"
-#  gem.required_ruby_version = '>= 2.1.0'
 end

data/spec/pratt_parser_spec.rb

@@ -22,6 +22,27 @@ describe PrattParser do
     token.verify
   end
 
+  it "passes the lookahead token to an expect block" do
+    expected_token = Object.new
+
+    token_a = Object.new.tap do |o|
+      o.singleton_class.class_eval do
+        define_method(:nud) do |parser|
+          parser.expect do |token|
+            token.must_be_same_as expected_token
+          end
+        end
+      end
+    end
+
+    lexer = Enumerator.new do |y|
+      y << token_a
+      y << expected_token
+    end
+
+    PrattParser.new(lexer).eval
+  end
+
   it "moves on to the next token on a valid expect" do
     class TokenA
       def nud(parser)
@@ -50,6 +71,29 @@ describe PrattParser do
     assert fetched_expected_token
   end
 
+  it "moves on to the next token on a valid expect with a block" do
+    class TokenA
+      def nud(parser)
+        parser.expect {}
+      end
+    end
+    class TokenC
+      def lbp; 0; end
+    end
+
+    fetched_expected_token = false
+    lexer = Enumerator.new do |y|
+      y << TokenA.new
+      y << Object.new
+      fetched_expected_token = true
+      y << TokenC.new
+    end
+
+    PrattParser.new(lexer).eval
+
+    assert fetched_expected_token
+  end
+
   it "fails on invalid expect" do
     class TokenA
       def nud(parser)
@@ -74,4 +118,23 @@ describe PrattParser do
     end
   end
 
+  it "fails on invalid expect with a block" do
+    class TokenA
+      def nud(parser)
+        parser.expect do
+          raise "That's not what I was expecting"
+        end
+      end
+    end
+
+    lexer = Enumerator.new do |y|
+      y << TokenA.new
+      y << Object.new
+    end
+
+    assert_raises RuntimeError do
+      PrattParser.new(lexer).eval
+    end
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pratt_parser
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors:
 - Tom May