parser_combinator 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb0d5aae337910defc3d0eb3a61be9a37d99f5b5
-  data.tar.gz: 0513a0c7ca661716f31c7a1dc8561c74d6330cce
+  metadata.gz: d456efcd3b6e21d8ab0d1c0622247276f86a8ddf
+  data.tar.gz: 7a565356e08db305a2a0c020e549de9df6bcded9
 SHA512:
-  metadata.gz: 21b5c9876e6d8a7bb88b17fe07ab59422b7e8381a6b66a47bc66aa105084fe924c22f7e532cd6dba09288a79b7f6b9002bcb462eacfc739a21a167e1c542bd0f
-  data.tar.gz: c209e1110f96a141e70b20c97b1ba944b58a303e43443e186d32376c2d1ac3650f0d35f571551c25936ee3e85f2c2582c648705e20cfb1ae741858c9dc02bcc9
+  metadata.gz: a9ed18d16f6bfc022f518cf70f41d93fa6a591945022b008f0282f69210efe2b98bf80bb07d49d1cce7b7880ecb1ddb7a98b26e0969509a32191059aecb3f923
+  data.tar.gz: db4e7c2760fea42ab14e77136b871864254a5e30e99e82b50986f2af6e95ca7836b410e09c43ef14b1b74721337de39496fbbb59ce42dc47d8a6755ad6f432d1

data/Rakefile

@@ -1,2 +1,9 @@
 require "bundler/gem_tasks"
 
+task :examples do
+  $LOAD_PATH.unshift File.expand_path('../examples', __FILE__)
+  require 'basic'
+  require 'error_handling'
+  require 'recursive'
+end
+

data/lib/parser_combinator/version.rb

@@ -1,3 +1,3 @@
 class ParserCombinator
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/parser_combinator.rb

@@ -97,9 +97,8 @@ class ParserCombinator
     end
   end
 
-  attr_accessor :parser_proc
-  attr_reader :parser_name
-  def initialize(status_handler=nil, name=nil &proc)
+  attr_reader :status_handler, :parser_name, :parser_proc
+  def initialize(status_handler=proc{nil}, name=nil, &proc)
     @status_handler = status_handler
     @parser_name = name
     @parser_proc = proc
@@ -107,10 +106,17 @@ class ParserCombinator
 
   def parse(items)
     result = @parser_proc.call(items)
-    if result.is_a?(Fail) && @status_handler
-      result.class.new(@status_handler.call(items, result.status))
-    else
+    case result
+    when Fail
+      if  @status_handler.call(items, result.status) != nil
+        result.class.new(@status_handler.call(items, result.status))
+      else
+        result
+      end
+    when Ok
       result
+    else
+      raise "parsed object is #{result.inspect}/#{result.class}"
     end
   end
 
@@ -125,6 +131,13 @@ class ParserCombinator
     end
   end
 
+  def onparse(&proc)
+    self.class.new(@status_handler, @parser_name) do |*args|
+      proc.call(*args)
+      @parser_proc.call(*args)
+    end
+  end
+
   def name(new_name)
     self.class.new(@status_handler, new_name, &parser_proc)
   end
@@ -171,6 +184,8 @@ class ParserCombinator
         result
       when Ok
         continuation_proc.call(result.parsed).parse(result.rest)
+      else
+        raise "error"
       end
     }
   end
@@ -182,6 +197,8 @@ class ParserCombinator
         parser2.parse(i)
       when Ok
         result1
+      else
+        raise "error"
       end
     }
   end
@@ -197,6 +214,8 @@ class ParserCombinator
         end
       when Ok
         result1
+      else
+        raise "error"
       end
     }
   end
@@ -305,8 +324,12 @@ class ParserCombinator
       if @cache[key]
         return @cache[key]
       else
-        @cache[key] = self.new{}
-        @cache[key].parser_proc = proc.call(*args).parser_proc
+        status_handler = proc{ raise "this is never-called proc (status_handler)" }
+        parser_proc = proc{ raise "this is never-called proc (parser_proc)" }
+        @cache[key] = self.new(proc{|*args| status_handler.call(*args)}){|*args| parser_proc.call(*args)}
+        generated_parser = proc.call(*args)
+        parser_proc = generated_parser.parser_proc
+        status_handler = generated_parser.status_handler
         return @cache[key]
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parser_combinator
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Kensuke Sawada
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-27 00:00:00.000000000 Z
+date: 2015-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler