summaryrefslogtreecommitdiffstats
path: root/Tools/peg_generator/pegen/grammar_parser.py
diff options
context:
space:
mode:
authorPablo Galindo <Pablogsal@gmail.com>2021-02-02 19:54:22 (GMT)
committerGitHub <noreply@github.com>2021-02-02 19:54:22 (GMT)
commit58fb156edda1a0e924a38bfed494bd06cb09c9a3 (patch)
tree6d09348120225209479d011aa83be95d488e3380 /Tools/peg_generator/pegen/grammar_parser.py
parent802b645e81a72399a7ef47ef000d468c775dcd3e (diff)
downloadcpython-58fb156edda1a0e924a38bfed494bd06cb09c9a3.zip
cpython-58fb156edda1a0e924a38bfed494bd06cb09c9a3.tar.gz
cpython-58fb156edda1a0e924a38bfed494bd06cb09c9a3.tar.bz2
bpo-42997: Improve error message for missing : before suites (GH-24292)
* Add to the peg generator a new directive ('&&') that allows to expect a token and hard fail the parsing if the token is not found. This allows to quickly emmit syntax errors for missing tokens. * Use the new grammar element to hard-fail if the ':' is missing before suites.
Diffstat (limited to 'Tools/peg_generator/pegen/grammar_parser.py')
-rw-r--r--Tools/peg_generator/pegen/grammar_parser.py29
1 files changed, 28 insertions, 1 deletions
diff --git a/Tools/peg_generator/pegen/grammar_parser.py b/Tools/peg_generator/pegen/grammar_parser.py
index 6e3bc50..fde0145 100644
--- a/Tools/peg_generator/pegen/grammar_parser.py
+++ b/Tools/peg_generator/pegen/grammar_parser.py
@@ -13,6 +13,7 @@ from ast import literal_eval
from pegen.grammar import (
Alt,
Cut,
+ Forced,
Gather,
Group,
Item,
@@ -402,7 +403,7 @@ class GeneratedParser(Parser):
@memoize
def named_item(self) -> Optional[NamedItem]:
- # named_item: NAME '[' NAME '*' ']' '=' ~ item | NAME '[' NAME ']' '=' ~ item | NAME '=' ~ item | item | lookahead
+ # named_item: NAME '[' NAME '*' ']' '=' ~ item | NAME '[' NAME ']' '=' ~ item | NAME '=' ~ item | item | forced_atom | lookahead
mark = self.mark()
cut = False
if (
@@ -466,6 +467,13 @@ class GeneratedParser(Parser):
if cut: return None
cut = False
if (
+ (it := self.forced_atom())
+ ):
+ return NamedItem ( None , it )
+ self.reset(mark)
+ if cut: return None
+ cut = False
+ if (
(it := self.lookahead())
):
return NamedItem ( None , it )
@@ -474,6 +482,25 @@ class GeneratedParser(Parser):
return None
@memoize
+ def forced_atom(self) -> Optional[NamedItem]:
+ # forced_atom: '&' '&' ~ atom
+ mark = self.mark()
+ cut = False
+ if (
+ (literal := self.expect('&'))
+ and
+ (literal_1 := self.expect('&'))
+ and
+ (cut := True)
+ and
+ (atom := self.atom())
+ ):
+ return Forced ( atom )
+ self.reset(mark)
+ if cut: return None
+ return None
+
+ @memoize
def lookahead(self) -> Optional[LookaheadOrCut]:
# lookahead: '&' ~ atom | '!' ~ atom | '~'
mark = self.mark()