diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2020-06-20 17:59:32 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-20 17:59:32 (GMT) |
| commit | 98621817504add1e985e2526614921bbe0d24fb6 (patch) | |
| tree | 2887c29f6208b9d714e0dd736907fe2c29bfd3ae /Tools/peg_generator/pegen | |
| parent | c9f83c173b0cc62d6fcdc363e9ab05f6664ff8f3 (diff) | |
| download | cpython-98621817504add1e985e2526614921bbe0d24fb6.zip cpython-98621817504add1e985e2526614921bbe0d24fb6.tar.gz cpython-98621817504add1e985e2526614921bbe0d24fb6.tar.bz2 | |
bpo-41044: Generate valid PEG python parsers for opt+seq rules (GH-20995)
Co-authored-by: Pablo Galindo <Pablogsal@gmail.com>
(cherry picked from commit 55460ee6dc9a4f16bd68d6b6be3a8398c7d4a596)
Co-authored-by: Batuhan Taskaya <isidentical@gmail.com>
Diffstat (limited to 'Tools/peg_generator/pegen')
| -rw-r--r-- | Tools/peg_generator/pegen/python_generator.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Tools/peg_generator/pegen/python_generator.py b/Tools/peg_generator/pegen/python_generator.py index 6433655..45a7597 100644 --- a/Tools/peg_generator/pegen/python_generator.py +++ b/Tools/peg_generator/pegen/python_generator.py @@ -93,7 +93,13 @@ class PythonCallMakerVisitor(GrammarVisitor): def visit_Opt(self, node: Opt) -> Tuple[str, str]: name, call = self.visit(node.node) - return "opt", f"{call}," # Note trailing comma! + # Note trailing comma (the call may already have one comma + # at the end, for example when rules have both repeat0 and optional + # markers, e.g: [rule*]) + if call.endswith(","): + return "opt", call + else: + return "opt", f"{call}," def visit_Repeat0(self, node: Repeat0) -> Tuple[str, str]: if node in self.cache: |