yaparc 0.0.8 → 0.0.9

data/lib/yaparc.rb

@@ -30,14 +30,6 @@ module Yaparc
       end
       result
     end
-#     def parse(input, &block)
-#       result = @parser.call(input)
-#       if block_given?
-#         @tree = yield result
-#       else
-#         @tree = result
-#       end
-#     end
 
     def eval
       tree = parse(input)
@@ -103,16 +95,6 @@ module Yaparc
       @remaining = remaining
     end
   end
-#   class SucceedParser
-#     include Parsable
-#     attr_reader :remaining
-#     def initialize(value, remaining = nil)
-#       @parser = lambda do |input|
-#         [[value, input]]
-#       end
-#       @remaining = remaining
-#     end
-#   end
 
   class FailParser
     include Parsable
@@ -123,14 +105,6 @@ module Yaparc
     end
   end
 
-#   class FailParser
-#     include Parsable
-#     def initialize
-#       @parser = lambda do |input|
-#         []
-#       end
-#     end
-#   end
 
   class ItemParser
     include Parsable
@@ -146,19 +120,6 @@ module Yaparc
     end
   end
 
-#   class ItemParser
-#     include Parsable
-#     def initialize
-#       @parser = lambda do |input|
-#         if input.nil? or input.empty?
-#           []
-#         else
-#           [[input[0..0],input[1..input.length]]]
-#         end
-#       end
-#     end
-#   end
-
   class SatisfyParser
     include Parsable
     def initialize(predicate)
@@ -190,37 +151,6 @@ module Yaparc
     end
   end
 
-#   class SatisfyParser
-#     include Parsable
-#     def initialize(predicate)
-#       assert_at(__FILE__,__LINE__){predicate.instance_of?(Proc)}
-
-#       @parser = lambda do |input|
-#         item = ItemParser.new.parse(input)
-#         if item == []
-#           FailParser.new
-#         else
-#           parser = if predicate.call(item[0][0])
-#                      SucceedParser.new(item[0][0], item[0][1])
-#                    else
-#                      FailParser.new
-#                    end
-#         end
-#       end
-#     end
-
-#     def parse(input)
-#       case parser = @parser.call(input)
-#       when SucceedParser
-#         parser.parse(parser.remaining)
-#       when FailParser
-#         parser.parse(input)
-#       else
-#         raise
-#       end
-#     end
-
-#   end
 
 
   class SeqParser
@@ -256,34 +186,6 @@ module Yaparc
     end # of initialize
   end # of SeqParser
 
-#   class SeqParser
-#     include Parsable
-#     def initialize(*parsers, &block)
-#       @parser = lambda do |input|
-#         args = []
-#         remains = parsers.inject(input) do |accumulator, parser|
-#           result = parser.parse(accumulator)
-#           if result == []
-#             break []
-#           else
-#             args << result[0][0]
-#             result[0][1]
-#           end
-#         end
-#         if remains == []
-#           []
-#         else
-#           retval = if block_given?
-#                      yield(*args)
-#                    else
-#                      args.last
-#                    end
-#           [[retval, remains]]
-#         end
-#       end
-#     end # of initialize
-
-#   end # of SeqParser
 
   class AltParser
     include Parsable
@@ -291,6 +193,7 @@ module Yaparc
       @parser = lambda do |input|
         initial_result = OK.new(:input => input)
         final_result = Fail.new
+#        final_result = Error.new
         parsers.each do |parser|
           case result = parser.parse(initial_result.input)
           when Fail
@@ -306,38 +209,25 @@ module Yaparc
     end # of initialize
   end
 
-#   class AltParser
-#     include Parsable
-#     def initialize(*parsers)
-#       @parser = lambda do |input|
-#         parsers.inject([]) do |accum, parser|
-#           result = parser.parse(input)
-#           if result == []
-#             result
-#           else
-#             break [result[0]]
-#           end
-#         end
-#       end
-#     end # of initialize
-#   end
 
 
   class ApplyParser
     include Parsable
     def initialize(parser, &block)
       @parser = lambda do |input|
-        args = nil
-        result = parser.parse(input)
-        if result == []
+        case result = parser.parse(input)
+        when OK
+          SucceedParser.new(yield(result.value)).parse(result.input)
+        when Fail
           FailParser.new.parse(input)
         else
-          SucceedParser.new(yield(result[0][0])).parse(result[0][1])
+          raise
         end
       end
     end # of initialize
   end # of ApplyParser
 
+
   class StringParser
     include Parsable
     def initialize(string)
@@ -364,31 +254,6 @@ module Yaparc
     end
   end
 
-#   class StringParser
-#     include Parsable
-#     def initialize(string)
-#       @parser = lambda do |input|
-#         result = ItemParser.new.parse(string)
-#         if result == []
-#           SucceedParser.new(result)
-#         else
-#           SeqParser.new(
-#                         CharParser.new(result[0][0]),
-#                         StringParser.new(result[0][1]),
-#                         SucceedParser.new(result[0][0] + result[0][1])
-#                         ) do |char_result, string_result, succeed_result|
-#             succeed_result
-#           end
-#         end
-#       end
-#     end
-
-#     def parse(input)
-#       @parser.call(input).parse(input)
-#     end
-#   end
-
-
   class RegexParser
     include Parsable
 
@@ -403,26 +268,12 @@ module Yaparc
     end
   end
 
-#   class RegexParser
-#     include Parsable
-
-#     def initialize(regex)
-#       @parser = lambda do |input|
-#         if match = Regexp.new(regex).match(input)
-#           [[match[0],match.post_match]]
-#         else
-#           []
-#         end
-#       end
-#     end
-#   end
-
   # permits zero or more applications of parser.
   class ManyParser
     include Parsable
-    def initialize(parser)
+    def initialize(parser, identity = "")
       @parser = lambda do |input|
-        AltParser.new(ManyOneParser.new(parser), SucceedParser.new("")).parse(input)
+        AltParser.new(ManyOneParser.new(parser, identity), SucceedParser.new(identity)).parse(input)
       end
     end
 
@@ -431,27 +282,14 @@ module Yaparc
     end
   end
 
-#   class ManyParser
-#     include Parsable
-#     def initialize(parser)
-#       @parser = lambda do |input|
-#         AltParser.new(ManyOneParser.new(parser), SucceedParser.new([])).parse(input)
-#       end
-#     end
-
-#     def parse(input)
-#       @parser.call(input)
-#     end
-#   end
-
   # requires at least one successfull application of parser.
   class ManyOneParser
     include Parsable
-    def initialize(parser)
+    def initialize(parser, identity = "")
       @parser = lambda do |input|
         SeqParser.new(
                       parser,
-                      ManyParser.new(parser)
+                      ManyParser.new(parser, identity)
                       ) do |head, tail|
           head + tail
         end
@@ -463,29 +301,6 @@ module Yaparc
     end
   end
 
-#   class ManyOneParser
-#     include Parsable
-#     def initialize(parser)
-#       @parser = lambda do |input|
-#         SeqParser.new(
-#                       parser,
-#                       ManyParser.new(parser)
-#                       ) do |v, vs|
-#           if vs == []
-#             v
-#           else
-#             v + vs.to_s
-#           end
-#         end
-#       end
-#     end
-
-#     def parse(input)
-#       @parser.call(input).parse(input)
-#     end
-#   end
-
-
   class ParserBase
     include Parsable
 
@@ -502,14 +317,6 @@ module Yaparc
     end
   end
 
-#   class CharParser < ParserBase
-
-#     def initialize(char)
-#       equal_char = lambda {|i| i == char}
-#       @parser = SatisfyParser.new(equal_char)
-#     end
-#   end
-
 
   class ZeroOneParser < ParserBase
     def initialize(parser)
@@ -517,13 +324,6 @@ module Yaparc
     end
   end
 
-#   class ZeroOneParser < ParserBase
-#     def initialize(parser)
-#       @parser = AltParser.new(parser, SucceedParser.new([]))
-#     end
-#   end
-
-
   class Ident < ParserBase
     def initialize
       @parser = SeqParser.new(
@@ -535,21 +335,6 @@ module Yaparc
     end
   end
 
-#   class Ident < ParserBase
-#     def initialize
-#       @parser = SeqParser.new(
-#                               SatisfyParser.new(IS_LOWER),
-#                               ManyParser.new(SatisfyParser.new(IS_ALPHANUM))
-#                               ) do |v, vs|
-#         if vs == []
-#           v
-#         else
-#           v + vs.to_s
-#         end
-#       end
-#     end
-#   end
-
   class Nat < ParserBase
     def initialize
       @parser = SeqParser.new(ManyOneParser.new(SatisfyParser.new(IS_DIGIT))) do |vs|
@@ -562,19 +347,6 @@ module Yaparc
     end
   end
 
-#   class Nat < ParserBase
-
-#     def initialize
-#       @parser = SeqParser.new(ManyOneParser.new(SatisfyParser.new(IS_DIGIT))) do |vs|
-#         if vs == []
-#           vs
-#         else
-#           vs.to_i
-#         end
-#       end
-#     end
-#   end
-
 
   class Space < ParserBase
     def initialize
@@ -584,15 +356,6 @@ module Yaparc
     end
   end
 
-#   class Space < ParserBase
-
-#     def initialize
-#       @parser = SeqParser.new(ManyParser.new(SatisfyParser.new(IS_SPACE))) do |vs|
-#         []
-#       end
-#     end
-#   end
-
   class Token < ParserBase
 
     def initialize(parser, prefix = Space.new, postfix = Space.new)
@@ -631,30 +394,6 @@ module Yaparc
     end
   end
 
-#   class Identifier
-#     include Parsable
-#     def initialize(*keywords)
-#       if keywords == []
-#         @parser = lambda do |input|
-#           Token.new(Ident.new)
-#         end
-#       else
-#         @parser = lambda do |input|
-#           keyword_parsers = keywords.map {|keyword| StringParser.new(keyword)}
-#           result = AltParser.new(*keyword_parsers).parse(input)
-#           unless result == []
-#             FailParser.new
-#           else
-#             Token.new(Ident.new)
-#           end
-#         end
-#       end
-#     end
-
-#     def parse(input)
-#       @parser.call(input).parse(input)
-#     end
-#   end
 
   class Natural < ParserBase
 
@@ -663,12 +402,6 @@ module Yaparc
     end
   end
 
-#   class Natural < ParserBase
-
-#     def initialize
-#       @parser = Token.new(Nat.new)
-#     end
-#   end
 
   class Symbol < ParserBase
 
@@ -687,8 +420,6 @@ module Yaparc
       else
         @tree = tree
       end
-
     end
   end
-
 end # of Yaparc

data/tests/test_parser.rb

@@ -214,15 +214,16 @@ class YaparcTest < Test::Unit::TestCase
 #     assert_equal [],  result
 #   end
 
-#   def test_apply_parse
-#     is_digit = lambda {|i| i >= '0' and i <= '9'}
-#     parser = ApplyParser.new(SatisfyParser.new(is_digit)) do |digit|
-#       digit.to_i - '0'.to_i
-#     end
+  def test_apply_parse
+    is_digit = lambda {|i| i >= '0' and i <= '9'}
+    parser = ApplyParser.new(SatisfyParser.new(is_digit)) do |digit|
+      digit.to_i - '0'.to_i
+    end
 
-#     result = parser.parse('7')
-#     assert_equal [[7, ""]],  result
-#   end
+    result = parser.parse('7')
+    assert_equal 7,  result.value
+    assert_equal "",  result.input
+  end
 
   def test_char_parse
     parser = CharParser.new("a")

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.3
 specification_version: 1
 name: yaparc
 version: !ruby/object:Gem::Version 
-  version: 0.0.8
-date: 2008-01-10 00:00:00 +09:00
+  version: 0.0.9
+date: 2008-01-11 00:00:00 +09:00
 summary: Yet Another Combinator Parser Library
 require_paths: 
 - lib