From c5c4ca6438ec0114c187beb6b8a2298b41eb9fe2 Mon Sep 17 00:00:00 2001 From: ptmcg Date: Fri, 5 Jul 2019 10:26:16 -0500 Subject: Further mods to `Forward.__str__` to possibly address memory issues reported in #85 and #91, and also does not stomp on user-defined expression names --- pyparsing.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'pyparsing.py') diff --git a/pyparsing.py b/pyparsing.py index 93efe48..febefc2 100644 --- a/pyparsing.py +++ b/pyparsing.py @@ -96,7 +96,7 @@ classes inherit from. Use the docstrings for examples of how to: """ __version__ = "2.4.1" -__versionTime__ = "05 Jul 2019 04:57 UTC" +__versionTime__ = "05 Jul 2019 15:20 UTC" __author__ = "Paul McGuire " import string @@ -4793,19 +4793,22 @@ class Forward(ParseElementEnhance): def __str__( self ): if hasattr(self, "name"): return self.name + if self.strRepr is not None: + return self.strRepr - # Avoid infinite recursion by setting a temporary name - self.name = self.__class__.__name__ + ": ..." + # Avoid infinite recursion by setting a temporary strRepr + self.strRepr = ": ..." # Use the string representation of main expression. + retString = '...' try: if self.expr is not None: - retString = _ustr(self.expr) + retString = _ustr(self.expr)[:1000] else: retString = "None" finally: - self.name = self.__class__.__name__ + ": " + retString - return self.name + self.strRepr = self.__class__.__name__ + ": " + retString + return self.strRepr def copy(self): if self.expr is not None: -- cgit v1.2.1