rparsec2 1.2.1 → 1.3.0

data/lib/rparsec/many_parser.rb

@@ -0,0 +1,27 @@
+require "rparsec/parser"
+
+module RParsec
+  class ManyParser < Parser # :nodoc:
+    init :parser, :least
+    def _parse ctxt
+      result = []
+      @least.times do
+        return false unless @parser._parse ctxt
+        result << ctxt.result
+      end
+      while true
+        ind = ctxt.index
+        if @parser._parse ctxt
+          result << ctxt.result
+          return ctxt.retn(result) if ind == ctxt.index # infinite loop
+          next
+        end
+        if ind == ctxt.index
+          return ctxt.retn(result)
+        else
+          return false
+        end
+      end
+    end
+  end
+end

data/lib/rparsec/map_current_parser.rb

@@ -0,0 +1,11 @@
+require "rparsec/parser"
+
+module RParsec
+  class MapCurrentParser < Parser # :nodoc:
+    init :proc
+    def _parse ctxt
+      ctxt.result = @proc.call(ctxt.result)
+      true
+    end
+  end
+end

data/lib/rparsec/map_parser.rb

@@ -0,0 +1,12 @@
+require "rparsec/parser"
+
+module RParsec
+  class MapParser < Parser # :nodoc:
+    init :parser, :proc
+    def _parse ctxt
+      return false unless @parser._parse(ctxt)
+      ctxt.result = @proc.call(ctxt.result)
+      true
+    end
+  end
+end

data/lib/rparsec/mapn_current_parser.rb

@@ -0,0 +1,11 @@
+require "rparsec/parser"
+
+module RParsec
+  class MapnCurrentParser < Parser # :nodoc:
+    init :proc
+    def _parse ctxt
+      ctxt.result = @proc.call(*ctxt.result)
+      true
+    end
+  end
+end

data/lib/rparsec/mapn_parser.rb

@@ -0,0 +1,12 @@
+require "rparsec/parser"
+
+module RParsec
+  class MapnParser < Parser # :nodoc:
+    init :parser, :proc
+    def _parse ctxt
+      return false unless @parser._parse(ctxt)
+      ctxt.result = @proc.call(*ctxt.result)
+      true
+    end
+  end
+end

data/lib/rparsec/nested_parser.rb

@@ -0,0 +1,47 @@
+require "rparsec/parser"
+require "rparsec/context"
+
+module RParsec
+  class NestedParser < Parser # :nodoc:
+    init :parser1, :parser2
+    def _parse ctxt
+      ind = ctxt.index
+      return false unless @parser1._parse ctxt
+      _run_nested(ind, ctxt, ctxt.result, @parser2)
+    end
+    private
+    def _run_nested(start, ctxt, src, parser)
+      ctxt.error = nil
+      new_ctxt = nil
+      if src.kind_of? String
+        new_ctxt = ParseContext.new(src)
+        return true if _run_parser parser, ctxt, new_ctxt
+        ctxt.index = start + new_ctxt.index
+      elsif src.kind_of? Array
+        new_ctxt = ParseContext.new(src)
+        return true if _run_parser parser, ctxt, new_ctxt
+        ctxt.index = start + _get_index(new_ctxt) unless new_ctxt.eof
+      else
+        new_ctxt = ParseContext.new([src])
+        return true if _run_parser parser, ctxt, new_ctxt
+        ctxt.index = ind unless new_ctxt.eof
+      end
+      ctxt.error.index = ctxt.index
+      false
+    end
+    def _get_index ctxt
+      cur = ctxt.current
+      return cur.index if cur.respond_to? :index
+      ctxt.index
+    end
+    def _run_parser parser, old_ctxt, new_ctxt
+      if parser._parse new_ctxt
+        old_ctxt.result = new_ctxt.result
+        true
+      else
+        old_ctxt.error = new_ctxt.error
+        false
+      end
+    end
+  end
+end

data/lib/rparsec/not_parser.rb

@@ -0,0 +1,27 @@
+require "rparsec/look_ahead_sensitive_parser"
+
+module RParsec
+  class NotParser < LookAheadSensitiveParser # :nodoc:
+    def initialize(parser, msg, la = 1)
+      super(la)
+      @parser = parser
+      @msg = msg
+      @name = "~#{parser.name}"
+    end
+    def _parse ctxt
+      ind = ctxt.index
+      if @parser._parse ctxt
+        ctxt.index = ind
+        return ctxt.expecting(@msg)
+      end
+      return ctxt.retn(nil) if visible(ctxt, ind)
+      return false
+    end
+    def withLookahead(n)
+      NotParser.new(@parser, @msg, n)
+    end
+    def not()
+      @parser
+    end
+  end
+end

data/lib/rparsec/one_parser.rb

@@ -0,0 +1,9 @@
+require "rparsec/parser"
+
+module RParsec
+  class OneParser < Parser # :nodoc:
+    def _parse _ctxt
+      true
+    end
+  end
+end

data/lib/rparsec/operator_table.rb

@@ -1,8 +1,25 @@
 module RParsec
   #
   # This class holds information about operator precedences and
-  # associativities.  #prefix, #postfix, #infixl, #infixr, #infixn can
-  # be called to register operators.
+  # associativities.  +prefix+, +postfix+, +infixl+, +infixr+, +infixn+ can be
+  # called to register operators.
+  #
+  # +prefix+ :: Defines a prefix operator that returns a unary +Proc+ object
+  #             with a precedence associated.  Returns +self+.
+  #
+  # +postfix+ :: Defines a postfix operator that returns a unary +Proc+ object
+  #              with a precedence associated.  Returns +self+.
+  #
+  # +infixl+ :: Defines a left associative infix operator that returns a
+  #             binary +Proc+ object with a precedence associated. Returns
+  #             +self+.
+  #
+  # +infixr+ :: Defines a right associative infix operator that returns a
+  #             binary +Proc+ object with a precedence associated. Returns
+  #             +self+.
+  #
+  # +infixn+ :: Defines a non-associative infix operator that returns a binary
+  #             +Proc+ object with a precedence associated. Returns +self+.
   #
   class OperatorTable
 
@@ -12,15 +29,8 @@ module RParsec
     attr_reader :operators # :nodoc:
 
     #
-    # Re-initialize the operator table.
-    #
-    def reinit # :nodoc:
-      @operators = []
-    end
-
-    #
-    # To create an OperatorTable instance.  If a block is given, it is
-    # invoked to do post-instantiation.  For example:
+    # To create an OperatorTable instance.  If a block is given, it is invoked
+    # to do post-instantiation.  For example:
     #
     #   OperatorTable.new do |tbl|
     #     tbl.infixl(char(?+) >> Plus, 10)
@@ -30,60 +40,16 @@ module RParsec
     #     tbl.prefix(char(?-) >> Neg, 50)
     #   end
     #
-    def self.new
-      this = allocate
-      this.reinit
-      if block_given?
-        yield this
-      end
-      this
-    end
-
-    #
-    # Defines a prefix operator that returns a unary +Proc+ object with a precedence associated.
-    # Returns +self+.
-    #
-    def prefix(op, precedence)
-      add(:prefix, op, precedence)
-    end
-
-    #
-    # Defines a postfix operator that returns a unary +Proc+ object with a precedence associated.
-    # Returns +self+.
-    #
-    def postfix(op, precedence)
-      add(:postfix, op, precedence)
-    end
-
-    #
-    # Defines a left associative infix operator that returns a binary +Proc+ object with a precedence
-    # associated. Returns +self+.
-    #
-    def infixl(op, precedence)
-      add(:infixl, op, precedence)
-    end
-
-    #
-    # Defines a right associative infix operator that returns a binary +Proc+ object with a precedence
-    # associated. Returns +self+.
-    #
-    def infixr(op, precedence)
-      add(:infixr, op, precedence)
-    end
-
-    #
-    # Defines a non-associative infix operator that returns a binary +Proc+ object with a precedence
-    # associated. Returns +self+.
-    #
-    def infixn(op, precedence)
-      add(:infixn, op, precedence)
+    def initialize
+      @operators = []
+      block_given? and yield self
     end
 
-    private
-
-    def add(*entry)
-      @operators << entry
-      self
+    %i[prefix postfix infixl infixr infixn].each do |method|
+      define_method(method) do |op, precedence|
+        @operators << [method, op, precedence]
+        self
+      end
     end
   end
 end

data/lib/rparsec/parser.rb

@@ -2,7 +2,7 @@
 
 require "rparsec/functors"
 require "rparsec/monad"
-require "rparsec/misc"
+require "rparsec/def_helper"
 require "rparsec/parser_monad"
 require "rparsec/context"
 require "rparsec/error"
@@ -17,7 +17,6 @@ module RParsec
   class Parser
     include Functors
     include Monad
-    extend DefHelper
     MyMonad = ParserMonad.new
     attr_accessor :name
 
@@ -47,8 +46,14 @@ module RParsec
 
     def _display_current_input(input, _code, _index)
       return 'EOF' if input.nil?
-      c = input
-      case c when Integer then "'" << c << "'" when Token then c.text else c.to_s end
+      case (c = input)
+      when Integer
+        "'" << c << "'"
+      when Token
+        c.text
+      else
+        c.to_s
+      end
     end
 
     def _add_encountered_error(msg, encountered)
@@ -78,16 +83,6 @@ module RParsec
              _display_current_input(ctxt.error.input, src, ctxt.index)), src)
     end
 
-    #
-    # Set name for the parser.  +self+ is returned.
-    #
-    def set_name(nm)
-      @name = nm
-      self
-    end
-
-    alias setName set_name
-
     #
     # <tt>a.map { |x| x + 1 }</tt> will first execute parser +a+, when
     # it succeeds, the associated block is executed to transform the
@@ -128,14 +123,14 @@ module RParsec
     # input consumption is undone.
     #
     def atomize
-      AtomParser.new(self).setName(@name)
+      AtomParser.new(self).tap { |p| p.name = @name }
     end
 
     #
     # Create a new parser that looks at inputs whthout consuming them.
     #
     def peek
-      PeekParser.new(self).setName(@name)
+      PeekParser.new(self).tap { |p| p.name = @name }
     end
 
     #
@@ -144,6 +139,7 @@ module RParsec
     def not(msg = "#{self} unexpected")
       NotParser.new(self, msg)
     end
+    alias ~ not
 
     #
     # To create a parser that does "look ahead" for _n_ inputs.
@@ -168,6 +164,7 @@ module RParsec
     def followed(other)
       FollowedParser.new(self, other)
     end
+    alias << followed
 
     #
     # To create a parser that repeats +self+ for a minimum +min+
@@ -184,6 +181,7 @@ module RParsec
         Some_Parser.new(self, min, max)
       end
     end
+    alias * repeat_
 
     #
     # To create a parser that repeats +self+ for a minimum +min+
@@ -460,10 +458,6 @@ module RParsec
       Parsers.sequence(operator, operand, &Idn)
     end
 
-    alias ~ not
-    alias << followed
-    alias * repeat_
-
     def _parse(_ctxt)
       false
     end

data/lib/rparsec/parser_monad.rb

@@ -3,23 +3,10 @@
 module RParsec
 
   class ParserMonad # :nodoc:
-    def fail msg
-      FailureParser.new(msg)
-    end
-
-    def value v
-      return Nil if v.nil?
-      ValueParser.new(v);
-    end
-
-    def bind(v, &proc)
-      return v unless proc
-      BoundParser.new(v, proc);
-    end
-
-    def mplus(p1, p2)
-      PlusParser.new([p1, p2]);
-    end
+    def fail(msg)       = FailureParser.new(msg)
+    def value(v)        = v.nil? ? Nil : ValueParser.new(v)
+    def bind(v, &block) = block_given? ? BoundParser.new(v, block) : v
+    def mplus(p1, p2)   = PlusParser.new([p1, p2])
   end
 
 end # module