yaparc 0.1.4 → 0.1.5

data/lib/yaparc.rb

@@ -49,18 +49,6 @@ module Yaparc
         result
       end
     end
-#     def parse(input, &block)
-#       result = @parser.call(input)
-#       if block_given?
-# #        @tree = yield result.value
-#         result.value = yield result.value
-#         @tree = result
-#       else
-# #        @tree = result.value
-#         @tree = result.parse(input)
-#       end
-#       result
-#     end
 
     def eval
       tree = parse(input)
@@ -96,18 +84,19 @@ module Yaparc
     include Parsable
     def initialize
       @parser = lambda do |input|
-        Result::Fail.new
+        Result::Fail.new(:input => input)
       end
     end
   end
 
 
+
   class ItemParser
     include Parsable
     def initialize
       @parser = lambda do |input|
         if input.nil? or input.empty?
-          Result::Fail.new
+          Result::Fail.new(:input => input)
         else
           Result::OK.new(:value => input[0..0],:input => input[1..input.length])
         end
@@ -122,14 +111,14 @@ module Yaparc
 
       @parser = lambda do |input|
         case result = ItemParser.new.parse(input)
-        when Result::Fail
-          FailParser.new
-        else
+        when Result::OK
           parser = if predicate.call(result.value)
                      SucceedParser.new(result.value, result.input)
                    else
                      FailParser.new
                    end
+        else # Result::Fail or Result::Error
+          FailParser.new
         end
       end
     end
@@ -146,6 +135,27 @@ module Yaparc
     end
   end
 
+
+  class NoFail
+    # hutton92:_higher_order_funct_parsin,p.19
+    include Parsable
+
+    def initialize(parser, &block)
+      @parser = lambda do |input|
+        case result = parser.parse(input)
+        when Result::Fail
+          Result::Error.new(:value => result.value, :input => result.input)
+        when Result::OK
+          SucceedParser.new(result.value)
+        else
+          SucceedParser.new(result.value)
+#          Result::OK.new(:value => result.value,:input => result.input)
+        end
+      end
+    end
+  end # of NoFail
+
+
   class SeqParser
     include Parsable
     def initialize(*parsers, &block)
@@ -155,23 +165,22 @@ module Yaparc
         final_result = parsers.inject(initial_result) do |subsequent, parser|
           case result = parser.parse(subsequent.input)
           when Result::Fail
-            break Result::Fail.new
+            break Result::Fail.new(:input => subsequent.input)
           else
             args << result.value
-#            args << result.parse(input)
             result
           end
         end
 
         case final_result
         when Result::Fail
-          Result::Fail.new
+          Result::Fail.new(:input => final_result.input)
         when Result::OK
           final_value = if block_given?
-                     yield(*args)
-                   else
-                     args.last
-                   end
+                          yield(*args)
+                        else
+                          args.last
+                        end
           Result::OK.new(:value => final_value, :input => final_result.input)
         else
           raise
@@ -186,11 +195,13 @@ module Yaparc
     def initialize(*parsers)
       @parser = lambda do |input|
         initial_result = Result::OK.new(:input => input)
-        final_result = Result::Fail.new
+        final_result = Result::Fail.new(:input => input)
         parsers.each do |parser|
           case result = parser.parse(initial_result.input)
           when Result::Fail
             next
+          when Result::Error
+            return Result::Error.new(:value => result.value, :input => result.input)
           when Result::OK
             break final_result = result
           else
@@ -211,10 +222,8 @@ module Yaparc
         case result = parser.parse(input)
         when Result::OK
           SucceedParser.new(yield(result.value)).parse(result.input)
-        when Result::Fail
-          FailParser.new.parse(input)
         else
-          raise
+          FailParser.new.parse(input)
         end
       end
     end # of initialize
@@ -226,8 +235,6 @@ module Yaparc
     def initialize(string)
       @parser = lambda do |input|
         case result = ItemParser.new.parse(string)
-        when Result::Fail
-          SucceedParser.new(result) # Is it OK?
         when Result::OK
           SeqParser.new(
                         CharParser.new(result.value),
@@ -237,7 +244,7 @@ module Yaparc
             succeed_result
           end
         else
-          raise
+          SucceedParser.new(result) # Is it OK?
         end
       end
     end
@@ -255,7 +262,7 @@ module Yaparc
         if match = Regexp.new(regex).match(input)
           Result::OK.new(:value => match[0], :input => match.post_match)
         else
-          Result::Fail.new
+          Result::Fail.new(:input => input)
         end
       end
     end
@@ -264,7 +271,8 @@ module Yaparc
   # permits zero or more applications of parser.
   class ManyParser
     include Parsable
-    def initialize(parser, identity = "")
+#    def initialize(parser, identity = "")
+    def initialize(parser, identity = [])
       @parser = lambda do |input|
 #        AltParser.new(ManyOneParser.new(parser, identity), SucceedParser.new(identity)).parse(input)
         AltParser.new(ManyOneParser.new(parser, identity), SucceedParser.new(identity))
@@ -279,7 +287,7 @@ module Yaparc
   # requires at least one successfull application of parser.
   class ManyOneParser
     include Parsable
-    def initialize(parser, identity = "")
+    def initialize(parser, identity = [])
       @parser = lambda do |input|
         SeqParser.new(
                       parser,
@@ -321,7 +329,7 @@ module Yaparc
     def initialize
       @parser = SeqParser.new(
                               SatisfyParser.new(IS_LOWER),
-                              ManyParser.new(SatisfyParser.new(IS_ALPHANUM))
+                              ManyParser.new(SatisfyParser.new(IS_ALPHANUM),"")
                               ) do |head, tail|
         head + tail
       end
@@ -330,7 +338,7 @@ module Yaparc
 
   class Nat < ParserBase
     def initialize
-      @parser = SeqParser.new(ManyOneParser.new(SatisfyParser.new(IS_DIGIT))) do |vs|
+      @parser = SeqParser.new(ManyOneParser.new(SatisfyParser.new(IS_DIGIT),"")) do |vs|
         if vs == ""
           vs
         else
@@ -343,7 +351,7 @@ module Yaparc
 
   class Space < ParserBase
     def initialize
-      @parser = SeqParser.new(ManyParser.new(SatisfyParser.new(IS_SPACE))) do |vs|
+      @parser = SeqParser.new(ManyParser.new(SatisfyParser.new(IS_SPACE),"")) do |vs|
         SucceedParser.new([])
       end
     end
@@ -351,7 +359,7 @@ module Yaparc
 
   class WhiteSpace < ParserBase
     def initialize
-      @parser = SeqParser.new(ManyParser.new(SatisfyParser.new(IS_WHITESPACE))) do |vs|
+      @parser = SeqParser.new(ManyParser.new(SatisfyParser.new(IS_WHITESPACE),"")) do |vs|
         SucceedParser.new([])
       end
     end
@@ -368,6 +376,18 @@ module Yaparc
     end
   end
 
+  class Tokenize < ParserBase
+    attr_accessor :prefix, :postfix
+
+    def initialize(parser, &block)
+      @prefix, @postfix = WhiteSpace.new,WhiteSpace.new
+      yield self
+      @parser = SeqParser.new(@prefix, parser, @postfix) do |_, vs, _|
+        vs
+      end
+    end
+  end
+
   # Refer to http://www.cs.nott.ac.uk/~gmh/monparsing.pdf, p.23
   class Identifier
     include Parsable
@@ -382,10 +402,8 @@ module Yaparc
           case result = AltParser.new(*keyword_parsers).parse(input)
           when Result::OK
             FailParser.new
-          when Result::Fail
+          else # Result::Fail or Result::Error
             Token.new(Ident.new)
-          else
-            raise
           end
         end
       end

data/tests/test_parser.rb

@@ -187,7 +187,7 @@ class YaparcTest < Test::Unit::TestCase
 
   def test_many_parse
     is_digit = SatisfyParser.new(lambda {|i| i >= '0' and i <= '9'})
-    parser = ManyParser.new(is_digit)
+    parser = ManyParser.new(is_digit,"")
     result = parser.parse("123abc")
     assert_equal "123",  result.value
     assert_equal "abc",  result.input
@@ -234,6 +234,39 @@ class YaparcTest < Test::Unit::TestCase
     assert_equal "abc",  result.input
   end
 
+#   def test_token
+#     parser = Token.new
+#     result = parser.parse(" \n   abc")
+#     assert_instance_of Result::OK,  result
+#     assert_equal "abc",  result.input
+#   end
+
+  def test_tokenize
+    parser = Tokenize.new(Ident.new) do |tokenize|
+      tokenize.prefix = Space.new
+      tokenize.postfix = Space.new
+    end
+
+    result = parser.parse("    abc")
+    assert_instance_of Result::OK,  result
+    assert_equal "abc",  result.value
+    assert_equal "",  result.input
+
+    result = parser.parse(" \n   abc")
+    assert_instance_of Result::Fail,  result
+    assert_equal "\n   abc",  result.input
+
+    parser = Tokenize.new(Ident.new) do |tokenize|
+      tokenize.prefix = WhiteSpace.new
+      tokenize.postfix = WhiteSpace.new
+    end
+
+    result = parser.parse(" \n   abc")
+    assert_instance_of Result::OK,  result
+    assert_equal "abc",  result.value
+    assert_equal "",  result.input
+  end
+
   def test_identifier
     parser = Identifier.new
     result = parser.parse("    abc ")

data/tests/test_sql.rb

@@ -315,10 +315,10 @@ class YaparcQueryTest < Test::Unit::TestCase
     query = SQL::QueryBody.new
     result = query.parse("select abc from /xyz")
     assert_instance_of Result::OK,  result
-    assert_equal Hash[:from=>["xyz"], :where=>"", :select=>["abc"]],  result.value
+    assert_equal Hash[:from=>["xyz"], :where=>[], :select=>["abc"]],  result.value
     result = query.parse("select abc from /xyz/fgh")
     assert_instance_of Result::OK,  result
-    assert_equal Hash[:from=>["xyz","fgh"], :where=>"", :select=>["abc"]],  result.value
+    assert_equal Hash[:from=>["xyz","fgh"], :where=>[], :select=>["abc"]],  result.value
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: yaparc
 version: !ruby/object:Gem::Version 
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors: 
 - Akimichi Tatsukawa
@@ -9,7 +9,7 @@ autorequire: yaparc
 bindir: bin
 cert_chain: []
 
-date: 2008-02-07 00:00:00 +09:00
+date: 2008-02-21 00:00:00 +09:00
 default_executable: 
 dependencies: []