From 455bd8b0db19817dc70792602411c1ebeca63cd3 Mon Sep 17 00:00:00 2001 From: ptmcg Date: Sun, 26 Jun 2011 17:12:24 +0000 Subject: Add ungroup; add excludeChars arg to Word; package for 1.5.6 release git-svn-id: svn://svn.code.sf.net/p/pyparsing/code/src@211 9bf210a0-9d2d-494c-87cf-cfb32e7dff7b --- CHANGES | 21 +- HowToUsePyparsing.html | 571 ++++++++++++++++++++++++------------------------- HowToUsePyparsing.txt | 64 ++---- pyparsing.py | 53 +++-- pyparsing_py2.py | 53 +++-- pyparsing_py3.py | 44 ++-- 6 files changed, 396 insertions(+), 410 deletions(-) diff --git a/CHANGES b/CHANGES index d3f20a5..78573a2 100644 --- a/CHANGES +++ b/CHANGES @@ -2,7 +2,7 @@ Change Log ========== -Version 1.5.6 - May, 2011 +Version 1.5.6 - June, 2011 ---------------------------- - Cleanup of parse action normalizing code, to be more version-tolerant, and robust in the face of future Python versions - much thanks to @@ -16,6 +16,11 @@ Version 1.5.6 - May, 2011 expression would duplicate subsequent tokens - reported by Frankie Ribery on stackoverflow, thanks! +- Added 'ungroup' helper method, to address token grouping done + implicitly by And expressions, even if only one expression in the + And actually returns any text - also inspired by stackoverflow + discussion with Frankie Ribery! + - Fixed bug in srange, which accepted escaped hex characters of the form '\0x##', but should be '\x##'. Both forms will be supported for backwards compatibility. @@ -29,10 +34,9 @@ Version 1.5.6 - May, 2011 yourself using it in a commercial purpose, please consider making a charitable donation as described in the parser's header. -- Added other new examples: - . protobuf parser - parses Google's protobuf language - . btpyparse - a BibTex parser contributed by Matthew Brett, - with test suite test_bibparse.py (thanks, Matthew!) +- Added the excludeChars argument to the Word class, to simplify defining + a word composed of all characters in a large range except for one or + two. Suggested by JesterEE on the pyparsing wiki. - Added optional overlap parameter to scanString, to return overlapping matches found in the source text. @@ -52,6 +56,13 @@ Version 1.5.6 - May, 2011 - Fixed up internal list flattener to use iteration instead of recursion, to avoid stack overflow when transforming large files. +- Added other new examples: + . protobuf parser - parses Google's protobuf language + . btpyparse - a BibTex parser contributed by Matthew Brett, + with test suite test_bibparse.py (thanks, Matthew!) + . groupUsingListAllMatches.py - demo using trailing '*' for results + names + Version 1.5.5 - August, 2010 ---------------------------- diff --git a/HowToUsePyparsing.html b/HowToUsePyparsing.html index 3f31765..b071fcb 100644 --- a/HowToUsePyparsing.html +++ b/HowToUsePyparsing.html @@ -3,16 +3,16 @@ - + Using the pyparsing module - - + +