rparsec 0.4.2 → 1.0

data/rparsec/context.rb

@@ -1,4 +1,4 @@
-
+module RParsec
 
 class ParseContext
   attr_reader :error, :src, :index, :result
@@ -79,3 +79,5 @@ class ParseContext
     current
   end
 end
+
+end # module

data/rparsec/error.rb

@@ -1,4 +1,7 @@
 require 'rparsec/misc'
+
+module RParsec
+
 class ParserException < StandardError
   extend DefHelper
   def_readable :index
@@ -20,4 +23,6 @@ end
 
 class Expected < Failure
   Precedence = 100
-end
+end
+
+end # module

data/rparsec/expressions.rb

@@ -1,5 +1,7 @@
 require 'rparsec/parser'
 
+module RParsec
+  
 Associativities = [:prefix, :postfix, :infixn, :infixr, :infixl]
 #
 # This class holds information about operator precedences
@@ -177,4 +179,6 @@ module Expressions
     end
     suites
   end
-end
+end
+
+end # module

data/rparsec/functors.rb

@@ -1,3 +1,5 @@
+module RParsec
+  
 #
 # This module provides frequently used functors.
 # 
@@ -268,3 +270,5 @@ module FunctorMixin
   alias ** power
   alias * repeat
 end
+
+end # module

data/rparsec/id_monad.rb

@@ -1,3 +1,5 @@
+module RParsec
+  
 class IdMonad
   def value v
     v
@@ -11,3 +13,5 @@ class IdMonad
     a
   end
 end
+
+end # module

data/rparsec/keywords.rb

@@ -1,5 +1,7 @@
 require 'rparsec/parser'
 
+module RParsec
+  
 #
 # This class helps building lexers and parsers for keywords.
 # 
@@ -8,7 +10,15 @@ class Keywords
   
   private_class_method :new
   
-  attr_reader :keyword_symbol, :lexer
+  #
+  # The symbol used to identify a keyword token
+  #
+  attr_reader :keyword_symbol
+  
+  #
+  # The lexer that parses all the keywords represented
+  #
+  attr_reader :lexer
   
   #
   # Do we lex case sensitively?
@@ -99,4 +109,6 @@ class Keywords
       case when case_sensitive then w.dup else w.downcase end
     end
   end
-end
+end
+
+end # module

data/rparsec/locator.rb

@@ -1,5 +1,7 @@
 require 'rparsec/misc'
 
+module RParsec
+  
 class CodeLocator
   extend DefHelper
   
@@ -34,3 +36,5 @@ class CodeLocator
     return line, col
   end
 end
+
+end # module

data/rparsec/misc.rb

@@ -1,3 +1,23 @@
+module RParsec
+
+#
+# Internal utility functions for string manipulations.
+#
+module StringUtils
+  #
+  # Does _str_ starts with the _sub_ string?
+  # 
+  def self.starts_with? str, sub
+    return true if sub.nil?
+    len = sub.length
+    return false if len > str.length
+    for i in (0...len)
+      return false if str[i] != sub[i]
+    end
+    true
+  end
+end
+
 #
 # Helpers for defining ctor.
 #
@@ -107,3 +127,4 @@ module Signature
   end
 end
 
+end # module

data/rparsec/monad.rb

@@ -1,3 +1,5 @@
+module RParsec
+  
 #
 # module for Monad
 #
@@ -55,4 +57,6 @@ module Monad
   def plus other
     @monad.mplus(@this, other.this)
   end
-end
+end
+
+end # module

data/rparsec/operators.rb

@@ -1,22 +1,6 @@
 require 'rparsec/parser'
 
-#
-# utility functions for string manipulations.
-#
-module StringUtils
-  #
-  # Does _str_ starts with the _sub_ string?
-  # 
-  def self.starts_with? str, sub
-    return true if sub.nil?
-    len = sub.length
-    return false if len > str.length
-    for i in (0...len)
-      return false if str[i] != sub[i]
-    end
-    true
-  end
-end
+module RParsec
 
 #
 # This class helps building lexer and parser for operators.
@@ -114,4 +98,6 @@ class Operators
   def self.to_array suites
     suites.reverse!.flatten!
   end
-end
+end
+
+end # module

data/rparsec/parser.rb

@@ -3,7 +3,8 @@ monad misc error context locator token functors parser_monad
 }.each {|lib| require "rparsec/#{lib}"}
 require 'strscan'
 
-
+module RParsec
+  
 #
 # Represents a parser that parses a certain grammar rule.
 #
@@ -890,3 +891,4 @@ module Parsers
   extend self
 end
 
+end # module

data/rparsec/parser_monad.rb

@@ -1,4 +1,5 @@
-# require 'rparsec/parser_impls'
+module RParsec
+  
 class ParserMonad
   def fail msg
     FailureParser.new(msg)
@@ -17,4 +18,6 @@ class ParserMonad
   def mplus(p1, p2)
     PlusParser.new([p1,p2]);
   end
-end
+end
+
+end # module

data/rparsec/parsers.rb

@@ -1,5 +1,7 @@
 require 'rparsec/parser'
 
+module RParsec
+
 class FailureParser < Parser
   init :msg
   def _parse ctxt
@@ -21,28 +23,32 @@ class LazyParser < Parser
   end
 end
 
-def add_error(err, e)
-  return e if err.nil?
-  return err if e.nil?
-  cmp = compare_error(err, e)
-  return err if cmp > 0
-  return e if cmp < 0
-  err
-  # merge_error(err, e)
-end
-
-def get_first_element(err)
-  while err.kind_of?(Array)
-    err = err[0]
+class Failures
+  def self.add_error(err, e)
+    return e if err.nil?
+    return err if e.nil?
+    cmp = compare_error(err, e)
+    return err if cmp > 0
+    return e if cmp < 0
+    err
+    # merge_error(err, e)
+  end
+  
+  private
+  
+  def self.get_first_element(err)
+    while err.kind_of?(Array)
+      err = err[0]
+    end
+    err
   end
-  err
-end
 
-def compare_error(e1, e2)
-  e1, e2 = get_first_element(e1), get_first_element(e2)
-  return -1 if e1.index < e2.index
-  return 1 if e1.index > e2.index
-  0
+  def self.compare_error(e1, e2)
+    e1, e2 = get_first_element(e1), get_first_element(e2)
+    return -1 if e1.index < e2.index
+    return 1 if e1.index > e2.index
+    0
+  end
 end
 
 ###############################################
@@ -163,7 +169,7 @@ class PlusParser < LookAheadSensitiveParser
       ctxt.index, ctxt.result = ind, result
       return true if p._parse(ctxt)
       return false unless visible(ctxt, ind)
-      err = add_error(err, ctxt.error)
+      err = Failures.add_error(err, ctxt.error)
     end
     ctxt.error = err
     return false
@@ -224,7 +230,7 @@ class BestParser < Parser
         if ctxt.error.index > err_pos
           err_ind, err_pos = ctxt.index, ctxt.error.index
         end
-        err = add_error(err, ctxt.error)
+        err = Failures.add_error(err, ctxt.error)
       end
     end
     if best_ind >= 0
@@ -612,4 +618,6 @@ class SetIndexParser < Parser
   end
 end
 
-Nil = ValueParser.new(nil)
+Nil = ValueParser.new(nil)
+
+end # module

data/rparsec/token.rb

@@ -1,12 +1,29 @@
 require 'rparsec/misc'
 
+module RParsec
+
 #
-# This class represents a token during lexical analysis.
+# Represents a token during lexical analysis.
 #
 class Token
   extend DefHelper
   
-  def_readable :kind, :text, :index
+  def_ctor :kind, :text, :index
+  
+  #
+  # The type of the token
+  #
+  attr_reader :kind
+  
+  #
+  # The text of the matched range
+  #
+  attr_reader :text
+  
+  #
+  # The starting index of the matched range
+  #
+  attr_reader :index
   
   #
   # The length of the token.
@@ -21,4 +38,6 @@ class Token
   def to_s
     "#{@kind}: #{@text}"
   end
-end
+end
+
+end # module

data/test/src/functor_test.rb

@@ -2,7 +2,7 @@ require 'import'
 require 'runit/testcase'
 import :parsers, :functors
 
-
+include RParsec
 class Proc
   include FunctorMixin
 end

data/test/src/keyword_test.rb

@@ -1,6 +1,7 @@
 require 'import'
 import :parsers, :keywords
 require 'parser_test'
+
 class KeywordTestCase < ParserTestCase
   Insensitive = Keywords.case_insensitive(%w{select from where group by order having}){|x|x.downcase}
   Sensitive = Keywords.case_sensitive(%w{new delete if else then void int}){|x|x}

data/test/src/operator_test.rb

@@ -1,6 +1,7 @@
 require 'import'
 import :parsers, :operators, :functors
 require 'parser_test'
+
 class OperatorTestCase < ParserTestCase
   Ops = Operators.new(%w{++ + - -- * / ~}, &Id)
   def verifyToken(src, op)

data/test/src/parser_test.rb

@@ -1,10 +1,10 @@
 require 'import'
 require 'rubyunit'
 import :parsers, :functors
-# require 'forwardable'
+
+include RParsec
 
 class ParserTestCase < RUNIT::TestCase
-  # extend Forwardable
   include Functors
   include Parsers
   def assertParser(code, expected, parser)

data/test/src/simple_monad_test.rb

@@ -2,6 +2,7 @@ require 'import'
 require 'runit/testcase'
 import :id_monad, :monad
 
+include RParsec
 class Idm
   include Monad
   MyMonad = IdMonad.new

data/test/src/sql.rb

@@ -1,5 +1,7 @@
 require 'import'
 import :misc
+
+include RParsec
 class Module
   include DefHelper
 end

data/test/src/sql_parser.rb

@@ -1,5 +1,8 @@
 require 'import'
 import :parsers, :keywords, :operators, :functors, :expressions
+
+include RParsec
+
 class Method
   include FunctorMixin
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: rparsec
 version: !ruby/object:Gem::Version 
-  version: 0.4.2
-date: 2008-04-09 00:00:00 -05:00
+  version: "1.0"
+date: 2008-06-17 00:00:00 -05:00
 summary: A Ruby Parser Combinator Framework
 require_paths: 
 - .