[Python-modules-commits] [pyparsing] 01/03: Import pyparsing_2.1.7+dfsg1.orig.tar.gz

Barry Warsaw barry at moszumanska.debian.org
Fri Aug 12 22:04:11 UTC 2016


This is an automated email from the git hooks/post-receive script.

barry pushed a commit to branch master
in repository pyparsing.

commit e4cbacca5c379ef05b08a6596f613e83d40a4abc
Author: Barry Warsaw <barry at python.org>
Date:   Fri Aug 12 10:28:20 2016 -0400

    Import pyparsing_2.1.7+dfsg1.orig.tar.gz
---
 CHANGES                                            |    12 +
 PKG-INFO                                           |     2 +-
 examples/antlr_grammar.py                          |     1 +
 examples/antlr_grammar_tests.py                    |     2 +
 examples/apicheck.py                               |     3 +
 examples/btpyparse.py                              |     3 +-
 examples/commasep.py                               |     3 +
 examples/datetimeParseActions.py                   |     1 +
 examples/dfmparse.py                               |     9 +-
 examples/ebnf.py                                   |     4 +-
 examples/ebnftest.py                               |    10 +-
 examples/excelExpr.py                              |    10 +-
 examples/gen_ctypes.py                             |     7 +
 examples/greetingInGreek.py                        |     2 +
 examples/greetingInKorean.py                       |     2 +
 examples/groupUsingListAllMatches.py               |     5 +-
 examples/holaMundo.py                              |    16 +-
 examples/httpServerLogParser.py                    |     2 +
 examples/jsonParser.py                             |    38 +-
 examples/list1.py                                  |    20 +-
 htmldoc/api-objects.txt                            |     6 +-
 htmldoc/class-tree.html                            |    15 +-
 htmldoc/help.html                                  |     2 +-
 htmldoc/identifier-index.html                      |   199 +-
 htmldoc/module-tree.html                           |     2 +-
 htmldoc/pyparsing-module.html                      |    21 +-
 htmldoc/pyparsing-pysrc.html                       | 11016 +++++++++----------
 htmldoc/pyparsing.And-class.html                   |     2 +-
 htmldoc/pyparsing.CaselessKeyword-class.html       |     2 +-
 htmldoc/pyparsing.CaselessLiteral-class.html       |     2 +-
 htmldoc/pyparsing.CharsNotIn-class.html            |     2 +-
 htmldoc/pyparsing.Combine-class.html               |     2 +-
 htmldoc/pyparsing.Dict-class.html                  |     2 +-
 htmldoc/pyparsing.Each-class.html                  |     2 +-
 htmldoc/pyparsing.Empty-class.html                 |     2 +-
 htmldoc/pyparsing.FollowedBy-class.html            |     2 +-
 htmldoc/pyparsing.Forward-class.html               |     2 +-
 htmldoc/pyparsing.GoToColumn-class.html            |     2 +-
 htmldoc/pyparsing.Group-class.html                 |     2 +-
 htmldoc/pyparsing.Keyword-class.html               |     2 +-
 htmldoc/pyparsing.LineEnd-class.html               |     2 +-
 htmldoc/pyparsing.LineStart-class.html             |     2 +-
 htmldoc/pyparsing.Literal-class.html               |     2 +-
 htmldoc/pyparsing.MatchFirst-class.html            |     2 +-
 htmldoc/pyparsing.NoMatch-class.html               |     2 +-
 htmldoc/pyparsing.NotAny-class.html                |     2 +-
 htmldoc/pyparsing.OneOrMore-class.html             |     2 +-
 htmldoc/pyparsing.OnlyOnce-class.html              |     2 +-
 htmldoc/pyparsing.Optional-class.html              |     2 +-
 htmldoc/pyparsing.Or-class.html                    |     2 +-
 htmldoc/pyparsing.ParseBaseException-class.html    |     2 +-
 htmldoc/pyparsing.ParseElementEnhance-class.html   |     2 +-
 htmldoc/pyparsing.ParseException-class.html        |     2 +-
 htmldoc/pyparsing.ParseExpression-class.html       |     2 +-
 htmldoc/pyparsing.ParseFatalException-class.html   |     2 +-
 htmldoc/pyparsing.ParseResults-class.html          |     2 +-
 htmldoc/pyparsing.ParseSyntaxException-class.html  |    65 +-
 htmldoc/pyparsing.ParserElement-class.html         |     2 +-
 htmldoc/pyparsing.QuotedString-class.html          |     2 +-
 .../pyparsing.RecursiveGrammarException-class.html |     6 +-
 htmldoc/pyparsing.Regex-class.html                 |     2 +-
 htmldoc/pyparsing.Regex.compiledREtype-class.html  |     2 +-
 htmldoc/pyparsing.SkipTo-class.html                |     2 +-
 htmldoc/pyparsing.StringEnd-class.html             |     2 +-
 htmldoc/pyparsing.StringStart-class.html           |     2 +-
 htmldoc/pyparsing.Suppress-class.html              |     2 +-
 htmldoc/pyparsing.Token-class.html                 |     2 +-
 htmldoc/pyparsing.TokenConverter-class.html        |     2 +-
 htmldoc/pyparsing.White-class.html                 |     2 +-
 htmldoc/pyparsing.Word-class.html                  |     2 +-
 htmldoc/pyparsing.WordEnd-class.html               |     2 +-
 htmldoc/pyparsing.WordStart-class.html             |     2 +-
 htmldoc/pyparsing.ZeroOrMore-class.html            |     2 +-
 htmldoc/pyparsing.pyparsing_common-class.html      |     2 +-
 pyparsing.egg-info/PKG-INFO                        |     2 +-
 pyparsing.py                                       |    39 +-
 76 files changed, 5779 insertions(+), 5836 deletions(-)

diff --git a/CHANGES b/CHANGES
index 0e48b21..63fef0c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,18 @@
 Change Log
 ==========
 
+Version 2.1.7 - 
+------------------------------
+- Fixed regression reported by Andrea Censi (surfaced in PyContracts 
+  tests) when using ParseSyntaxExceptions (raised when using operator '-')
+  with packrat parsing.
+
+- Minor fix to oneOf, to accept all iterables, not just space-delimited
+  strings and lists. (If you have a list or set of strings, it is 
+  not necessary to concat them using ' '.join to pass them to oneOf,
+  oneOf will accept the list or set or generator directly.)
+
+
 Version 2.1.6 - 
 ------------------------------
 - *Major packrat upgrade*, inspired by patch provided by Tal Einat - 
diff --git a/PKG-INFO b/PKG-INFO
index 1e60a1c..2b6b2d7 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: pyparsing
-Version: 2.1.6
+Version: 2.1.7
 Summary: Python parsing module
 Home-page: http://pyparsing.wikispaces.com/
 Author: Paul McGuire
diff --git a/examples/antlr_grammar.py b/examples/antlr_grammar.py
index adf877e..76c681c 100644
--- a/examples/antlr_grammar.py
+++ b/examples/antlr_grammar.py
@@ -5,6 +5,7 @@ Created on 4 sept. 2010
 
 @author: luca
 
+Submitted by Luca DallOlio, September, 2010
 (Minor updates by Paul McGuire, June, 2012)
 '''
 from pyparsing import Word, ZeroOrMore, printables, Suppress, OneOrMore, Group, \
diff --git a/examples/antlr_grammar_tests.py b/examples/antlr_grammar_tests.py
index 31aab29..c2c3d8d 100644
--- a/examples/antlr_grammar_tests.py
+++ b/examples/antlr_grammar_tests.py
@@ -2,6 +2,8 @@
 Created on 4 sept. 2010
 
 @author: luca
+
+Submitted by Luca DallOlio, September, 2010
 '''
 import unittest
 import antlr_grammar
diff --git a/examples/apicheck.py b/examples/apicheck.py
index 4315ac9..7bca41a 100644
--- a/examples/apicheck.py
+++ b/examples/apicheck.py
@@ -2,6 +2,9 @@
 #   A simple source code scanner for finding patterns of the form
 #       [ procname1 $arg1 $arg2 ]
 #  and verifying the number of arguments
+#
+# Copyright (c) 2004-2016, Paul McGuire
+#
 
 from pyparsing import *
 
diff --git a/examples/btpyparse.py b/examples/btpyparse.py
index f3c11ae..6720c19 100644
--- a/examples/btpyparse.py
+++ b/examples/btpyparse.py
@@ -5,7 +5,8 @@ A standalone parser using pyparsing.
 pyparsing has a simple and expressive syntax so the grammar is easy to read and
 write.
 
-Matthew Brett 2010
+Submitted by Matthew Brett, 2010
+
 Simplified BSD license
 """
 
diff --git a/examples/commasep.py b/examples/commasep.py
index 7696871..3ce8546 100644
--- a/examples/commasep.py
+++ b/examples/commasep.py
@@ -5,6 +5,9 @@
 # - leading and trailing whitespace is implicitly trimmed from list elements
 # - list elements can be quoted strings, which can safely contain commas without breaking
 #    into separate elements
+#
+# Copyright (c) 2004-2016, Paul McGuire
+#
 
 from pyparsing import commaSeparatedList
 
diff --git a/examples/datetimeParseActions.py b/examples/datetimeParseActions.py
index 26d96a3..4d726c5 100644
--- a/examples/datetimeParseActions.py
+++ b/examples/datetimeParseActions.py
@@ -21,6 +21,7 @@ integer.setParseAction(convertToInt)
 
 # define a pattern for a year/month/day date
 date_expr = integer('year') + '/' + integer('month') + '/' + integer('day')
+date_expr.ignore(pythonStyleComment)
 
 def convertToDatetime(s,loc,tokens):
     try:
diff --git a/examples/dfmparse.py b/examples/dfmparse.py
index 96afbad..cf83814 100644
--- a/examples/dfmparse.py
+++ b/examples/dfmparse.py
@@ -127,13 +127,15 @@ def printer(s, loc, tok):
 def get_filename_list(tf):
     import sys, glob
     if tf == None:
-        tf = sys.argv[1:]
+        if len(sys.argv) > 1:
+            tf = sys.argv[1:]
+        else:
+            tf = glob.glob("*.dfm")
     elif type(tf) == str:
         tf = [tf]
     testfiles = []
     for arg in tf:
-        for i in glob.glob(arg):
-            testfiles.append(i)
+        testfiles.extend(glob.glob(arg))
     return testfiles
 
 def main(testfiles=None, action=printer):
@@ -145,6 +147,7 @@ def main(testfiles=None, action=printer):
     Otherwise, a simple ParseResults is returned.
     """
     testfiles = get_filename_list(testfiles)
+    print(testfiles)
 
     if action:
         for i in (simple_identifier, value, item_list):
diff --git a/examples/ebnf.py b/examples/ebnf.py
index 8dfcaea..242aed4 100644
--- a/examples/ebnf.py
+++ b/examples/ebnf.py
@@ -4,7 +4,9 @@
 # ISO 14977 standardize The Extended Backus-Naur Form(EBNF) syntax.
 # You can read a final draft version here:
 # http://www.cl.cam.ac.uk/~mgk25/iso-ebnf.html
-
+#
+# Submitted 2004 by Seo Sanghyeon
+#
 
 from pyparsing import *
 
diff --git a/examples/ebnftest.py b/examples/ebnftest.py
index 32c7fed..253404f 100644
--- a/examples/ebnftest.py
+++ b/examples/ebnftest.py
@@ -1,9 +1,15 @@
+#
+# ebnftest.py 
+#
+# Test script for ebnf.py
+#
+# Submitted 2004 by Seo Sanghyeon
+#
 print('Importing pyparsing...')
 from pyparsing import *
 
 print('Constructing EBNF parser with pyparsing...')
 import ebnf
-import sets
 
 
 grammar = '''
@@ -39,7 +45,7 @@ parsers = ebnf.parse(grammar, table)
 ebnf_parser = parsers['syntax']
 
 commentcharcount = 0
-commentlocs = sets.Set()
+commentlocs = set()
 def tallyCommentChars(s,l,t):
     global commentcharcount,commentlocs
     # only count this comment if we haven't seen it before
diff --git a/examples/excelExpr.py b/examples/excelExpr.py
index 2700100..b98115e 100644
--- a/examples/excelExpr.py
+++ b/examples/excelExpr.py
@@ -59,10 +59,10 @@ expr << (arithExpr | textExpr)
 
 
 (EQ + expr).runTests("""\
-    =3*A7+5"
-    =3*Sheet1!$A$7+5"
-    =3*'Sheet 1'!$A$7+5" 
-    =3*'O''Reilly''s sheet'!$A$7+5" 
-    =if(Sum(A1:A25)>42,Min(B1:B25),if(Sum(C1:C25)>3.14, (Min(C1:C25)+3)*18,Max(B1:B25)))"
+    =3*A7+5
+    =3*Sheet1!$A$7+5
+    =3*'Sheet 1'!$A$7+5"
+    =3*'O''Reilly''s sheet'!$A$7+5
+    =if(Sum(A1:A25)>42,Min(B1:B25),if(Sum(C1:C25)>3.14, (Min(C1:C25)+3)*18,Max(B1:B25)))
     =sum(a1:a25,10,min(b1,c2,d3))
 """)
\ No newline at end of file
diff --git a/examples/gen_ctypes.py b/examples/gen_ctypes.py
index 2c909e4..9e74819 100644
--- a/examples/gen_ctypes.py
+++ b/examples/gen_ctypes.py
@@ -1,3 +1,10 @@
+#
+# gen_ctypes.py
+#
+# Parse a .h header file to generate ctypes argtype and return type definitions
+#
+# Copyright 2004-2016, by Paul McGuire
+#
 from pyparsing import *
 
 typemap = {
diff --git a/examples/greetingInGreek.py b/examples/greetingInGreek.py
index 07a8f0a..c4d002f 100644
--- a/examples/greetingInGreek.py
+++ b/examples/greetingInGreek.py
@@ -4,6 +4,8 @@
 #
 # Demonstration of the parsing module, on the prototypical "Hello, World!" example
 #
+# Copyright 2004-2016, by Paul McGuire
+#
 from pyparsing import Word 
 
 # define grammar
diff --git a/examples/greetingInKorean.py b/examples/greetingInKorean.py
index d0ea0e5..e48cc8b 100644
--- a/examples/greetingInKorean.py
+++ b/examples/greetingInKorean.py
@@ -4,6 +4,8 @@
 #
 # Demonstration of the parsing module, on the prototypical "Hello, World!" example
 #
+# Copyright 2004-2016, by Paul McGuire
+#
 from pyparsing import Word, srange
 
 koreanChars = srange(r"[\0xac00-\0xd7a3]")
diff --git a/examples/groupUsingListAllMatches.py b/examples/groupUsingListAllMatches.py
index d5037b8..28cdfd6 100644
--- a/examples/groupUsingListAllMatches.py
+++ b/examples/groupUsingListAllMatches.py
@@ -5,6 +5,8 @@
 # This example performs work similar to itertools.groupby, but without
 # having to sort the input first.
 #
+# Copyright 2004-2016, by Paul McGuire
+#
 from pyparsing import Word, ZeroOrMore, nums
 
 aExpr = Word("A", nums)
@@ -12,5 +14,4 @@ bExpr = Word("B", nums)
 cExpr = Word("C", nums)
 grammar = ZeroOrMore(aExpr("A*") | bExpr("B*") | cExpr("C*"))
 
-results = grammar.parseString("A1 B1 A2 C1 B2 A3")
-print(results.dump())
+grammar.runTests("A1 B1 A2 C1 B2 A3")
diff --git a/examples/holaMundo.py b/examples/holaMundo.py
index 357e3c8..6ae2cc5 100644
--- a/examples/holaMundo.py
+++ b/examples/holaMundo.py
@@ -18,13 +18,21 @@ tokens = saludo.parseString("Hola, Mundo !")
 for i in range(len(tokens)):
     print ("Token %d -> %s" % (i,tokens[i]))
 
-#imprimimos cada uno de los tokens Y listooo!!, he aqu� la salida 
-# Token 0�> Hola Token 1�> , Token 2�> Mundo Token 3�> ! 
+#imprimimos cada uno de los tokens Y listooo!!, he aquí a salida 
+# Token 0 -> Hola
+# Token 1 -> ,
+# Token 2-> Mundo 
+# Token 3 -> ! 
  
-# Por supuesto, se pueden �reutilizar� gram�ticas, por ejemplo: 
+# Por supuesto, se pueden "reutilizar" gramáticas, por ejemplo: 
 numimag = Word(nums) + 'i' 
 numreal = Word(nums) 
 numcomplex = numreal + '+' + numimag 
 print (numcomplex.parseString("3+5i"))
 
-# Excelente!!, bueno, los dejo, me voy a seguir tirando c�digo�
+# Cambiar a complejo numero durante parsear:
+numcomplex.setParseAction(lambda t: complex(''.join(t).replace('i','j')))
+print (numcomplex.parseString("3+5i"))
+
+# Excelente!!, bueno, los dejo, me voy a seguir tirando código...
+
diff --git a/examples/httpServerLogParser.py b/examples/httpServerLogParser.py
index 1a808ae..a147a05 100644
--- a/examples/httpServerLogParser.py
+++ b/examples/httpServerLogParser.py
@@ -1,5 +1,7 @@
 # httpServerLogParser.py
 #
+# Copyright (c) 2016, Paul McGuire
+#
 """
 Parser for HTTP server log output, of the form:
 
diff --git a/examples/jsonParser.py b/examples/jsonParser.py
index 45cdef3..f080c6c 100644
--- a/examples/jsonParser.py
+++ b/examples/jsonParser.py
@@ -8,6 +8,8 @@
 # Updated 8 Jan 2007 - fixed dict grouping bug, and made elements and
 #   members optional in array and object collections
 #
+# Updated 9 Aug 2016 - use more current pyparsing constructs/idioms
+#
 json_bnf = """
 object 
     { members } 
@@ -33,35 +35,29 @@ value
 
 from pyparsing import *
 
-TRUE = Keyword("true").setParseAction( replaceWith(True) )
-FALSE = Keyword("false").setParseAction( replaceWith(False) )
-NULL = Keyword("null").setParseAction( replaceWith(None) )
+def make_keyword(kwd_str, kwd_value):
+    return Keyword(kwd_str).setParseAction(replaceWith(kwd_value))
+TRUE  = make_keyword("true", True)
+FALSE = make_keyword("false", False)
+NULL  = make_keyword("null", None)
+
+LBRACK, RBRACK, LBRACE, RBRACE, COLON = map(Suppress, "[]{}:")
 
-jsonString = dblQuotedString.setParseAction( removeQuotes )
-jsonNumber = Combine( Optional('-') + ( '0' | Word('123456789',nums) ) +
-                    Optional( '.' + Word(nums) ) +
-                    Optional( Word('eE',exact=1) + Word(nums+'+-',nums) ) )
+jsonString = dblQuotedString().setParseAction(removeQuotes)
+jsonNumber = pyparsing_common.number()
 
 jsonObject = Forward()
 jsonValue = Forward()
 jsonElements = delimitedList( jsonValue )
-jsonArray = Group(Suppress('[') + Optional(jsonElements, []) + Suppress(']') )
-jsonValue << ( jsonString | jsonNumber | Group(jsonObject)  | jsonArray | TRUE | FALSE | NULL )
-memberDef = Group( jsonString + Suppress(':') + jsonValue )
-jsonMembers = delimitedList( memberDef )
-jsonObject << Dict( Suppress('{') + Optional(jsonMembers) + Suppress('}') )
+jsonArray = Group(LBRACK + Optional(jsonElements, []) + RBRACK)
+jsonValue << (jsonString | jsonNumber | Group(jsonObject)  | jsonArray | TRUE | FALSE | NULL)
+memberDef = Group(jsonString + COLON + jsonValue)
+jsonMembers = delimitedList(memberDef)
+jsonObject << Dict(LBRACE + Optional(jsonMembers) + RBRACE)
 
 jsonComment = cppStyleComment 
-jsonObject.ignore( jsonComment )
+jsonObject.ignore(jsonComment)
 
-def convertNumbers(s,l,toks):
-    n = toks[0]
-    try:
-        return int(n)
-    except ValueError as ve:
-        return float(n)
-        
-jsonNumber.setParseAction( convertNumbers )
     
 if __name__ == "__main__":
     testdata = """
diff --git a/examples/list1.py b/examples/list1.py
index e410070..49a0bff 100644
--- a/examples/list1.py
+++ b/examples/list1.py
@@ -1,3 +1,10 @@
+#
+# list1.py
+#
+# an example of using parse actions to convert type of parsed data.
+#
+# Copyright (c) 2006-2016, Paul McGuire
+#
 from pyparsing import *
 
 # first pass
@@ -20,8 +27,8 @@ print(listStr.parseString(test))
 lbrack = Literal("[").suppress()
 rbrack = Literal("]").suppress()
 cvtInt = lambda s,l,toks: int(toks[0])
-integer = Word(nums).setName("integer").setParseAction( cvtInt )
 cvtReal = lambda s,l,toks: float(toks[0])
+integer = Word(nums).setName("integer").setParseAction( cvtInt )
 real = Combine(Optional(oneOf("+ -")) + Word(nums) + "." +
                Optional(Word(nums))).setName("real").setParseAction( cvtReal )
 listItem = real | integer | quotedString.setParseAction( removeQuotes )
@@ -33,14 +40,13 @@ test = "['a', 100, 3.14]"
 print(listStr.parseString(test))
 
 # third pass, add nested list support
-cvtInt = lambda s,l,toks: int(toks[0])
-cvtReal = lambda s,l,toks: float(toks[0])
+lbrack, rbrack = map(Suppress, "[]")
+
+cvtInt = tokenMap(int)
+cvtReal = tokenMap(float)
 
-lbrack = Literal("[").suppress()
-rbrack = Literal("]").suppress()
 integer = Word(nums).setName("integer").setParseAction( cvtInt )
-real = Combine(Optional(oneOf("+ -")) + Word(nums) + "." +
-               Optional(Word(nums))).setName("real").setParseAction( cvtReal )
+real = Regex(r"[+-]?\d+\.\d*").setName("real").setParseAction( cvtReal )
 
 listStr = Forward()
 listItem = real | integer | quotedString.setParseAction(removeQuotes) | Group(listStr)
diff --git a/htmldoc/api-objects.txt b/htmldoc/api-objects.txt
index a57ff8c..3674ed2 100644
--- a/htmldoc/api-objects.txt
+++ b/htmldoc/api-objects.txt
@@ -1642,6 +1642,7 @@ pyparsing.ParseBaseException.__getattr__	pyparsing.ParseBaseException-class.html
 pyparsing.ParseBaseException.__dir__	pyparsing.ParseBaseException-class.html#__dir__
 pyparsing.ParseBaseException.markInputline	pyparsing.ParseBaseException-class.html#markInputline
 pyparsing.ParseBaseException.__repr__	pyparsing.ParseBaseException-class.html#__repr__
+pyparsing.ParseBaseException._from_exception	pyparsing.ParseBaseException-class.html#_from_exception
 pyparsing.ParseElementEnhance	pyparsing.ParseElementEnhance-class.html
 pyparsing.ParserElement._parseCache	pyparsing.ParserElement-class.html#_parseCache
 pyparsing.ParserElement.__ror__	pyparsing.ParserElement-class.html#__ror__
@@ -1718,6 +1719,7 @@ pyparsing.ParseBaseException.__getattr__	pyparsing.ParseBaseException-class.html
 pyparsing.ParseBaseException.__dir__	pyparsing.ParseBaseException-class.html#__dir__
 pyparsing.ParseBaseException.markInputline	pyparsing.ParseBaseException-class.html#markInputline
 pyparsing.ParseBaseException.__repr__	pyparsing.ParseBaseException-class.html#__repr__
+pyparsing.ParseBaseException._from_exception	pyparsing.ParseBaseException-class.html#_from_exception
 pyparsing.ParseExpression	pyparsing.ParseExpression-class.html
 pyparsing.ParserElement._parseCache	pyparsing.ParserElement-class.html#_parseCache
 pyparsing.ParserElement.__ror__	pyparsing.ParserElement-class.html#__ror__
@@ -1796,6 +1798,7 @@ pyparsing.ParseBaseException.__getattr__	pyparsing.ParseBaseException-class.html
 pyparsing.ParseBaseException.__dir__	pyparsing.ParseBaseException-class.html#__dir__
 pyparsing.ParseBaseException.markInputline	pyparsing.ParseBaseException-class.html#markInputline
 pyparsing.ParseBaseException.__repr__	pyparsing.ParseBaseException-class.html#__repr__
+pyparsing.ParseBaseException._from_exception	pyparsing.ParseBaseException-class.html#_from_exception
 pyparsing.ParseResults	pyparsing.ParseResults-class.html
 pyparsing.ParseResults.haskeys	pyparsing.ParseResults-class.html#haskeys
 pyparsing.ParseResults.asXML	pyparsing.ParseResults-class.html#asXML
@@ -1845,11 +1848,12 @@ pyparsing.ParseResults.__dir__	pyparsing.ParseResults-class.html#__dir__
 pyparsing.ParseResults.clear	pyparsing.ParseResults-class.html#clear
 pyparsing.ParseSyntaxException	pyparsing.ParseSyntaxException-class.html
 pyparsing.ParseBaseException.__str__	pyparsing.ParseBaseException-class.html#__str__
-pyparsing.ParseSyntaxException.__init__	pyparsing.ParseSyntaxException-class.html#__init__
+pyparsing.ParseBaseException.__init__	pyparsing.ParseBaseException-class.html#__init__
 pyparsing.ParseBaseException.__getattr__	pyparsing.ParseBaseException-class.html#__getattr__
 pyparsing.ParseBaseException.__dir__	pyparsing.ParseBaseException-class.html#__dir__
 pyparsing.ParseBaseException.markInputline	pyparsing.ParseBaseException-class.html#markInputline
 pyparsing.ParseBaseException.__repr__	pyparsing.ParseBaseException-class.html#__repr__
+pyparsing.ParseBaseException._from_exception	pyparsing.ParseBaseException-class.html#_from_exception
 pyparsing.ParserElement	pyparsing.ParserElement-class.html
 pyparsing.ParserElement._parseCache	pyparsing.ParserElement-class.html#_parseCache
 pyparsing.ParserElement.__ror__	pyparsing.ParserElement-class.html#__ror__
diff --git a/htmldoc/class-tree.html b/htmldoc/class-tree.html
index 0f41ddf..8b72dff 100644
--- a/htmldoc/class-tree.html
+++ b/htmldoc/class-tree.html
@@ -79,18 +79,19 @@
         found; stops all parsing immediately</em>
     <ul>
     <li> <strong class="uidlink"><a href="pyparsing.ParseSyntaxException-class.html">pyparsing.ParseSyntaxException</a></strong>:
-      <em class="summary">just like <code><a href="pyparsing.ParseFatalException-class.html" 
-        class="link">ParseFatalException</a></code>, but thrown internally 
-        when an <code>ErrorStop</code> ('-' operator) indicates that 
-        parsing is to stop immediately because an unbacktrackable syntax 
-        error has been found</em>
+      <em class="summary">just like <a href="pyparsing.ParseFatalException-class.html" 
+        class="link">ParseFatalException</a>, but thrown internally when an
+        ErrorStop ('-' operator) indicates that parsing is to stop 
+        immediately because an unbacktrackable syntax error has been found</em>
     </li>
     </ul>
     </li>
     </ul>
     </li>
     <li> <strong class="uidlink"><a href="pyparsing.RecursiveGrammarException-class.html">pyparsing.RecursiveGrammarException</a></strong>:
-      <em class="summary">exception thrown by <code>validate()</code> if the grammar could be
+      <em class="summary">exception thrown by <a 
+        href="pyparsing.ParserElement-class.html#validate" 
+        class="link">ParserElement.validate</a> if the grammar could be 
         improperly recursive</em>
     </li>
     </ul>
@@ -308,7 +309,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Sun Aug 07 22:35:54 2016
+    Generated by Epydoc 3.0.1 on Thu Aug 11 03:01:59 2016
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/htmldoc/help.html b/htmldoc/help.html
index 16b1252..05fd654 100644
--- a/htmldoc/help.html
+++ b/htmldoc/help.html
@@ -254,7 +254,7 @@ page was last updated. </p>
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Sun Aug 07 22:35:54 2016
+    Generated by Epydoc 3.0.1 on Thu Aug 11 03:01:59 2016
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/htmldoc/identifier-index.html b/htmldoc/identifier-index.html
index e067a8c..0b96ef5 100644
--- a/htmldoc/identifier-index.html
+++ b/htmldoc/identifier-index.html
@@ -950,67 +950,59 @@
 <span class="index-where">(in <a href="pyparsing.ParseResults-class.html">ParseResults</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing.ParseExpression-class.html#__init__">__init__()</a><br />
 <span class="index-where">(in <a href="pyparsing.ParseExpression-class.html">ParseExpression</a>)</span></td>
-<td width="33%" class="link-index"><a href="pyparsing.MatchFirst-class.html#__slotnames__">__slotnames__</a><br />
-<span class="index-where">(in <a href="pyparsing.MatchFirst-class.html">MatchFirst</a>)</span></td>
+<td width="33%" class="link-index"><a href="pyparsing.NotAny-class.html#__slotnames__">__slotnames__</a><br />
+<span class="index-where">(in <a href="pyparsing.NotAny-class.html">NotAny</a>)</span></td>
 </tr>
 <tr>
 <td width="33%" class="link-index"><a href="pyparsing.ParserElement-class.html#__add__">__add__()</a><br />
 <span class="index-where">(in <a href="pyparsing.ParserElement-class.html">ParserElement</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing.ParseResults-class.html#__init__">__init__()</a><br />
 <span class="index-where">(in <a href="pyparsing.ParseResults-class.html">ParseResults</a>)</span></td>
-<td width="33%" class="link-index"><a href="pyparsing.NotAny-class.html#__slotnames__">__slotnames__</a><br />
-<span class="index-where">(in <a href="pyparsing.NotAny-class.html">NotAny</a>)</span></td>
-</tr>
-<tr>
-<td width="33%" class="link-index"><a href="pyparsing.ParserElement-class.html#__and__">__and__()</a><br />
-<span class="index-where">(in <a href="pyparsing.ParserElement-class.html">ParserElement</a>)</span></td>
-<td width="33%" class="link-index"><a href="pyparsing.ParseSyntaxException-class.html#__init__">__init__()</a><br />
-<span class="index-where">(in <a href="pyparsing.ParseSyntaxException-class.html">ParseSyntaxException</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing.OneOrMore-class.html#__slotnames__">__slotnames__</a><br />
 <span class="index-where">(in <a href="pyparsing.OneOrMore-class.html">OneOrMore</a>)</span></td>
 </tr>
 <tr>
-<td width="33%" class="link-index"><a href="pyparsing.ParseResults-class.html#__bool__">__bool__()</a><br />
-<span class="index-where">(in <a href="pyparsing.ParseResults-class.html">ParseResults</a>)</span></td>
+<td width="33%" class="link-index"><a href="pyparsing.ParserElement-class.html#__and__">__and__()</a><br />
+<span class="index-where">(in <a href="pyparsing.ParserElement-class.html">ParserElement</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing.ParserElement-class.html#__init__">__init__()</a><br />
 <span class="index-where">(in <a href="pyparsing.ParserElement-class.html">ParserElement</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing.Optional-class.html#__slotnames__">__slotnames__</a><br />
 <span class="index-where">(in <a href="pyparsing.Optional-class.html">Optional</a>)</span></td>
 </tr>
 <tr>
-<td width="33%" class="link-index"><a href="pyparsing.OnlyOnce-class.html#__call__">__call__()</a><br />
-<span class="index-where">(in <a href="pyparsing.OnlyOnce-class.html">OnlyOnce</a>)</span></td>
+<td width="33%" class="link-index"><a href="pyparsing.ParseResults-class.html#__bool__">__bool__()</a><br />
+<span class="index-where">(in <a href="pyparsing.ParseResults-class.html">ParseResults</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing.QuotedString-class.html#__init__">__init__()</a><br />
 <span class="index-where">(in <a href="pyparsing.QuotedString-class.html">QuotedString</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing.Regex-class.html#__slotnames__">__slotnames__</a><br />
 <span class="index-where">(in <a href="pyparsing.Regex-class.html">Regex</a>)</span></td>
 </tr>
 <tr>
-<td width="33%" class="link-index"><a href="pyparsing.ParserElement-class.html#__call__">__call__()</a><br />
-<span class="index-where">(in <a href="pyparsing.ParserElement-class.html">ParserElement</a>)</span></td>
+<td width="33%" class="link-index"><a href="pyparsing.OnlyOnce-class.html#__call__">__call__()</a><br />
+<span class="index-where">(in <a href="pyparsing.OnlyOnce-class.html">OnlyOnce</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing.RecursiveGrammarException-class.html#__init__">__init__()</a><br />
 <span class="index-where">(in <a href="pyparsing.RecursiveGrammarException-class.html">RecursiveGrammarException</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing.Suppress-class.html#__slotnames__">__slotnames__</a><br />
 <span class="index-where">(in <a href="pyparsing.Suppress-class.html">Suppress</a>)</span></td>
 </tr>
 <tr>
-<td width="33%" class="link-index"><a href="pyparsing.ParseResults-class.html#__contains__">__contains__()</a><br />
-<span class="index-where">(in <a href="pyparsing.ParseResults-class.html">ParseResults</a>)</span></td>
+<td width="33%" class="link-index"><a href="pyparsing.ParserElement-class.html#__call__">__call__()</a><br />
+<span class="index-where">(in <a href="pyparsing.ParserElement-class.html">ParserElement</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing.Regex-class.html#__init__">__init__()</a><br />
 <span class="index-where">(in <a href="pyparsing.Regex-class.html">Regex</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing.Word-class.html#__slotnames__">__slotnames__</a><br />
 <span class="index-where">(in <a href="pyparsing.Word-class.html">Word</a>)</span></td>
 </tr>
 <tr>
-<td width="33%" class="link-index"><a href="pyparsing.Regex.compiledREtype-class.html#__copy__">__copy__()</a><br />
-<span class="index-where">(in <a href="pyparsing.Regex.compiledREtype-class.html">compiledREtype</a>)</span></td>
+<td width="33%" class="link-index"><a href="pyparsing.ParseResults-class.html#__contains__">__contains__()</a><br />
+<span class="index-where">(in <a href="pyparsing.ParseResults-class.html">ParseResults</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing.SkipTo-class.html#__init__">__init__()</a><br />
 <span class="index-where">(in <a href="pyparsing.SkipTo-class.html">SkipTo</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing.And-class.html#__str__">__str__()</a><br />
 <span class="index-where">(in <a href="pyparsing.And-class.html">And</a>)</span></td>
 </tr>
 <tr>
-<td width="33%" class="link-index"><a href="pyparsing.Regex.compiledREtype-class.html#__deepcopy__">__deepcopy__()</a><br />
+<td width="33%" class="link-index"><a href="pyparsing.Regex.compiledREtype-class.html#__copy__">__copy__()</a><br />
 <span class="index-where">(in <a href="pyparsing.Regex.compiledREtype-class.html">compiledREtype</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing.StringEnd-class.html#__init__">__init__()</a><br />
 <span class="index-where">(in <a href="pyparsing.StringEnd-class.html">StringEnd</a>)</span></td>
@@ -1018,79 +1010,79 @@
 <span class="index-where">(in <a href="pyparsing.CharsNotIn-class.html">CharsNotIn</a>)</span></td>
 </tr>
 <tr>
-<td width="33%" class="link-index"><a href="pyparsing.ParseResults-class.html#__delitem__">__delitem__()</a><br />
-<span class="index-where">(in <a href="pyparsing.ParseResults-class.html">ParseResults</a>)</span></td>
+<td width="33%" class="link-index"><a href="pyparsing.Regex.compiledREtype-class.html#__deepcopy__">__deepcopy__()</a><br />
+<span class="index-where">(in <a href="pyparsing.Regex.compiledREtype-class.html">compiledREtype</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing.StringStart-class.html#__init__">__init__()</a><br />
 <span class="index-where">(in <a href="pyparsing.StringStart-class.html">StringStart</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing.Each-class.html#__str__">__str__()</a><br />
 <span class="index-where">(in <a href="pyparsing.Each-class.html">Each</a>)</span></td>
 </tr>
 <tr>
-<td width="33%" class="link-index"><a href="pyparsing.ParseBaseException-class.html#__dir__">__dir__()</a><br />
-<span class="index-where">(in <a href="pyparsing.ParseBaseException-class.html">ParseBaseException</a>)</span></td>
+<td width="33%" class="link-index"><a href="pyparsing.ParseResults-class.html#__delitem__">__delitem__()</a><br />
+<span class="index-where">(in <a href="pyparsing.ParseResults-class.html">ParseResults</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing.Token-class.html#__init__">__init__()</a><br />
 <span class="index-where">(in <a href="pyparsing.Token-class.html">Token</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing.Forward-class.html#__str__">__str__()</a><br />
 <span class="index-where">(in <a href="pyparsing.Forward-class.html">Forward</a>)</span></td>
 </tr>
 <tr>
-<td width="33%" class="link-index"><a href="pyparsing.ParseResults-class.html#__dir__">__dir__()</a><br />
-<span class="index-where">(in <a href="pyparsing.ParseResults-class.html">ParseResults</a>)</span></td>
+<td width="33%" class="link-index"><a href="pyparsing.ParseBaseException-class.html#__dir__">__dir__()</a><br />
+<span class="index-where">(in <a href="pyparsing.ParseBaseException-class.html">ParseBaseException</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing.TokenConverter-class.html#__init__">__init__()</a><br />
 <span class="index-where">(in <a href="pyparsing.TokenConverter-class.html">TokenConverter</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing.MatchFirst-class.html#__str__">__str__()</a><br />
 <span class="index-where">(in <a href="pyparsing.MatchFirst-class.html">MatchFirst</a>)</span></td>
 </tr>
 <tr>
-<td width="33%" class="link-index"><a href="pyparsing-module.html#__doc__">__doc__</a><br />
-<span class="index-where">(in <a href="pyparsing-module.html">pyparsing</a>)</span></td>
+<td width="33%" class="link-index"><a href="pyparsing.ParseResults-class.html#__dir__">__dir__()</a><br />
+<span class="index-where">(in <a href="pyparsing.ParseResults-class.html">ParseResults</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing.White-class.html#__init__">__init__()</a><br />
 <span class="index-where">(in <a href="pyparsing.White-class.html">White</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing.NotAny-class.html#__str__">__str__()</a><br />
 <span class="index-where">(in <a href="pyparsing.NotAny-class.html">NotAny</a>)</span></td>
 </tr>
 <tr>
-<td width="33%" class="link-index"><a href="pyparsing.ParserElement-class.html#__eq__">__eq__()</a><br />
-<span class="index-where">(in <a href="pyparsing.ParserElement-class.html">ParserElement</a>)</span></td>
+<td width="33%" class="link-index"><a href="pyparsing-module.html#__doc__">__doc__</a><br />
+<span class="index-where">(in <a href="pyparsing-module.html">pyparsing</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing.Word-class.html#__init__">__init__()</a><br />
 <span class="index-where">(in <a href="pyparsing.Word-class.html">Word</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing.OneOrMore-class.html#__str__">__str__()</a><br />
 <span class="index-where">(in <a href="pyparsing.OneOrMore-class.html">OneOrMore</a>)</span></td>
 </tr>
 <tr>
-<td width="33%" class="link-index"><a href="pyparsing.ParseBaseException-class.html#__getattr__">__getattr__()</a><br />
-<span class="index-where">(in <a href="pyparsing.ParseBaseException-class.html">ParseBaseException</a>)</span></td>
+<td width="33%" class="link-index"><a href="pyparsing.ParserElement-class.html#__eq__">__eq__()</a><br />
+<span class="index-where">(in <a href="pyparsing.ParserElement-class.html">ParserElement</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing.WordEnd-class.html#__init__">__init__()</a><br />
 <span class="index-where">(in <a href="pyparsing.WordEnd-class.html">WordEnd</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing.Optional-class.html#__str__">__str__()</a><br />
 <span class="index-where">(in <a href="pyparsing.Optional-class.html">Optional</a>)</span></td>
 </tr>
 <tr>
-<td width="33%" class="link-index"><a href="pyparsing.ParseResults-class.html#__getattr__">__getattr__()</a><br />
-<span class="index-where">(in <a href="pyparsing.ParseResults-class.html">ParseResults</a>)</span></td>
+<td width="33%" class="link-index"><a href="pyparsing.ParseBaseException-class.html#__getattr__">__getattr__()</a><br />
+<span class="index-where">(in <a href="pyparsing.ParseBaseException-class.html">ParseBaseException</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing.WordStart-class.html#__init__">__init__()</a><br />
 <span class="index-where">(in <a href="pyparsing.WordStart-class.html">WordStart</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing.Or-class.html#__str__">__str__()</a><br />
 <span class="index-where">(in <a href="pyparsing.Or-class.html">Or</a>)</span></td>
 </tr>
 <tr>
-<td width="33%" class="link-index"><a href="pyparsing.ParseExpression-class.html#__getitem__">__getitem__()</a><br />
-<span class="index-where">(in <a href="pyparsing.ParseExpression-class.html">ParseExpression</a>)</span></td>
+<td width="33%" class="link-index"><a href="pyparsing.ParseResults-class.html#__getattr__">__getattr__()</a><br />
+<span class="index-where">(in <a href="pyparsing.ParseResults-class.html">ParseResults</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing.ZeroOrMore-class.html#__init__">__init__()</a><br />
 <span class="index-where">(in <a href="pyparsing.ZeroOrMore-class.html">ZeroOrMore</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing.ParseBaseException-class.html#__str__">__str__()</a><br />
 <span class="index-where">(in <a href="pyparsing.ParseBaseException-class.html">ParseBaseException</a>)</span></td>
 </tr>
 <tr>
-<td width="33%" class="link-index"><a href="pyparsing.ParseResults-class.html#__getitem__">__getitem__()</a><br />
-<span class="index-where">(in <a href="pyparsing.ParseResults-class.html">ParseResults</a>)</span></td>
+<td width="33%" class="link-index"><a href="pyparsing.ParseExpression-class.html#__getitem__">__getitem__()</a><br />
+<span class="index-where">(in <a href="pyparsing.ParseExpression-class.html">ParseExpression</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing.ParserElement-class.html#__invert__">__invert__()</a><br />
 <span class="index-where">(in <a href="pyparsing.ParserElement-class.html">ParserElement</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing.ParseElementEnhance-class.html#__str__">__str__()</a><br />
 <span class="index-where">(in <a href="pyparsing.ParseElementEnhance-class.html">ParseElementEnhance</a>)</span></td>
 </tr>
 <tr>
-<td width="33%" class="link-index"><a href="pyparsing.ParseResults-class.html#__getnewargs__">__getnewargs__()</a><br />
+<td width="33%" class="link-index"><a href="pyparsing.ParseResults-class.html#__getitem__">__getitem__()</a><br />
 <span class="index-where">(in <a href="pyparsing.ParseResults-class.html">ParseResults</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing.MatchFirst-class.html#__ior__">__ior__()</a><br />
 <span class="index-where">(in <a href="pyparsing.MatchFirst-class.html">MatchFirst</a>)</span></td>
@@ -1098,7 +1090,7 @@
 <span class="index-where">(in <a href="pyparsing.ParseExpression-class.html">ParseExpression</a>)</span></td>
 </tr>
 <tr>
-<td width="33%" class="link-index"><a href="pyparsing.ParseResults-class.html#__getstate__">__getstate__()</a><br />
+<td width="33%" class="link-index"><a href="pyparsing.ParseResults-class.html#__getnewargs__">__getnewargs__()</a><br />
 <span class="index-where">(in <a href="pyparsing.ParseResults-class.html">ParseResults</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing.ParseResults-class.html#__iter__">__iter__()</a><br />
 <span class="index-where">(in <a href="pyparsing.ParseResults-class.html">ParseResults</a>)</span></td>
@@ -1106,237 +1098,244 @@
 <span class="index-where">(in <a href="pyparsing.ParseResults-class.html">ParseResults</a>)</span></td>
 </tr>
 <tr>
-<td width="33%" class="link-index"><a href="pyparsing.ParserElement-class.html#__hash__">__hash__()</a><br />
-<span class="index-where">(in <a href="pyparsing.ParserElement-class.html">ParserElement</a>)</span></td>
+<td width="33%" class="link-index"><a href="pyparsing.ParseResults-class.html#__getstate__">__getstate__()</a><br />
+<span class="index-where">(in <a href="pyparsing.ParseResults-class.html">ParseResults</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing.Or-class.html#__ixor__">__ixor__()</a><br />
 <span class="index-where">(in <a href="pyparsing.Or-class.html">Or</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing.ParserElement-class.html#__str__">__str__()</a><br />
 <span class="index-where">(in <a href="pyparsing.ParserElement-class.html">ParserElement</a>)</span></td>
 </tr>
 <tr>
-<td width="33%" class="link-index"><a href="pyparsing.And-class.html#__iadd__">__iadd__()</a><br />
-<span class="index-where">(in <a href="pyparsing.And-class.html">And</a>)</span></td>
+<td width="33%" class="link-index"><a href="pyparsing.ParserElement-class.html#__hash__">__hash__()</a><br />
+<span class="index-where">(in <a href="pyparsing.ParserElement-class.html">ParserElement</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing.ParseResults-class.html#__len__">__len__()</a><br />
 <span class="index-where">(in <a href="pyparsing.ParseResults-class.html">ParseResults</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing.QuotedString-class.html#__str__">__str__()</a><br />
 <span class="index-where">(in <a href="pyparsing.QuotedString-class.html">QuotedString</a>)</span></td>
 </tr>
 <tr>
-<td width="33%" class="link-index"><a href="pyparsing.ParseResults-class.html#__iadd__">__iadd__()</a><br />
-<span class="index-where">(in <a href="pyparsing.ParseResults-class.html">ParseResults</a>)</span></td>
+<td width="33%" class="link-index"><a href="pyparsing.And-class.html#__iadd__">__iadd__()</a><br />
+<span class="index-where">(in <a href="pyparsing.And-class.html">And</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing.Forward-class.html#__lshift__">__lshift__()</a><br />
 <span class="index-where">(in <a href="pyparsing.Forward-class.html">Forward</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing.RecursiveGrammarException-class.html#__str__">__str__()</a><br />
 <span class="index-where">(in <a href="pyparsing.RecursiveGrammarException-class.html">RecursiveGrammarException</a>)</span></td>
 </tr>
 <tr>
-<td width="33%" class="link-index"><a href="pyparsing.Forward-class.html#__ilshift__">__ilshift__()</a><br />
-<span class="index-where">(in <a href="pyparsing.Forward-class.html">Forward</a>)</span></td>
+<td width="33%" class="link-index"><a href="pyparsing.ParseResults-class.html#__iadd__">__iadd__()</a><br />
+<span class="index-where">(in <a href="pyparsing.ParseResults-class.html">ParseResults</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing.ParserElement-class.html#__mul__">__mul__()</a><br />
 <span class="index-where">(in <a href="pyparsing.ParserElement-class.html">ParserElement</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing.Regex-class.html#__str__">__str__()</a><br />
 <span class="index-where">(in <a href="pyparsing.Regex-class.html">Regex</a>)</span></td>
 </tr>
 <tr>
-<td width="33%" class="link-index"><a href="pyparsing.And-class.html#__init__">__init__()</a><br />
-<span class="index-where">(in <a href="pyparsing.And-class.html">And</a>)</span></td>
+<td width="33%" class="link-index"><a href="pyparsing.Forward-class.html#__ilshift__">__ilshift__()</a><br />
+<span class="index-where">(in <a href="pyparsing.Forward-class.html">Forward</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing.ParserElement-class.html#__ne__">__ne__()</a><br />
 <span class="index-where">(in <a href="pyparsing.ParserElement-class.html">ParserElement</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing.Word-class.html#__str__">__str__()</a><br />
 <span class="index-where">(in <a href="pyparsing.Word-class.html">Word</a>)</span></td>
 </tr>
 <tr>
-<td width="33%" class="link-index"><a href="pyparsing.CaselessKeyword-class.html#__init__">__init__()</a><br />
-<span class="index-where">(in <a href="pyparsing.CaselessKeyword-class.html">CaselessKeyword</a>)</span></td>
+<td width="33%" class="link-index"><a href="pyparsing.And-class.html#__init__">__init__()</a><br />
+<span class="index-where">(in <a href="pyparsing.And-class.html">And</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing.ParseResults-class.html#__new__">__new__()</a><br />
 <span class="index-where">(in <a href="pyparsing.ParseResults-class.html">ParseResults</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing.ZeroOrMore-class.html#__str__">__str__()</a><br />
 <span class="index-where">(in <a href="pyparsing.ZeroOrMore-class.html">ZeroOrMore</a>)</span></td>
 </tr>
 <tr>
-<td width="33%" class="link-index"><a href="pyparsing.CaselessLiteral-class.html#__init__">__init__()</a><br />
-<span class="index-where">(in <a href="pyparsing.CaselessLiteral-class.html">CaselessLiteral</a>)</span></td>
+<td width="33%" class="link-index"><a href="pyparsing.CaselessKeyword-class.html#__init__">__init__()</a><br />
+<span class="index-where">(in <a href="pyparsing.CaselessKeyword-class.html">CaselessKeyword</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing.ParserElement-class.html#__or__">__or__()</a><br />
 <span class="index-where">(in <a href="pyparsing.ParserElement-class.html">ParserElement</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing.ParserElement-class.html#__sub__">__sub__()</a><br />
 <span class="index-where">(in <a href="pyparsing.ParserElement-class.html">ParserElement</a>)</span></td>
 </tr>
 <tr>
-<td width="33%" class="link-index"><a href="pyparsing.CharsNotIn-class.html#__init__">__init__()</a><br />
-<span class="index-where">(in <a href="pyparsing.CharsNotIn-class.html">CharsNotIn</a>)</span></td>
+<td width="33%" class="link-index"><a href="pyparsing.CaselessLiteral-class.html#__init__">__init__()</a><br />
+<span class="index-where">(in <a href="pyparsing.CaselessLiteral-class.html">CaselessLiteral</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing-module.html#__package__">__package__</a><br />
 <span class="index-where">(in <a href="pyparsing-module.html">pyparsing</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing-module.html#__versionTime__">__versionTime__</a><br />
 <span class="index-where">(in <a href="pyparsing-module.html">pyparsing</a>)</span></td>
 </tr>
 <tr>
-<td width="33%" class="link-index"><a href="pyparsing.Combine-class.html#__init__">__init__()</a><br />
-<span class="index-where">(in <a href="pyparsing.Combine-class.html">Combine</a>)</span></td>
+<td width="33%" class="link-index"><a href="pyparsing.CharsNotIn-class.html#__init__">__init__()</a><br />
+<span class="index-where">(in <a href="pyparsing.CharsNotIn-class.html">CharsNotIn</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing.ParseResults-class.html#__radd__">__radd__()</a><br />
 <span class="index-where">(in <a href="pyparsing.ParseResults-class.html">ParseResults</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing.ParserElement-class.html#__xor__">__xor__()</a><br />
 <span class="index-where">(in <a href="pyparsing.ParserElement-class.html">ParserElement</a>)</span></td>
 </tr>
 <tr>
-<td width="33%" class="link-index"><a href="pyparsing.Dict-class.html#__init__">__init__()</a><br />
-<span class="index-where">(in <a href="pyparsing.Dict-class.html">Dict</a>)</span></td>
+<td width="33%" class="link-index"><a href="pyparsing.Combine-class.html#__init__">__init__()</a><br />
+<span class="index-where">(in <a href="pyparsing.Combine-class.html">Combine</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing.ParserElement-class.html#__radd__">__radd__()</a><br />
 <span class="index-where">(in <a href="pyparsing.ParserElement-class.html">ParserElement</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing-module.html#_bslash">_bslash</a><br />
 <span class="index-where">(in <a href="pyparsing-module.html">pyparsing</a>)</span></td>
 </tr>
 <tr>
-<td width="33%" class="link-index"><a href="pyparsing.Each-class.html#__init__">__init__()</a><br />
-<span class="index-where">(in <a href="pyparsing.Each-class.html">Each</a>)</span></td>
+<td width="33%" class="link-index"><a href="pyparsing.Dict-class.html#__init__">__init__()</a><br />
+<span class="index-where">(in <a href="pyparsing.Dict-class.html">Dict</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing.ParserElement-class.html#__rand__">__rand__()</a><br />
 <span class="index-where">(in <a href="pyparsing.ParserElement-class.html">ParserElement</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing-module.html#_charRange">_charRange</a><br />
 <span class="index-where">(in <a href="pyparsing-module.html">pyparsing</a>)</span></td>
 </tr>
 <tr>
-<td width="33%" class="link-index"><a href="pyparsing.Empty-class.html#__init__">__init__()</a><br />
-<span class="index-where">(in <a href="pyparsing.Empty-class.html">Empty</a>)</span></td>
+<td width="33%" class="link-index"><a href="pyparsing.Each-class.html#__init__">__init__()</a><br />
+<span class="index-where">(in <a href="pyparsing.Each-class.html">Each</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing.ParseBaseException-class.html#__repr__">__repr__()</a><br />
 <span class="index-where">(in <a href="pyparsing.ParseBaseException-class.html">ParseBaseException</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing-module.html#_commasepitem">_commasepitem</a><br />
 <span class="index-where">(in <a href="pyparsing-module.html">pyparsing</a>)</span></td>
 </tr>
 <tr>
-<td width="33%" class="link-index"><a href="pyparsing.FollowedBy-class.html#__init__">__init__()</a><br />
-<span class="index-where">(in <a href="pyparsing.FollowedBy-class.html">FollowedBy</a>)</span></td>
+<td width="33%" class="link-index"><a href="pyparsing.Empty-class.html#__init__">__init__()</a><br />
+<span class="index-where">(in <a href="pyparsing.Empty-class.html">Empty</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing.ParseResults-class.html#__repr__">__repr__()</a><br />
 <span class="index-where">(in <a href="pyparsing.ParseResults-class.html">ParseResults</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing-module.html#_escapedHexChar">_escapedHexChar</a><br />
 <span class="index-where">(in <a href="pyparsing-module.html">pyparsing</a>)</span></td>
 </tr>
 <tr>
-<td width="33%" class="link-index"><a href="pyparsing.Forward-class.html#__init__">__init__()</a><br />
-<span class="index-where">(in <a href="pyparsing.Forward-class.html">Forward</a>)</span></td>
+<td width="33%" class="link-index"><a href="pyparsing.FollowedBy-class.html#__init__">__init__()</a><br />
+<span class="index-where">(in <a href="pyparsing.FollowedBy-class.html">FollowedBy</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing.ParserElement-class.html#__repr__">__repr__()</a><br />
 <span class="index-where">(in <a href="pyparsing.ParserElement-class.html">ParserElement</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing-module.html#_escapedOctChar">_escapedOctChar</a><br />
 <span class="index-where">(in <a href="pyparsing-module.html">pyparsing</a>)</span></td>
 </tr>
 <tr>
-<td width="33%" class="link-index"><a href="pyparsing.GoToColumn-class.html#__init__">__init__()</a><br />
-<span class="index-where">(in <a href="pyparsing.GoToColumn-class.html">GoToColumn</a>)</span></td>
+<td width="33%" class="link-index"><a href="pyparsing.Forward-class.html#__init__">__init__()</a><br />
+<span class="index-where">(in <a href="pyparsing.Forward-class.html">Forward</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing.ParserElement-class.html#__req__">__req__()</a><br />
 <span class="index-where">(in <a href="pyparsing.ParserElement-class.html">ParserElement</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing-module.html#_escapedPunc">_escapedPunc</a><br />
 <span class="index-where">(in <a href="pyparsing-module.html">pyparsing</a>)</span></td>
 </tr>
 <tr>
-<td width="33%" class="link-index"><a href="pyparsing.Group-class.html#__init__">__init__()</a><br />
-<span class="index-where">(in <a href="pyparsing.Group-class.html">Group</a>)</span></td>
+<td width="33%" class="link-index"><a href="pyparsing.GoToColumn-class.html#__init__">__init__()</a><br />
+<span class="index-where">(in <a href="pyparsing.GoToColumn-class.html">GoToColumn</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing.ParseResults-class.html#__reversed__">__reversed__()</a><br />
 <span class="index-where">(in <a href="pyparsing.ParseResults-class.html">ParseResults</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing.pyparsing_common-class.html#_full_ipv6_address">_full_ipv6_address</a><br />
 <span class="index-where">(in <a href="pyparsing.pyparsing_common-class.html">pyparsing_common</a>)</span></td>
 </tr>
 <tr>
-<td width="33%" class="link-index"><a href="pyparsing.Keyword-class.html#__init__">__init__()</a><br />
-<span class="index-where">(in <a href="pyparsing.Keyword-class.html">Keyword</a>)</span></td>
+<td width="33%" class="link-index"><a href="pyparsing.Group-class.html#__init__">__init__()</a><br />
+<span class="index-where">(in <a href="pyparsing.Group-class.html">Group</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing.ParserElement-class.html#__rmul__">__rmul__()</a><br />
 <span class="index-where">(in <a href="pyparsing.ParserElement-class.html">ParserElement</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing.pyparsing_common-class.html#_html_stripper">_html_stripper</a><br />
 <span class="index-where">(in <a href="pyparsing.pyparsing_common-class.html">pyparsing_common</a>)</span></td>
 </tr>
 <tr>
-<td width="33%" class="link-index"><a href="pyparsing.LineEnd-class.html#__init__">__init__()</a><br />
-<span class="index-where">(in <a href="pyparsing.LineEnd-class.html">LineEnd</a>)</span></td>
+<td width="33%" class="link-index"><a href="pyparsing.Keyword-class.html#__init__">__init__()</a><br />
+<span class="index-where">(in <a href="pyparsing.Keyword-class.html">Keyword</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing.ParserElement-class.html#__rne__">__rne__()</a><br />
 <span class="index-where">(in <a href="pyparsing.ParserElement-class.html">ParserElement</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing-module.html#_htmlEntityMap">_htmlEntityMap</a><br />
 <span class="index-where">(in <a href="pyparsing-module.html">pyparsing</a>)</span></td>
 </tr>
 <tr>
-<td width="33%" class="link-index"><a href="pyparsing.LineStart-class.html#__init__">__init__()</a><br />
-<span class="index-where">(in <a href="pyparsing.LineStart-class.html">LineStart</a>)</span></td>
+<td width="33%" class="link-index"><a href="pyparsing.LineEnd-class.html#__init__">__init__()</a><br />
+<span class="index-where">(in <a href="pyparsing.LineEnd-class.html">LineEnd</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing.ParserElement-class.html#__ror__">__ror__()</a><br />
 <span class="index-where">(in <a href="pyparsing.ParserElement-class.html">ParserElement</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing.pyparsing_common-class.html#_ipv6_part">_ipv6_part</a><br />
 <span class="index-where">(in <a href="pyparsing.pyparsing_common-class.html">pyparsing_common</a>)</span></td>
 </tr>
 <tr>
-<td width="33%" class="link-index"><a href="pyparsing.Literal-class.html#__init__">__init__()</a><br />
-<span class="index-where">(in <a href="pyparsing.Literal-class.html" onclick="show_private();">Literal</a>)</span></td>
+<td width="33%" class="link-index"><a href="pyparsing.LineStart-class.html#__init__">__init__()</a><br />
+<span class="index-where">(in <a href="pyparsing.LineStart-class.html">LineStart</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing.ParserElement-class.html#__rsub__">__rsub__()</a><br />
 <span class="index-where">(in <a href="pyparsing.ParserElement-class.html">ParserElement</a>)</span></td>
 <td width="33%" class="link-index"><a href="pyparsing.ParseResults-class.html#_iteritems">_iteritems()</a><br />
 <span class="index-where">(in <a href="pyparsing.ParseResults-class.html">ParseResults</a>)</span></td>
 </tr>
 <tr>
-<td width="33%" class="link-index"><a href="pyparsing.MatchFirst-class.html#__init__">__init__()</a><br />
-<span class="index-where">(in <a href="pyparsing.MatchFirst-class.html">MatchFirst</a>)</span></td>
... 12910 lines suppressed ...

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/pyparsing.git



More information about the Python-modules-commits mailing list