Merge ast-branch to head

This change implements a new bytecode compiler, based on a
transformation of the parse tree to an abstract syntax defined in
Parser/Python.asdl.

The compiler implementation is not complete, but it is in stable
enough shape to run the entire test suite excepting two disabled
tests.

1 files changed, 93 insertions, 37 deletions

diff --git a/PCbuild/pythoncore.vcproj b/PCbuild/pythoncore.vcproj
index 945fd5c..ff9e48b 100644
--- a/PCbuild/pythoncore.vcproj
+++ b/PCbuild/pythoncore.vcproj
@@ -3,6 +3,7 @@
 	ProjectType="Visual C++"
 	Version="7.10"
 	Name="pythoncore"
+	ProjectGUID="{7AFA1F0B-A8A1-455A-A832-BF263404BBEF}"
 	SccProjectName="pythoncore"
 	SccLocalPath="..">
 	<Platforms>
@@ -478,6 +479,12 @@
 			</FileConfiguration>
 		</File>
 		<File
+			RelativePath="..\Python\asdl.c">
+		</File>
+		<File
+			RelativePath="..\Python\ast.c">
+		</File>
+		<File
 			RelativePath="..\Modules\audioop.c">
 			<FileConfiguration
 				Name="Release|Win32">
@@ -802,10 +809,13 @@
 			</FileConfiguration>
 		</File>
 		<File
+			RelativePath="..\Objects\codeobject.c">
+		</File>
+		<File
 			RelativePath="..\Modules\collectionsmodule.c">
 		</File>
 		<File
-			RelativePath="..\Python\compile.c">
+			RelativePath="..\Objects\complexobject.c">
 			<FileConfiguration
 				Name="Release|Win32">
 				<Tool
@@ -832,7 +842,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\Objects\complexobject.c">
+			RelativePath="..\PC\config.c">
 			<FileConfiguration
 				Name="Release|Win32">
 				<Tool
@@ -859,7 +869,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\PC\config.c">
+			RelativePath="..\Modules\cPickle.c">
 			<FileConfiguration
 				Name="Release|Win32">
 				<Tool
@@ -886,7 +896,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\Modules\cPickle.c">
+			RelativePath="..\Modules\cStringIO.c">
 			<FileConfiguration
 				Name="Release|Win32">
 				<Tool
@@ -913,7 +923,10 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\Modules\cStringIO.c">
+			RelativePath="..\Modules\datetimemodule.c">
+		</File>
+		<File
+			RelativePath="..\Objects\descrobject.c">
 			<FileConfiguration
 				Name="Release|Win32">
 				<Tool
@@ -940,10 +953,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\Modules\datetimemodule.c">
-		</File>
-		<File
-			RelativePath="..\Objects\descrobject.c">
+			RelativePath="..\Objects\dictobject.c">
 			<FileConfiguration
 				Name="Release|Win32">
 				<Tool
@@ -970,7 +980,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\Objects\dictobject.c">
+			RelativePath="..\PC\dl_nt.c">
 			<FileConfiguration
 				Name="Release|Win32">
 				<Tool
@@ -997,7 +1007,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\PC\dl_nt.c">
+			RelativePath="..\Python\dynload_win.c">
 			<FileConfiguration
 				Name="Release|Win32">
 				<Tool
@@ -1024,7 +1034,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\Python\dynload_win.c">
+			RelativePath="..\Objects\enumobject.c">
 			<FileConfiguration
 				Name="Release|Win32">
 				<Tool
@@ -1051,7 +1061,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\Objects\enumobject.c">
+			RelativePath="..\Modules\errnomodule.c">
 			<FileConfiguration
 				Name="Release|Win32">
 				<Tool
@@ -1078,7 +1088,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\Modules\errnomodule.c">
+			RelativePath="..\Python\errors.c">
 			<FileConfiguration
 				Name="Release|Win32">
 				<Tool
@@ -1105,7 +1115,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\Python\errors.c">
+			RelativePath="..\Python\exceptions.c">
 			<FileConfiguration
 				Name="Release|Win32">
 				<Tool
@@ -1132,7 +1142,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\Python\exceptions.c">
+			RelativePath="..\Objects\fileobject.c">
 			<FileConfiguration
 				Name="Release|Win32">
 				<Tool
@@ -1159,7 +1169,10 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\Objects\fileobject.c">
+			RelativePath="..\Parser\firstsets.c">
+		</File>
+		<File
+			RelativePath="..\Objects\floatobject.c">
 			<FileConfiguration
 				Name="Release|Win32">
 				<Tool
@@ -1186,7 +1199,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\Objects\floatobject.c">
+			RelativePath="..\Objects\frameobject.c">
 			<FileConfiguration
 				Name="Release|Win32">
 				<Tool
@@ -1213,7 +1226,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\Objects\frameobject.c">
+			RelativePath="..\Python\frozen.c">
 			<FileConfiguration
 				Name="Release|Win32">
 				<Tool
@@ -1240,7 +1253,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\Python\frozen.c">
+			RelativePath="..\Objects\funcobject.c">
 			<FileConfiguration
 				Name="Release|Win32">
 				<Tool
@@ -1267,7 +1280,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\Objects\funcobject.c">
+			RelativePath="..\Modules\functionalmodule.c">
 			<FileConfiguration
 				Name="Release|Win32">
 				<Tool
@@ -1648,6 +1661,9 @@
 			</FileConfiguration>
 		</File>
 		<File
+			RelativePath="..\Parser\grammar.c">
+		</File>
+		<File
 			RelativePath="..\Parser\grammar1.c">
 			<FileConfiguration
 				Name="Release|Win32">
@@ -2302,6 +2318,9 @@
 			</FileConfiguration>
 		</File>
 		<File
+			RelativePath="..\Python\compile.c">
+		</File>
+		<File
 			RelativePath="..\Parser\node.c">
 			<FileConfiguration
 				Name="Release|Win32">
@@ -2437,9 +2456,6 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\Modules\parsermodule.c">
-		</File>
-		<File
 			RelativePath="..\Parser\parsetok.c">
 			<FileConfiguration
 				Name="Release|Win32">
@@ -2467,6 +2483,9 @@
 			</FileConfiguration>
 		</File>
 		<File
+			RelativePath="..\Parser\pgen.c">
+		</File>
+		<File
 			RelativePath="..\Modules\posixmodule.c">
 			<FileConfiguration
 				Name="Release|Win32">
@@ -2551,6 +2570,9 @@
 			RelativePath="..\Python\pystrtod.c">
 		</File>
 		<File
+			RelativePath="..\Python\Python-ast.c">
+		</File>
+		<File
 			RelativePath="..\PC\python_nt.rc">
 			<FileConfiguration
 				Name="Release|Win32">
@@ -2764,6 +2786,7 @@
 			</FileConfiguration>
 		</File>
 		<File
+<<<<<<< pythoncore.vcproj
                         RelativePath="..\Modules\sha256module.c">
 			<FileConfiguration
 				Name="Release|Win32">
@@ -2819,6 +2842,9 @@
 		</File>
 		<File
 			RelativePath="..\Modules\signalmodule.c">
+=======
+                        RelativePath="..\Modules\sha256module.c">
+>>>>>>> 1.26.2.3
 			<FileConfiguration
 				Name="Release|Win32">
 				<Tool
@@ -2845,7 +2871,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\Objects\sliceobject.c">
+                        RelativePath="..\Modules\sha512module.c">
 			<FileConfiguration
 				Name="Release|Win32">
 				<Tool
@@ -2872,7 +2898,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\Objects\stringobject.c">
+			RelativePath="..\Modules\signalmodule.c">
 			<FileConfiguration
 				Name="Release|Win32">
 				<Tool
@@ -2899,7 +2925,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\Modules\stropmodule.c">
+			RelativePath="..\Objects\sliceobject.c">
 			<FileConfiguration
 				Name="Release|Win32">
 				<Tool
@@ -2926,7 +2952,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\Python\structmember.c">
+			RelativePath="..\Objects\stringobject.c">
 			<FileConfiguration
 				Name="Release|Win32">
 				<Tool
@@ -2953,7 +2979,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\Modules\structmodule.c">
+			RelativePath="..\Modules\stropmodule.c">
 			<FileConfiguration
 				Name="Release|Win32">
 				<Tool
@@ -2980,7 +3006,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\Objects\structseq.c">
+			RelativePath="..\Python\structmember.c">
 			<FileConfiguration
 				Name="Release|Win32">
 				<Tool
@@ -3007,7 +3033,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\Python\symtable.c">
+			RelativePath="..\Modules\structmodule.c">
 			<FileConfiguration
 				Name="Release|Win32">
 				<Tool
@@ -3034,10 +3060,34 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\Modules\symtablemodule.c">
+			RelativePath="..\Objects\structseq.c">
+			<FileConfiguration
+				Name="Release|Win32">
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="2"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;USE_DL_EXPORT;$(NoInherit)"/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Debug|Win32">
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="ReleaseItanium|Win32">
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="2"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;USE_DL_EXPORT;$(NoInherit)"/>
+			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\Python\sysmodule.c">
+			RelativePath="..\Python\symtable.c">
 			<FileConfiguration
 				Name="Release|Win32">
 				<Tool
@@ -3064,7 +3114,10 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\Python\thread.c">
+			RelativePath="..\Modules\symtablemodule.c">
+		</File>
+		<File
+			RelativePath="..\Python\sysmodule.c">
 			<FileConfiguration
 				Name="Release|Win32">
 				<Tool
@@ -3091,7 +3144,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\Modules\threadmodule.c">
+			RelativePath="..\Python\thread.c">
 			<FileConfiguration
 				Name="Release|Win32">
 				<Tool
@@ -3118,7 +3171,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\Modules\timemodule.c">
+			RelativePath="..\Modules\threadmodule.c">
 			<FileConfiguration
 				Name="Release|Win32">
 				<Tool
@@ -3145,7 +3198,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\Parser\tokenizer.c">
+			RelativePath="..\Modules\timemodule.c">
 			<FileConfiguration
 				Name="Release|Win32">
 				<Tool
@@ -3172,6 +3225,9 @@
 			</FileConfiguration>
 		</File>
 		<File
+			RelativePath="..\Parser\tokenizer_pgen.c">
+		</File>
+		<File
 			RelativePath="..\Python\traceback.c">
 			<FileConfiguration
 				Name="Release|Win32">