parser_combinator_dsl 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4f09f2cab4d3a7ec337902226fa25de2b6dfd194d2cc1ac4e7c00bff724eb54
-  data.tar.gz: aaa5b7b18fca3ef2334a0bea97820aef96f732adf2b089c02ef71479832ca914
+  metadata.gz: 9dfb04f7c0fc4cc1cf5308cb11f7d4a48a8234e1491841d15d552e8ad2ae4235
+  data.tar.gz: 8e455c3c496ab8a5a979658cb1cfe0410e34140835b6f7aa6016cefa63b30cdf
 SHA512:
-  metadata.gz: f9926cf30554094f1fd5f736e52bc1173fb8ed857af09013de7a534c6f9ffaa6f332493ddbd58ad597b5213cd84c6ce36f8e24f68340adf62aef7f3ea05ceae7
-  data.tar.gz: 99e2a534ccbecbd89976c18f3bf85af51c04819367dbb454c4da76529af728d233ffaddd0d50abd9fb9af2901d309af0ecbcc751b32ea72bf035dc212688f372
+  metadata.gz: 9b0b86387edca3f6b7929cde658aca2d4175773d7e4b162da9f9a0e979d5bd610299f5099e1b5248dfb0bb56a36c4a5d7df112e6fbfab6c24530aa591bd082d3
+  data.tar.gz: f1a2c0ba308168f3d45cd8c1c3d8c09288f5f1cddf1fc9ed7178abf670f85c664feb497ede7456e0f2a0acc26db5b018c4d6bcdd2116f07bbaa2782eed132b17

data/lib/base_parsers.rb

@@ -90,10 +90,12 @@ module BaseParsers
         result = parser.run(remaining)
         return ParserResult.fail(input) unless result.ok?
         remaining = result.remaining
+        matched += result.matched
         result.matched
       end
 
-      callback.call(*new_args)
+      output = callback.call(*new_args)
+      ParserResult.ok(output, matched: matched, remaining: remaining)
     end
   end
 

data/lib/parser_result.rb

@@ -1,13 +1,15 @@
 class ParserResult
-  attr_reader :success, :remaining, :matched
-  def initialize(success, remaining, matched)
+  attr_reader :success, :remaining, :matched, :output
+  def initialize(success, remaining, matched, output=[])
     @success   = success
     @remaining = remaining
     @matched   = matched
+    @output = output
   end
 
-  def self.ok(matched:, remaining:)
-    ParserResult.new(true, remaining, matched)
+  def self.ok(output=nil, matched:, remaining:)
+#    yield matched if block_given?
+    ParserResult.new(true, remaining, matched, output)
   end
 
   def self.fail(remaining)

data/test/test_base_parsers.rb

@@ -132,7 +132,7 @@ describe Grammar do
       start(:letterOrNumber)
     end
 
-    assert_equal ["w", "8"], parser.run("w8")
+    assert_equal ["w", "8"], parser.run("w8").output
 
     parser = Grammar.build do
       rule(:letter)         { many1 { anyLetter } }
@@ -140,7 +140,7 @@ describe Grammar do
       start(:letterOrNumber)
     end
 
-    assert_equal ["w", "8"], parser.run("w8")
+    assert_equal ["w", "8"], parser.run("w8").output
   end
 
   it "uses regex" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: parser_combinator_dsl
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Federico Ramirez
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-21 00:00:00.000000000 Z
+date: 2018-05-22 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