diff options
author | ptmcg <ptmcg@9bf210a0-9d2d-494c-87cf-cfb32e7dff7b> | 2016-09-11 01:40:36 +0000 |
---|---|---|
committer | ptmcg <ptmcg@9bf210a0-9d2d-494c-87cf-cfb32e7dff7b> | 2016-09-11 01:40:36 +0000 |
commit | 12db691af41a9ca25fea5245b9a69d0aea163d1d (patch) | |
tree | 0fa3f3ea91cdbc7a7c1cbb7a3aa35004dd73251d | |
parent | d9ff4b919f4d0a899b9b1bc54993ef0ff4aa08a0 (diff) | |
download | pyparsing-12db691af41a9ca25fea5245b9a69d0aea163d1d.tar.gz |
Fix typo in doc string; add comment on support for ()'s in infixNotation
git-svn-id: svn://svn.code.sf.net/p/pyparsing/code/trunk@435 9bf210a0-9d2d-494c-87cf-cfb32e7dff7b
-rw-r--r-- | src/CHANGES | 6 | ||||
-rw-r--r-- | src/pyparsing.py | 9 |
2 files changed, 11 insertions, 4 deletions
diff --git a/src/CHANGES b/src/CHANGES index 5689d53..4158bb7 100644 --- a/src/CHANGES +++ b/src/CHANGES @@ -2,6 +2,12 @@ Change Log
==========
+Version 2.1.10 -
+-------------------------------
+- Added support for regex module (alternative to Python's built-in
+ re module).
+
+
Version 2.1.9 - September, 2016
-------------------------------
- Added class CloseMatch, a variation on Literal which matches
diff --git a/src/pyparsing.py b/src/pyparsing.py index d602a35..70fe4eb 100644 --- a/src/pyparsing.py +++ b/src/pyparsing.py @@ -60,8 +60,8 @@ The pyparsing module handles some of the problems that are typically vexing when - embedded comments
"""
-__version__ = "2.1.9"
-__versionTime__ = "10 Sep 2016 15:10 UTC"
+__version__ = "2.1.10"
+__versionTime__ = "11 Sep 2016 01:15 UTC"
__author__ = "Paul McGuire <ptmcg@users.sourceforge.net>"
import string
@@ -2172,7 +2172,7 @@ class ParserElement(object): def matches(self, testString, parseAll=True):
"""
Method for quick testing of a parser against a test string. Good for simple
- inline microtests of sub expressions while building up larger parser.0
+ inline microtests of sub expressions while building up larger parser.
Parameters:
- testString - to test against this expression for a match
@@ -4983,7 +4983,8 @@ def infixNotation( baseExpr, opList, lpar=Suppress('('), rpar=Suppress(')') ): Helper method for constructing grammars of expressions made up of
operators working in a precedence hierarchy. Operators may be unary or
binary, left- or right-associative. Parse actions can also be attached
- to operator expressions.
+ to operator expressions. The generated parser will also recognize the use
+ of parentheses to override operator precedences (see example below).
Parameters:
- baseExpr - expression representing the most basic element for the nested
|