yaparc 0.0.3 → 0.0.4

data/README

@@ -15,7 +15,6 @@ This is a yet another simple combinator parser library in ruby.
   require 'rubygems'
   require_gem 'yaparc'
 
-  
 
 Please look at unit test files.
 

data/lib/yaparc.rb

@@ -1,10 +1,16 @@
+def assert_at(file,line, message = "")
+  unless yield
+    raise "Assertion failed !: #{file}, #{line}: #{message}"
+  end
+end
+
 
 module Yaparc
   module Parsable
     include Yaparc
-    
+
     attr_accessor :tree
-    
+
     IS_LOWER = lambda {|c| c >= 'a' and c <= 'z'}
     IS_ALPHANUM = lambda {|c| (c >= 'a' and c <= 'z') or (c >= '0' and c <= '9')}
     IS_DIGIT = lambda {|i| i > '0' and i < '9'}
@@ -28,24 +34,34 @@ module Yaparc
       tree = parse(input)
     end
 
-    def define_parser
-      raise
-    end
 
     module ClassMethods
       def included(mod)
       end
 
-#       def self.initialize
-#         @parser = @@parser
-#       end
-
       def define_parser(&block)
         @@parser = lambda do |input|
-          parser = yield 
+          parser = yield
           parser.parse(input)
         end
       end
+
+      def parser
+        @@parser
+      end
+
+      def parse(input, &block)
+        tree = @@parser.call(input)
+        if block_given?
+          @@tree = yield tree 
+        else
+          @@tree = tree
+        end
+      end
+#       def self.initialize
+#         @parser = @@parser
+#       end
+
     end
   end # of Parsable
 
@@ -79,6 +95,8 @@ module Yaparc
   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 == []
@@ -179,20 +197,21 @@ module Yaparc
 
   class ManyParser
     include Parsable
-    def initialize(predicate)
+    def initialize(parser)
       @parser = lambda do |input|
-        AltParser.new(ManyOneParser.new(predicate), SucceedParser.new([])).parse(input)
+        AltParser.new(ManyOneParser.new(parser), SucceedParser.new([])).parse(input)
       end
     end
   end
 
   class ManyOneParser
     include Parsable
-    def initialize(predicate)
+    def initialize(parser)
       @parser = lambda do |input|
         SeqParser.new(
-                      SatisfyParser.new(predicate),
-                      ManyParser.new(predicate)
+#                      SatisfyParser.new(parser),
+                      parser,
+                      ManyParser.new(parser)
                       ) do |v, vs|
           if vs == []
             v
@@ -220,7 +239,8 @@ module Yaparc
       @parser = lambda do |input|
         SeqParser.new(
                       SatisfyParser.new(IS_LOWER),
-                      ManyParser.new(IS_ALPHANUM)
+#                      ManyParser.new(IS_ALPHANUM)
+                      ManyParser.new(SatisfyParser.new(IS_ALPHANUM))
                       ) do |v, vs|
           if vs == []
             v
@@ -236,7 +256,8 @@ module Yaparc
     include Parsable
     def initialize
       @parser = lambda do |input|
-        SeqParser.new(ManyOneParser.new(IS_DIGIT)) do |vs|
+#        SeqParser.new(ManyOneParser.new(IS_DIGIT)) do |vs|
+        SeqParser.new(ManyOneParser.new(SatisfyParser.new(IS_DIGIT))) do |vs|
           if vs == []
             vs
           else
@@ -251,7 +272,8 @@ module Yaparc
     include Parsable
     def initialize
       @parser = lambda do |input|
-        SeqParser.new(ManyParser.new(IS_SPACE)) do |vs|
+#        SeqParser.new(ManyParser.new(IS_SPACE)) do |vs|
+        SeqParser.new(ManyParser.new(SatisfyParser.new(IS_SPACE))) do |vs|
           []
         end.parse(input)
       end

data/tests/test_calc.rb

@@ -1,4 +1,4 @@
-require 'lib/parser.rb'
+require 'lib/yaparc.rb'
 require 'test/unit'
 require 'pp'
 
@@ -7,16 +7,16 @@ require 'pp'
 class Expr
   include Yaparc::Parsable
 
-#   define_parser do
-#     AltParser.new(
-#                   SeqParser.new(Term.new,
-#                                 Symbol.new('+'),
-#                                 Expr.new) do |term, _, expr|
-#                     ['+', term,expr]
-#                   end,
-#                   Term.new
-#                   )
-#   end
+  define_parser do
+    AltParser.new(
+                  SeqParser.new(Term.new,
+                                Symbol.new('+'),
+                                Expr.new) do |term, _, expr|
+                    ['+', term,expr]
+                  end,
+                  Term.new
+                  )
+  end
 
   def initialize
     @parser = lambda do |input|
@@ -119,6 +119,7 @@ class YaparcCalcTest < Test::Unit::TestCase
 
   def setup
   end
+
   def test_expr
     parser = Expr.new
     result = parser.parse("1 + 2 ")
@@ -126,4 +127,12 @@ class YaparcCalcTest < Test::Unit::TestCase
     assert_equal 3, parser.eval("1 + 2 ")
     assert_equal 9, parser.eval("(1 + 2) * 3 ")
   end
+
+  def test_expr_define_parser
+    parser = Expr.new
+    result = Expr.parse("1 + 2 ")
+    assert_equal [[["+", 1, 2], ""]],  result
+    assert_equal 3, parser.eval("1 + 2 ")
+    assert_equal 9, parser.eval("(1 + 2) * 3 ")
+  end
 end

data/tests/test_parser.rb

@@ -1,4 +1,4 @@
-require 'lib/parser.rb'
+require 'lib/yaparc.rb'
 require 'test/unit'
 require 'pp'
 
@@ -132,8 +132,8 @@ class YaparcTest < Test::Unit::TestCase
   end
 
   def test_many_parse
-    is_digit = lambda {|i| i > '0' and i < '9'}
-
+#    is_digit = lambda {|i| i > '0' and i < '9'}
+    is_digit = SatisfyParser.new(lambda {|i| i > '0' and i < '9'})
     parser = ManyParser.new(is_digit)
     result = parser.parse("123abc")
     assert_equal [["123", "abc"]],  result
@@ -163,6 +163,14 @@ class YaparcTest < Test::Unit::TestCase
     assert_equal [[123, " abc"]],  result
   end
 
+  def test_nat_ident
+    parser = SeqParser.new(Nat.new, Ident.new) do |nat, ident|
+      [nat,ident]
+    end
+    result = parser.parse("123abc")
+    assert_equal [[[123, "abc"], ""]],  result
+  end
+
   def test_space
     parser = Space.new
     result = parser.parse("    abc")
@@ -187,5 +195,11 @@ class YaparcTest < Test::Unit::TestCase
     assert_equal [["%", ""]],  result
   end
 
+  def test_define_parser
+    parser = Symbol.new('%')
+    result = parser.parse(" % ")
+    assert_equal [["%", ""]],  result
+  end
+
 end
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.3
 specification_version: 1
 name: yaparc
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
-date: 2007-12-14 00:00:00 +09:00
+  version: 0.0.4
+date: 2008-01-05 00:00:00 +09:00
 summary: Yet Another Combinator Parser Library
 require_paths: 
 - lib
@@ -34,7 +34,6 @@ files:
 - tests/test_calc.rb
 - lib/parser_cps.rb
 - lib/yaparc.rb
-- lib/parser.rb
 - README
 test_files: 
 - tests/test_parser_cps.rb

data/lib/parser.rb

@@ -1,299 +0,0 @@
-
-module Yaparc
-  module Parsable
-    include Yaparc
-    
-    attr_accessor :tree
-    
-    IS_LOWER = lambda {|c| c >= 'a' and c <= 'z'}
-    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 == ' '}
-
-    def self.included(mod)
-      mod.extend ClassMethods
-    end
-
-
-    def parse(input, &block)
-      tree = @parser.call(input)
-      if block_given?
-        @tree = yield tree 
-      else
-        @tree = tree
-      end
-    end
-
-    def eval
-      tree = parse(input)
-    end
-
-    def define_parser
-      raise
-    end
-
-    module ClassMethods
-      def included(mod)
-      end
-
-#       def self.initialize
-#         @parser = @@parser
-#       end
-
-      def define_parser(&block)
-        @@parser = lambda do |input|
-          parser = yield 
-          parser.parse(input)
-        end
-      end
-    end
-  end # of Parsable
-
-  class SucceedParser
-    include Parsable
-    def initialize(value)
-      @parser = lambda {|input| [[value, input]]}
-    end
-  end
-
-  class FailParser
-    include Parsable
-    def initialize
-      @parser = lambda {|input| []}
-    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)
-      @parser = lambda do |input|
-        item = ItemParser.new.parse(input)
-        if item == []
-          FailParser.new.parse(input)
-        else
-          if predicate.call(item[0][0])
-            SucceedParser.new(item[0][0]).parse(item[0][1])
-          else
-            FailParser.new.parse(input)
-          end
-        end
-      end
-    end
-  end
-
-  class SeqParser
-    include Parsable
-    def initialize(*parsers, &block)
-      @parser = lambda do |input|
-        args = []
-        remains = parsers.inject(input) do |accumulator, parser|
-          result = parser.parse(accumulator)
-          unless result == []
-            args << result[0][0]
-            result[0][1]
-          else
-            break []
-          end
-        end
-        unless remains == []
-          retval = yield(*args)
-          [[retval, remains]]
-        else
-          []
-        end
-      end
-    end # of initialize
-  end # of SeqParser
-
-  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 CharParser
-    include Parsable
-    def initialize(char)
-      equal_char = lambda {|i| i == char}
-      @parser = lambda do |input|
-        SatisfyParser.new(equal_char).parse(input)
-      end
-    end
-  end
-
-  class StringParser
-    include Parsable
-    def initialize(string)
-      @parser = lambda do |input|
-        result = ItemParser.new.parse(string)
-        if result == []
-          SucceedParser.new(result).parse(input) # FailParser.new.parse(input)
-        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.parse(input)
-        end
-      end
-    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
-
-  class ManyParser
-    include Parsable
-    def initialize(predicate)
-      @parser = lambda do |input|
-        AltParser.new(ManyOneParser.new(predicate), SucceedParser.new([])).parse(input)
-      end
-    end
-  end
-
-  class ManyOneParser
-    include Parsable
-    def initialize(predicate)
-      @parser = lambda do |input|
-        SeqParser.new(
-                      SatisfyParser.new(predicate),
-                      ManyParser.new(predicate)
-                      ) do |v, vs|
-          if vs == []
-            v
-          else
-            v + vs.to_s
-          end
-        end.parse(input)
-      end
-    end
-  end
-
-  class ZeroOneParser
-    include Parsable
-    def initialize(parser)
-      @parser = lambda do |input|
-        AltParser.new(parser, 
-                      SucceedParser.new([])).parse(input)
-      end
-    end
-  end
-
-  class Ident
-    include Parsable
-    def initialize
-      @parser = lambda do |input|
-        SeqParser.new(
-                      SatisfyParser.new(IS_LOWER),
-                      ManyParser.new(IS_ALPHANUM)
-                      ) do |v, vs|
-          if vs == []
-            v
-          else
-            v + vs.to_s
-          end
-        end.parse(input)
-      end
-    end
-  end
-
-  class Nat
-    include Parsable
-    def initialize
-      @parser = lambda do |input|
-        SeqParser.new(ManyOneParser.new(IS_DIGIT)) do |vs|
-          if vs == []
-            vs
-          else
-            vs.to_i
-          end
-        end.parse(input)
-      end
-    end
-  end
-
-  class Space
-    include Parsable
-    def initialize
-      @parser = lambda do |input|
-        SeqParser.new(ManyParser.new(IS_SPACE)) do |vs|
-          []
-        end.parse(input)
-      end
-    end
-  end
-
-  class Token
-    include Parsable
-    def initialize(parser)
-      @parser = lambda do |input|
-        SeqParser.new(Space.new, parser, Space.new) do |_, vs, _|
-          vs
-        end.parse(input)
-      end
-    end
-  end
-
-  class Identifier
-    include Parsable
-    def initialize
-      @parser = lambda do |input|
-        Token.new(Ident.new).parse(input)
-      end
-    end
-  end
-
-  class Natural
-    include Parsable
-    def initialize
-      @parser = lambda do |input|
-        Token.new(Nat.new).parse(input)
-      end
-    end
-  end
-
-  class Symbol
-    include Parsable
-    def initialize(literal)
-      @parser = lambda do |input|
-        Token.new(StringParser.new(literal)).parse(input)
-      end
-    end
-  end
-
-end