Skip to content

Commit 67d3078

Browse files
committed
Some code cleanup in Forward._generateDefaultName and srange
1 parent 28ef77e commit 67d3078

2 files changed

Lines changed: 20 additions & 11 deletions

File tree

‎pyparsing/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ def __repr__(self):
121121

122122

123123
__version_info__ = version_info(3, 2, 2, "final", 1)
124-
__version_time__ = "18 Mar 2025 02:27 UTC"
124+
__version_time__ = "18 Mar 2025 23:03 UTC"
125125
__version__ = __version_info__.__version__
126126
__versionTime__ = __version_time__
127127
__author__ = "Paul McGuire <[email protected]>"

‎pyparsing/core.py‎

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5763,18 +5763,20 @@ def validate(self, validateTrace=None) -> None:
57635763

57645764
def _generateDefaultName(self) -> str:
57655765
# Avoid infinite recursion by setting a temporary _defaultName
5766+
save_default_name = self._defaultName
57665767
self._defaultName = ": ..."
57675768

57685769
# Use the string representation of main expression.
57695770
try:
57705771
if self.expr is not None:
5771-
retString = str(self.expr)[:1000]
5772+
ret_string = str(self.expr)[:1000]
57725773
else:
5773-
retString = "None"
5774+
ret_string = "None"
57745775
except Exception:
5775-
retString = "..."
5776+
ret_string = "..."
57765777

5777-
return f"{type(self).__name__}: {retString}"
5778+
self._defaultName = save_default_name
5779+
return f"{type(self).__name__}: {ret_string}"
57785780

57795781
def copy(self) -> ParserElement:
57805782
if self.expr is not None:
@@ -6155,13 +6157,20 @@ def srange(s: str) -> str:
61556157
- any combination of the above (``'aeiouy'``,
61566158
``'a-zA-Z0-9_$'``, etc.)
61576159
"""
6158-
_expanded = lambda p: (
6159-
p
6160-
if not isinstance(p, ParseResults)
6161-
else "".join(chr(c) for c in range(ord(p[0]), ord(p[1]) + 1))
6162-
)
6160+
def _expanded(p):
6161+
if isinstance(p, ParseResults):
6162+
yield from (chr(c) for c in range(ord(p[0]), ord(p[1]) + 1))
6163+
else:
6164+
yield p
6165+
61636166
try:
6164-
return "".join(_expanded(part) for part in _reBracketExpr.parse_string(s).body)
6167+
return "".join(
6168+
[
6169+
c
6170+
for part in _reBracketExpr.parse_string(s).body
6171+
for c in _expanded(part)
6172+
]
6173+
)
61656174
except Exception as e:
61666175
return ""
61676176

0 commit comments

Comments
 (0)