[Python-checkins] python/dist/src/Parser Python.asdl, 1.1, 2.1 asdl.py, 1.1, 2.1 asdl_c.py, 1.1, 2.1 spark.py, 1.1, 2.1 .cvsignore, 2.1, 2.2 grammar.mak, 1.4, 1.5 parsetok.c, 2.37, 2.38

jhylton@users.sourceforge.net jhylton at users.sourceforge.net
Thu Oct 20 21:59:28 CEST 2005


Update of /cvsroot/python/python/dist/src/Parser
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2121/Parser

Modified Files:
	.cvsignore grammar.mak parsetok.c 
Added Files:
	Python.asdl asdl.py asdl_c.py spark.py 
Log Message:
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. 







Index: .cvsignore
===================================================================
RCS file: /cvsroot/python/python/dist/src/Parser/.cvsignore,v
retrieving revision 2.1
retrieving revision 2.2
diff -u -d -r2.1 -r2.2
--- .cvsignore	2 May 2000 18:34:01 -0000	2.1
+++ .cvsignore	20 Oct 2005 19:59:24 -0000	2.2
@@ -1,3 +1,6 @@
 Makefile
 pgen
 add2lib
+asdl.pyc
+asdl_c.pyc
+spark.pyc

Index: grammar.mak
===================================================================
RCS file: /cvsroot/python/python/dist/src/Parser/grammar.mak,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- grammar.mak	17 Jun 2003 00:05:53 -0000	1.4
+++ grammar.mak	20 Oct 2005 19:59:24 -0000	1.5
@@ -15,7 +15,7 @@
 # particular case --pragma in PC\pyconfig.h, which demands that
 # python23.lib get linked in).
 
-LIBS= ..\PCbuild\python23.lib
+LIBS= ..\PCbuild\python25.lib
 
 CFLAGS= /I ..\Include /I ..\PC /D MS_NO_COREDLL /D PGEN /MD
 

Index: parsetok.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Parser/parsetok.c,v
retrieving revision 2.37
retrieving revision 2.38
diff -u -d -r2.37 -r2.38
--- parsetok.c	2 Oct 2005 01:48:51 -0000	2.37
+++ parsetok.c	20 Oct 2005 19:59:24 -0000	2.38
@@ -21,7 +21,7 @@
 node *
 PyParser_ParseString(const char *s, grammar *g, int start, perrdetail *err_ret)
 {
-	return PyParser_ParseStringFlags(s, g, start, err_ret, 0);
+	return PyParser_ParseStringFlagsFilename(s, NULL, g, start, err_ret, 0);
 }
 
 node *
@@ -56,7 +56,6 @@
 	return parsetok(tok, g, start, err_ret, flags);
 }
 
-
 /* Parse input coming from a file.  Return error code, print some errors. */
 
 node *
@@ -210,7 +209,7 @@
 }
 
 static void
-initerr(perrdetail *err_ret, const char* filename)
+initerr(perrdetail *err_ret, const char *filename)
 {
 	err_ret->error = E_OK;
 	err_ret->filename = filename;



More information about the Python-checkins mailing list