yaparc 0.0.9 → 0.1.0

data/lib/yaparc.rb

@@ -6,9 +6,27 @@ end
 
 
 module Yaparc
-  module Parsable
-    include Yaparc
+  module Result
+    class Base
+      attr_accessor :message, :input, :value
+      def initialize(options = {})
+        @message = options[:message] if options[:message]
+        @input = options[:input] if options[:input]
+        @value = options[:value] if options[:value]
+      end
+    end
+
+    class OK < Base
+    end
+
+    class Fail < Base
+    end
+
+    class Error < Base
+    end
+  end # of module Result
 
+  module Parsable
     attr_accessor :tree
 
     IS_LOWER = lambda {|c| c >= 'a' and c <= 'z'}
@@ -66,23 +84,7 @@ module Yaparc
     end
   end # of Module Parsable
 
-  class Result
-    attr_accessor :message, :input, :value
-    def initialize(options = {})
-      @message = options[:message] if options[:message]
-      @input = options[:input] if options[:input]
-      @value = options[:value] if options[:value]
-    end
-  end
-
-  class OK < Result
-  end
-
-  class Fail < Result
-  end
 
-  class Error < Result
-  end
 
   class SucceedParser
     include Parsable
@@ -90,7 +92,7 @@ module Yaparc
     def initialize(value, remaining = nil)
       @parser = lambda do |input|
 #        [[value, input]]
-        OK.new(:value => value, :input => input)
+        Result::OK.new(:value => value, :input => input)
       end
       @remaining = remaining
     end
@@ -100,7 +102,7 @@ module Yaparc
     include Parsable
     def initialize
       @parser = lambda do |input|
-        Fail.new
+        Result::Fail.new
       end
     end
   end
@@ -111,10 +113,10 @@ module Yaparc
     def initialize
       @parser = lambda do |input|
         if input.nil? or input.empty?
-          Fail.new
+          Result::Fail.new
         else
 #          [[input[0..0],input[1..input.length]]]
-          OK.new(:value => input[0..0],:input => input[1..input.length])
+          Result::OK.new(:value => input[0..0],:input => input[1..input.length])
         end
       end
     end
@@ -127,7 +129,7 @@ module Yaparc
 
       @parser = lambda do |input|
         case result = ItemParser.new.parse(input)
-        when Fail
+        when Result::Fail
           FailParser.new
         else
           parser = if predicate.call(result.value)
@@ -158,11 +160,11 @@ module Yaparc
     def initialize(*parsers, &block)
       @parser = lambda do |input|
         args = []
-        initial_result = OK.new(:input => input)
+        initial_result = Result::OK.new(:input => input)
         final_result = parsers.inject(initial_result) do |subsequent, parser|
           case result = parser.parse(subsequent.input)
-          when Fail
-            break Fail.new
+          when Result::Fail
+            break Result::Fail.new
           else
             args << result.value
             result
@@ -170,15 +172,15 @@ module Yaparc
         end
 
         case final_result
-        when Fail
-          Fail.new
-        when OK
+        when Result::Fail
+          Result::Fail.new
+        when Result::OK
           final_value = if block_given?
                      yield(*args)
                    else
                      args.last
                    end
-          OK.new(:value => final_value, :input => final_result.input)
+          Result::OK.new(:value => final_value, :input => final_result.input)
         else
           raise
         end
@@ -191,14 +193,14 @@ module Yaparc
     include Parsable
     def initialize(*parsers)
       @parser = lambda do |input|
-        initial_result = OK.new(:input => input)
-        final_result = Fail.new
+        initial_result = Result::OK.new(:input => input)
+        final_result = Result::Fail.new
 #        final_result = Error.new
         parsers.each do |parser|
           case result = parser.parse(initial_result.input)
-          when Fail
+          when Result::Fail
             next
-          when OK
+          when Result::OK
             break final_result = result
           else
             raise
@@ -216,9 +218,9 @@ module Yaparc
     def initialize(parser, &block)
       @parser = lambda do |input|
         case result = parser.parse(input)
-        when OK
+        when Result::OK
           SucceedParser.new(yield(result.value)).parse(result.input)
-        when Fail
+        when Result::Fail
           FailParser.new.parse(input)
         else
           raise
@@ -233,9 +235,9 @@ module Yaparc
     def initialize(string)
       @parser = lambda do |input|
         case result = ItemParser.new.parse(string)
-        when Fail
+        when Result::Fail
           SucceedParser.new(result) # Is it OK?
-        when OK
+        when Result::OK
           SeqParser.new(
                         CharParser.new(result.value),
                         StringParser.new(result.input),
@@ -260,9 +262,9 @@ module Yaparc
     def initialize(regex)
       @parser = lambda do |input|
         if match = Regexp.new(regex).match(input)
-          OK.new(:value => match[0], :input => match.post_match)
+          Result::OK.new(:value => match[0], :input => match.post_match)
         else
-          Fail.new
+          Result::Fail.new
         end
       end
     end
@@ -378,9 +380,9 @@ module Yaparc
         @parser = lambda do |input|
           keyword_parsers = keywords.map {|keyword| StringParser.new(keyword)}
           case result = AltParser.new(*keyword_parsers).parse(input)
-          when OK
+          when Result::OK
             FailParser.new
-          when Fail
+          when Result::Fail
             Token.new(Ident.new)
           else
             raise

data/tests/test_calc.rb

@@ -87,7 +87,7 @@ class Factor < Yaparc::AbstractParser
 
   def initialize
     @parser = lambda do
-      AltParser.new(
+      Yaparc::AltParser.new(
                     Yaparc::SeqParser.new(
                                           Yaparc::Symbol.new('('),
                                           Expr.new,
@@ -125,7 +125,7 @@ class YaparcCalcTest < Test::Unit::TestCase
 
   def test_expr
     result = @expr.parse("1 + 2 ")
-    assert_instance_of OK,  result
+    assert_instance_of Result::OK,  result
     assert_equal ["+", 1, 2],  result.value
     assert_equal "",  result.input
     assert_equal 3, @expr.evaluate("1 + 2 ")

data/tests/test_parser.rb

@@ -38,7 +38,7 @@ class YaparcTest < Test::Unit::TestCase
   def test_fail_parse
     parser = ::Yaparc::FailParser.new
     result = parser.parse("abc")
-    assert_instance_of Fail,  result
+    assert_instance_of Result::Fail,  result
   end
 
 #   def test_fail_parse
@@ -50,7 +50,7 @@ class YaparcTest < Test::Unit::TestCase
   def test_item_parse
     parser = ::Yaparc::ItemParser.new
     result = parser.parse("")
-    assert_instance_of Fail,  result
+    assert_instance_of Result::Fail,  result
     result = parser.parse("abc")
     assert_equal "a",  result.value
     assert_equal "bc",  result.input
@@ -80,7 +80,7 @@ class YaparcTest < Test::Unit::TestCase
 
     parser = SatisfyParser.new(is_integer)
     result = parser.parse("abc")
-    assert_instance_of Fail,  result
+    assert_instance_of Result::Fail,  result
 
     is_char = lambda do |i|
       begin
@@ -196,7 +196,7 @@ class YaparcTest < Test::Unit::TestCase
 
     parser = AltParser.new(FailParser.new, FailParser.new)
     result = parser.parse("abc")
-    assert_instance_of Fail,  result
+    assert_instance_of Result::Fail,  result
   end
 
 
@@ -233,7 +233,7 @@ class YaparcTest < Test::Unit::TestCase
 
     parser = CharParser.new("a")
     result = parser.parse("123")
-    assert_instance_of Fail,  result
+    assert_instance_of Result::Fail,  result
   end
 
 #   def test_char_parse
@@ -254,7 +254,7 @@ class YaparcTest < Test::Unit::TestCase
 
     parser = StringParser.new("abc")
     result = parser.parse("ab1234")
-    assert_instance_of Fail,  result
+    assert_instance_of  Result::Fail,  result
   end
 
 #   def test_string_parse
@@ -397,7 +397,7 @@ class YaparcTest < Test::Unit::TestCase
 
     parser_with_keyword = Identifier.new("abc","efg")
     result = parser_with_keyword.parse("abc")
-    assert_instance_of Fail,  result
+    assert_instance_of Result::Fail,  result
     result = parser_with_keyword.parse(" xyz")
     assert_equal "xyz",  result.value
     assert_equal "",  result.input

metadata

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