Rename pgen2 -> pgen

Author: pablogsal

Include/graminit.h

@@ -783,12 +783,11 @@ Python/sysmodule.o: $(srcdir)/Python/sysmodule.c Makefile
 $(IO_OBJS): $(IO_H)
 
 .PHONY: regen-grammar
-regen-grammar:
+regen-grammar: regen-token
 	# Regenerate Include/graminit.h and Python/graminit.c
-	# from Grammar/Grammar using pgen2
+	# from Grammar/Grammar using pgen
 	@$(MKDIR_P) Include
 	$(PYTHON_FOR_REGEN) -m Parser.pgen $(srcdir)/Grammar/Grammar \
-		$(srcdir)/Grammar/Tokens \
 		$(srcdir)/Include/graminit.h.new \
 		$(srcdir)/Python/graminit.c.new
 	$(UPDATE_FILE) $(srcdir)/Include/graminit.h $(srcdir)/Include/graminit.h.new

Makefile.pre.in

@@ -6,12 +6,12 @@
 class Grammar(grammar.Grammar):
 
     def produce_graminit_h(self, writer):
-        writer("/* Generated by Parser/pgen2 */\n\n")
+        writer("/* Generated by Parser/pgen */\n\n")
         for number, symbol in self.number2symbol.items():
             writer("#define {} {}\n".format(symbol, number))
 
     def produce_graminit_c(self, writer):
-        writer("/* Generated by Parser/pgen2 */\n\n")
+        writer("/* Generated by Parser/pgen */\n\n")
 
         writer('#include "pgenheaders.h"\n')
         writer('#include "grammar.h"\n')

Parser/pgen/grammar.py

@@ -1,4 +1,4 @@
-/* Generated by Parser/pgen2 */
+/* Generated by Parser/pgen */
 
 #include "pgenheaders.h"
 #include "grammar.h"