Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add a make_copies parameter to .leave_whitespace() #526

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add a make_copies parameter to .leave_whitespace() #526

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
29 changes: 18 additions & 11 deletions pyparsing/core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1731,13 +1731,14 @@ def ignore_whitespace(self, recursive: bool = True) -> "ParserElement":
self.skipWhitespace = True
return self

def leave_whitespace(self, recursive: bool = True) -> "ParserElement":
def leave_whitespace(self, recursive: bool = True, make_copies: bool = True) -> "ParserElement":
"""
Disables the skipping of whitespace before matching the characters in the
:class:`ParserElement`'s defined pattern. This is normally only used internally by
the pyparsing module, but may be needed in some whitespace-sensitive grammars.

:param recursive: If true (the default), also disable whitespace skipping in child elements (if any)
:param make_copies: If true (the default), child elements (if any) are copied before disabling.
"""
self.skipWhitespace = False
return self
Expand Down Expand Up @@ -3735,17 +3736,21 @@ def append(self, other) -> ParserElement:
self._defaultName = None
return self

def leave_whitespace(self, recursive: bool = True) -> ParserElement:
def leave_whitespace(self, recursive: bool = True, make_copies: bool = True) -> ParserElement:
"""
Extends ``leave_whitespace`` defined in base class, and also invokes ``leave_whitespace`` on
all contained expressions.
"""
super().leave_whitespace(recursive)

super().leave_whitespace(recursive, make_copies)

if recursive:
self.exprs = [e.copy() for e in self.exprs]
if make_copies:
self.exprs = [e.copy() for e in self.exprs]

for e in self.exprs:
e.leave_whitespace(recursive)
e.leave_whitespace(recursive, make_copies)

return self

def ignore_whitespace(self, recursive: bool = True) -> ParserElement:
Expand Down Expand Up @@ -4521,13 +4526,15 @@ def parseImpl(self, instring, loc, doActions=True):
else:
raise ParseException(instring, loc, "No expression defined", self)

def leave_whitespace(self, recursive: bool = True) -> ParserElement:
super().leave_whitespace(recursive)
def leave_whitespace(self, recursive: bool = True, make_copies: bool = True) -> ParserElement:
super().leave_whitespace(recursive, make_copies)

if recursive:
if self.expr is not None:
if recursive and self.expr is not None:
if make_copies:
self.expr = self.expr.copy()
self.expr.leave_whitespace(recursive)

self.expr.leave_whitespace(recursive, make_copies)

return self

def ignore_whitespace(self, recursive: bool = True) -> ParserElement:
Expand Down Expand Up @@ -5539,7 +5546,7 @@ def parseImpl(self, instring, loc, doActions=True):
raise
prev_loc, prev_peek = memo[peek_key] = new_loc, new_peek

def leave_whitespace(self, recursive: bool = True) -> ParserElement:
def leave_whitespace(self, recursive: bool = True, make_copies: bool = True) -> ParserElement:
self.skipWhitespace = False
return self

Expand Down