From: Pablo Galindo <Pablogsal@gmail.com>
Date: Sat, 2 May 2020 04:23:39 +0000 (+0100)
Subject: bpo-40334: regenerate metaparser as part of regen-all (GH-19854)
X-Git-Tag: v3.9.0b1~207
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d2baff4301387e232495491f7291903cc1217d21;p=thirdparty%2FPython%2Fcpython.git

bpo-40334: regenerate metaparser as part of regen-all (GH-19854)
---

diff --git a/Makefile.pre.in b/Makefile.pre.in
index fa7fb1fcc167..2b0b1b205a94 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -745,8 +745,9 @@ regen-importlib: Programs/_freeze_importlib
 ############################################################################
 # Regenerate all generated files
 
-regen-all: regen-opcode regen-opcode-targets regen-typeslots regen-grammar regen-pegen \
-	regen-token regen-keyword regen-symbol regen-ast regen-importlib clinic
+regen-all: regen-opcode regen-opcode-targets regen-typeslots regen-grammar \
+	regen-token regen-keyword regen-symbol regen-ast regen-importlib clinic \
+	regen-pegen-metaparser regen-pegen
 
 ############################################################################
 # Special rules for object files
@@ -820,6 +821,14 @@ regen-grammar: regen-token
 	$(UPDATE_FILE) $(srcdir)/Include/graminit.h $(srcdir)/Include/graminit.h.new
 	$(UPDATE_FILE) $(srcdir)/Python/graminit.c $(srcdir)/Python/graminit.c.new
 
+.PHONY: regen-pegen-metaparser
+regen-pegen-metaparser:
+	PYTHONPATH=$(srcdir)/Tools/peg_generator $(PYTHON_FOR_REGEN) -m pegen -q python \
+	$(srcdir)/Tools/peg_generator/pegen/metagrammar.gram \
+	-o $(srcdir)/Tools/peg_generator/pegen/grammar_parser.py.new
+	$(UPDATE_FILE) $(srcdir)/Tools/peg_generator/pegen/grammar_parser.py \
+	$(srcdir)/Tools/peg_generator/pegen/grammar_parser.py.new
+
 .PHONY: regen-pegen
 regen-pegen:
 	@$(MKDIR_P) $(srcdir)/Parser/pegen
diff --git a/Tools/peg_generator/pegen/grammar_parser.py b/Tools/peg_generator/pegen/grammar_parser.py
index 0e206ee9cd5e..c784cfdf3b26 100644
--- a/Tools/peg_generator/pegen/grammar_parser.py
+++ b/Tools/peg_generator/pegen/grammar_parser.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python3.8
-# @generated by pegen from pegen/metagrammar.gram
+# @generated by pegen from ./Tools/peg_generator/pegen/metagrammar.gram
 
 import ast
 import sys