parser_combinator_dsl 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9dfb04f7c0fc4cc1cf5308cb11f7d4a48a8234e1491841d15d552e8ad2ae4235
-  data.tar.gz: 8e455c3c496ab8a5a979658cb1cfe0410e34140835b6f7aa6016cefa63b30cdf
+  metadata.gz: edaf570ec26adf2f4bf73b9dc01e54631d30ec848bc54ee064dc514af2f776e8
+  data.tar.gz: 44264ddfb196dc449b64e1d3cc50103046655332c8224603649901062faa0a28
 SHA512:
-  metadata.gz: 9b0b86387edca3f6b7929cde658aca2d4175773d7e4b162da9f9a0e979d5bd610299f5099e1b5248dfb0bb56a36c4a5d7df112e6fbfab6c24530aa591bd082d3
-  data.tar.gz: f1a2c0ba308168f3d45cd8c1c3d8c09288f5f1cddf1fc9ed7178abf670f85c664feb497ede7456e0f2a0acc26db5b018c4d6bcdd2116f07bbaa2782eed132b17
+  metadata.gz: 136543bfc38ee26b7c979514526efafc527731424f22d8db7fe2e9ae7aa94b516e20ae83acaddbaee75a71dd4dbbdd97153aab1d29f8df9523d6b547857c6421
+  data.tar.gz: 97abd30a6674af378ba2a5f6717a391a86524b79b20f486284f36c9f0631b99d024b801f19c232c5bc31a8339ee3f57b0ea07323175e156dcc7a7c112ef2c04f

data/lib/base_parsers.rb

@@ -18,7 +18,7 @@ module BaseParsers
   end
 
   def whitespace
-    many0 { anyChar([' '] + %w[\b \f \n \r \t]) }
+    many0 { anyChar([" ", "\b", "\f", "\n", "\r", "\t"]) }
   end
 
   def one(char)
@@ -52,6 +52,7 @@ module BaseParsers
   def many1(&wrapper)
     Parser.new do |input|
       matched   = ""
+      output    = []
       remaining = input
       parser    = wrapper.call
 
@@ -59,10 +60,14 @@ module BaseParsers
         result = parser.run(remaining)
         break if remaining.nil? || result.fail?
         matched   = matched + result.matched
+        output += result.output unless (result.output.length == 1 and result.output[0].length == 1)
         remaining = result.remaining
       end
 
-      ParserResult.new(!matched.empty?, remaining, matched)
+      #puts "output: " + output.to_s unless output.empty?
+      output = nil if output.empty?
+
+      ParserResult.new(!matched.empty?, remaining, matched, output)
     end
   end
 
@@ -85,17 +90,25 @@ module BaseParsers
     Parser.new do |input|
       remaining = input
       matched   = ""
+      fail = nil
 
       new_args = parsers.map do |parser|
         result = parser.run(remaining)
-        return ParserResult.fail(input) unless result.ok?
+        unless result.ok?
+          fail = ParserResult.fail(input)
+          break
+        end
         remaining = result.remaining
         matched += result.matched
-        result.matched
+        result.output
       end
 
-      output = callback.call(*new_args)
-      ParserResult.ok(output, matched: matched, remaining: remaining)
+      if fail.nil?
+        output = callback.call(*new_args)
+        ParserResult.ok(output, matched: matched, remaining: remaining)
+      else
+        fail
+      end
     end
   end
 

data/lib/combinators.rb

@@ -24,13 +24,16 @@ module Combinators
   def >>(other)
     Parser.new do |input|
       first = run(input)
-      matched = ""
+      matched = "" 
+      output = []
       if first.ok?
         matched = matched + first.matched
+        output += first.output
         second = other.run(first.remaining)
         if second.ok?
           matched = matched + second.matched
-          ParserResult.ok(matched: matched, remaining: second.remaining)
+          output = [*output, second.output]
+          ParserResult.ok(output, matched: matched, remaining: second.remaining)
         else
           ParserResult.fail(input)
         end
@@ -45,12 +48,15 @@ module Combinators
     Parser.new do |input|
       first = run(input)
       matched = ""
+      output = []
       if first.ok?
         matched = first.matched
+        output += first.output
         second  = other.run(first.remaining)
         if second.ok?
           matched = matched + second.matched
-          ParserResult.ok(matched: matched, remaining: second.remaining)
+          output = [*output, second.output]
+          ParserResult.ok(output, matched: matched, remaining: second.remaining)
         else
           first
         end
@@ -65,17 +71,20 @@ module Combinators
     Parser.new do |input|
       first     = run(input)
       matched   = ""
+      output    = []
       remaining = input
 
       if first.ok?
         matched   = first.matched
+        output += first.output
         remaining = first.remaining
       end
 
       second = other.run(remaining)
       if second.ok?
         matched = matched + second.matched
-        ParserResult.ok(matched: matched, remaining: second.remaining)
+        output = [*output, second.output]
+        ParserResult.ok(output, matched: matched, remaining: second.remaining)
       else
         ParserResult.fail(input)
       end
@@ -89,7 +98,7 @@ module Combinators
       if first.ok?
         second  = other.run(first.remaining)
         if second.ok?
-          ParserResult.ok(matched: first.matched, remaining: second.remaining)
+          ParserResult.ok(first.output, matched: first.matched, remaining: second.remaining)
         else
           first
         end
@@ -109,4 +118,59 @@ module Combinators
       second.ok? ? second : ParserResult.fail(input)
     end
   end
+
+  # Match this, other is QUIETLY consumed
+  def /(other)
+    Parser.new do |input|
+      first = run(input)
+      matched = "" 
+      if first.ok?
+        matched = matched + first.matched
+        second = other.run(first.remaining)
+        if second.ok?
+          matched = matched + second.matched
+          ParserResult.ok(first.output, matched: matched, remaining: second.remaining)
+        else
+          ParserResult.fail(input)
+        end
+      else
+        first
+      end
+    end
+  end
+
+  # Match other, this is QUIETLY consumed
+  def *(other)
+    Parser.new do |input|
+      first = run(input)
+      matched = "" 
+      
+      if first.ok?
+        matched += first.matched
+        second = other.run(first.remaining)
+        if second.ok?
+          matched += second.matched
+          ParserResult.ok(second.output, matched: matched, remaining: second.remaining)
+        else
+          ParserResult.fail(input)
+        end
+      else
+        first
+      end
+    end
+  end
+
+  # other needs to fail for this to succeed; other is only peeking, not consuming
+  def !=(other)
+    Parser.new do |input|
+      second = other.run(input)
+
+      if second.ok?
+        ParserResult.fail(input)
+      else
+        run(input)
+      end
+    end
+  end
+
 end

data/lib/grammar.rb

@@ -14,6 +14,7 @@ class Grammar
       instance_eval &block
     end
 
+    # Adds or references a new rule
     def rule(name, &wrapper)
       return @rules.fetch(name.to_sym) { raise "Could not find rule: #{name}"} if wrapper.nil?
       @rules[name.to_sym] = Parser.new { |input| wrapper.call.run(input) }

data/lib/parser_result.rb

@@ -1,14 +1,15 @@
 class ParserResult
   attr_reader :success, :remaining, :matched, :output
-  def initialize(success, remaining, matched, output=[])
+  def initialize(success, remaining, matched, output=nil)
     @success   = success
     @remaining = remaining
     @matched   = matched
-    @output = output
+    @output = output.nil? ? [matched] : output
   end
 
   def self.ok(output=nil, matched:, remaining:)
 #    yield matched if block_given?
+    output = [matched] if output.nil?
     ParserResult.new(true, remaining, matched, output)
   end
 
@@ -27,4 +28,12 @@ class ParserResult
   def ==(other)
     return other.instance_of?(self.class) && other.success == success && other.remaining == remaining && other.matched == matched
   end
+
+  def to_s()
+    "ParserResult: {\n" +
+    "\tSuccess: " + success.to_s + 
+    "\n\tRemaining: '" + remaining.to_s + 
+    "'\n\tMatched: '" + matched.to_s + 
+    "'\n\tOutput: " + output.to_s + "\n}"
+  end
 end

data/test/spec_helpers.rb

@@ -1,9 +1,10 @@
-def assert_parses(parser, with:, remaining:, matched: nil, should_fail: false)
+def assert_parses(parser, with:, remaining:, matched: nil, output: nil, should_fail: false)
   result = parser.run(with)
-  puts "with: " + with.to_s + " matched: " + result.matched.to_s + " remaining: " + result.remaining.to_s + " success: " + result.success.to_s
+  puts result.to_s
   assert_equal !should_fail,      result.success
   assert_equal remaining, result.remaining
   assert_equal matched,   result.matched unless matched.nil?
+  assert_equal output,    result.output  unless output.nil?
 end
 
 def test_parser(parser, with:, should_fail: false)

data/test/test_recipe_parser.rb

@@ -0,0 +1,57 @@
+require "minitest/autorun"
+require "pry"
+require_relative "spec_helpers"
+
+describe Grammar do
+  describe "Real world examples" do
+  it "output matches" do
+    parser = Grammar.build do
+      rule(:eol) { many0 { anyChar([" ", "\t"]) } < anyChar(["\n"]) }
+      rule(:instructions) { whitespace <= ( (str("Zubereitung") | str("Anweisungen")) / rule(:eol)) >> many1 { whitespace <= many1 { anyCharBut(["\n"]) } >= rule(:eol) } }
+      rule(:ingredient) { whitespace <= many1 { anyCharBut(["\n"]) } / rule(:eol) }
+      rule(:ingredients) { whitespace <= (str("Zutaten") / rule(:eol)) < many1 { rule(:ingredient) != rule(:instructions) }  >= rule(:eol) }
+      rule(:recipe_name) { (str("Rezept ") <= many1 { anyCharBut(["\n"]) }) / many1 { rule(:eol) } }
+      rule(:recipe) { seq rule(:recipe_name), rule(:ingredients), rule(:instructions), lambda { |name, ingredients, instructions| [name, ingredients, instructions] } }
+
+      start(:recipe)
+    end
+
+    assert_parses parser, with: 
+      "Rezept Tomatensahne
+
+      Zutaten
+      1 kg, Tomaten
+      100g, Zwiebeln
+      30g, Butter
+      1, Knoblauchzehe
+      1 EL, Mehl
+      2-3 EL, Tomatenmark
+      2 EL, Tomatenketchup
+      1/4 L, Brühe
+      1/4 L, Schlagsahne
+
+      Salz
+      Cayennepfeffer
+      1 TL, Zucker
+      1 TL, Zitronensaft
+      1 Bd., Basilikum
+
+
+
+      Anweisungen
+      Zwiebeln fein würfeln.
+      Tomaten häuten und würfeln.
+      Zwiebeln glasig dünsten, Knoblauch dazupressen.
+      Mit Mehl überstäuben, kurz anschwitzen.
+      Tomatenmark und -ketchup zugeben. Mit Brühe und Sahne auffüllen.
+      Sauce unter Rühren 5 Min. kochen.
+      Inzwischen Nudeln kochen, am besten Linguine.
+      Tomaten in der Sauce 5 Min. garen.
+      Mit Salz, Cayennepfeffer, Zucker und Zitronensaft herzhaft würzen.
+      Basilikumblätter abzupfen, in Streifen schneiden und auf die Sauce streuen.",
+      remaining: "",
+      output: 
+      [["Tomatensahne"], ["Zutaten", ["1 kg, Tomaten", "100g, Zwiebeln", "30g, Butter", "1, Knoblauchzehe", "1 EL, Mehl", "2-3 EL, Tomatenmark", "2 EL, Tomatenketchup", "1/4 L, Brühe", "1/4 L, Schlagsahne", "Salz", "Cayennepfeffer", "1 TL, Zucker", "1 TL, Zitronensaft", "1 Bd., Basilikum"]], ["Anweisungen", ["Zwiebeln fein würfeln.", "Tomaten häuten und würfeln.", "Zwiebeln glasig dünsten, Knoblauch dazupressen.", "Mit Mehl überstäuben, kurz anschwitzen.", "Tomatenmark und -ketchup zugeben. Mit Brühe und Sahne auffüllen.", "Sauce unter Rühren 5 Min. kochen.", "Inzwischen Nudeln kochen, am besten Linguine.", "Tomaten in der Sauce 5 Min. garen.", "Mit Salz, Cayennepfeffer, Zucker und Zitronensaft herzhaft würzen.", "Basilikumblätter abzupfen, in Streifen schneiden und auf die Sauce streuen."]]]
+  end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: parser_combinator_dsl
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Federico Ramirez
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-22 00:00:00.000000000 Z
+date: 2018-05-31 00:00:00.000000000 Z
 dependencies: []
 description: "\n\tThis library provides a DSL which you can use to easily generate
   parsers in Ruby.\n\n\tAt it's core, it's a parser combinator library, but you don't
@@ -30,6 +30,7 @@ files:
 - test/test_base_parsers.rb
 - test/test_combinators.rb
 - test/test_json_demo.rb
+- test/test_recipe_parser.rb
 - test/test_tutorial.rb
 homepage: https://github.com/moddx/parser-combinator
 licenses: