yaparc 0.1.3 → 0.1.4

data/lib/yaparc.rb

@@ -26,6 +26,7 @@ module Yaparc
     IS_ALPHANUM = lambda {|c| (c >= 'a' and c <= 'z') or (c >= '0' and c <= '9')}
     IS_DIGIT = lambda {|i| i >= '0' and i <= '9'}
     IS_SPACE = lambda {|i| i == ' '}
+    IS_WHITESPACE = lambda {|i| i == ' ' or i == "\n" or i == "\t"}
 
     def self.included(mod)
       mod.extend ClassMethods
@@ -343,15 +344,25 @@ module Yaparc
   class Space < ParserBase
     def initialize
       @parser = SeqParser.new(ManyParser.new(SatisfyParser.new(IS_SPACE))) do |vs|
-        []
+        SucceedParser.new([])
+      end
+    end
+  end
+
+  class WhiteSpace < ParserBase
+    def initialize
+      @parser = SeqParser.new(ManyParser.new(SatisfyParser.new(IS_WHITESPACE))) do |vs|
+        SucceedParser.new([])
       end
     end
   end
 
   class Token < ParserBase
+    attr_accessor :prefix, :postfix
 
-    def initialize(parser, prefix = Space.new, postfix = Space.new)
-      @parser = SeqParser.new(prefix, parser, postfix) do |_, vs, _|
+    def initialize(parser, prefix = WhiteSpace.new, postfix = WhiteSpace.new)
+      @prefix, @postfix  = prefix, postfix
+      @parser = SeqParser.new(@prefix, parser, @postfix) do |_, vs, _|
         vs
       end
     end

data/tests/test_parser.rb

@@ -223,7 +223,14 @@ class YaparcTest < Test::Unit::TestCase
   def test_space
     parser = Space.new
     result = parser.parse("    abc")
-    assert_equal [],  result.value
+    assert_instance_of Result::OK,  result
+    assert_equal "abc",  result.input
+  end
+
+  def test_whitespace
+    parser = WhiteSpace.new
+    result = parser.parse(" \n   abc")
+    assert_instance_of Result::OK,  result
     assert_equal "abc",  result.input
   end
 

metadata

@@ -1,52 +1,59 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.3
-specification_version: 1
 name: yaparc
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
-date: 2008-01-20 00:00:00 +09:00
-summary: Yet Another Combinator Parser Library
-require_paths: 
-- lib
-email: akimichi_tatsukawa@nifty.com
-homepage: http://rubyforge.org/projects/yaparc/
-rubyforge_project: 
-description: 
-autorequire: yaparc
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  version: 0.1.4
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - Akimichi Tatsukawa
+autorequire: yaparc
+bindir: bin
+cert_chain: []
+
+date: 2008-02-07 00:00:00 +09:00
+default_executable: 
+dependencies: []
+
+description: 
+email: akimichi_tatsukawa@nifty.com
+executables: []
+
+extensions: []
+
+extra_rdoc_files: 
+- README
 files: 
 - tests/test_parser.rb
 - tests/test_calc.rb
 - tests/test_sql.rb
 - lib/yaparc.rb
 - README
-test_files: 
-- tests/test_parser.rb
-- tests/test_calc.rb
-- tests/test_sql.rb
+has_rdoc: true
+homepage: http://rubyforge.org/projects/yaparc/
+post_install_message: 
 rdoc_options: []
 
-extra_rdoc_files: 
-- README
-executables: []
-
-extensions: []
-
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 requirements: []
 
-dependencies: []
-
+rubyforge_project: 
+rubygems_version: 1.0.1
+signing_key: 
+specification_version: 2
+summary: Yet Another Combinator Parser Library
+test_files: 
+- tests/test_parser.rb
+- tests/test_calc.rb
+- tests/test_sql.rb