Move _expanded to inside soope of srange, since it is not used anywhere else

git-svn-id: svn://svn.code.sf.net/p/pyparsing/code/trunk@258 9bf210a0-9d2d-494c-87cf-cfb32e7dff7b

1 files changed, 1 insertions, 2 deletions

diff --git a/src/pyparsing.py b/src/pyparsing.py
index 1d76bbd..f96a0fb 100644
--- a/src/pyparsing.py
+++ b/src/pyparsing.py
@@ -3264,8 +3264,6 @@ _singleChar = _escapedPunc | _escapedHexChar | _escapedOctChar | Word(printables
 _charRange = Group(_singleChar + Suppress("-") + _singleChar)

 _reBracketExpr = Literal("[") + Optional("^").setResultsName("negate") + Group( OneOrMore( _charRange | _singleChar ) ).setResultsName("body") + "]"

 

-_expanded = lambda p: (isinstance(p,ParseResults) and ''.join(unichr(c) for c in range(ord(p[0]),ord(p[1])+1)) or p)

-

 def srange(s):

     r"""Helper to easily define string ranges for use in Word construction.  Borrows

        syntax from regexp '[]' string range definitions::

@@ -3283,6 +3281,7 @@ def srange(s):
           a range of any of the above, separated by a dash ('a-z', etc.)

           any combination of the above ('aeiouy', 'a-zA-Z0-9_$', etc.)

     """

+    _expanded = lambda p: p if not isinstance(p,ParseResults) else ''.join(unichr(c) for c in range(ord(p[0]),ord(p[1])+1))

     try:

         return "".join(_expanded(part) for part in _reBracketExpr.parseString(s).body)

     except: