| 
									
										
										
										
											1991-06-04 19:42:30 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  | /* Write Python objects to files and read them back.
 | 
					
						
							|  |  |  |    This is intended for writing and reading compiled Python code only; | 
					
						
							|  |  |  |    a true persistent storage facility would be much harder, since | 
					
						
							|  |  |  |    it would have to take circular links and sharing into account. */ | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											1997-04-29 20:08:16 +00:00
										 |  |  | #include "Python.h"
 | 
					
						
							| 
									
										
										
										
											1991-06-04 19:42:30 +00:00
										 |  |  | #include "longintrepr.h"
 | 
					
						
							|  |  |  | #include "compile.h"
 | 
					
						
							|  |  |  | #include "marshal.h"
 | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2000-06-28 18:47:56 +00:00
										 |  |  | /* High water mark to determine when the marshalled object is dangerously deep
 | 
					
						
							|  |  |  |  * and risks coring the interpreter.  When the object stack gets this deep, | 
					
						
							|  |  |  |  * raise an exception instead of continuing. | 
					
						
							|  |  |  |  */ | 
					
						
							|  |  |  | #define MAX_MARSHAL_STACK_DEPTH 5000
 | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											1991-06-04 19:42:30 +00:00
										 |  |  | #define TYPE_NULL	'0'
 | 
					
						
							|  |  |  | #define TYPE_NONE	'N'
 | 
					
						
							| 
									
										
										
										
											2001-06-18 22:08:13 +00:00
										 |  |  | #define TYPE_STOPITER	'S'
 | 
					
						
							| 
									
										
										
										
											1996-10-11 16:25:41 +00:00
										 |  |  | #define TYPE_ELLIPSIS   '.'
 | 
					
						
							| 
									
										
										
										
											1991-06-04 19:42:30 +00:00
										 |  |  | #define TYPE_INT	'i'
 | 
					
						
							| 
									
										
										
										
											1996-12-05 23:15:02 +00:00
										 |  |  | #define TYPE_INT64	'I'
 | 
					
						
							| 
									
										
										
										
											1991-06-04 19:42:30 +00:00
										 |  |  | #define TYPE_FLOAT	'f'
 | 
					
						
							| 
									
										
										
										
											1996-01-12 01:09:56 +00:00
										 |  |  | #define TYPE_COMPLEX	'x'
 | 
					
						
							| 
									
										
										
										
											1991-06-04 19:42:30 +00:00
										 |  |  | #define TYPE_LONG	'l'
 | 
					
						
							|  |  |  | #define TYPE_STRING	's'
 | 
					
						
							|  |  |  | #define TYPE_TUPLE	'('
 | 
					
						
							|  |  |  | #define TYPE_LIST	'['
 | 
					
						
							|  |  |  | #define TYPE_DICT	'{'
 | 
					
						
							| 
									
										
										
										
											1995-07-18 14:51:37 +00:00
										 |  |  | #define TYPE_CODE	'c'
 | 
					
						
							| 
									
										
										
										
											2000-03-10 23:03:02 +00:00
										 |  |  | #define TYPE_UNICODE	'u'
 | 
					
						
							| 
									
										
										
										
											1991-06-04 19:42:30 +00:00
										 |  |  | #define TYPE_UNKNOWN	'?'
 | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											1993-01-21 16:07:51 +00:00
										 |  |  | typedef struct { | 
					
						
							|  |  |  | 	FILE *fp; | 
					
						
							| 
									
										
										
										
											1996-06-26 20:41:23 +00:00
										 |  |  | 	int error; | 
					
						
							| 
									
										
										
										
											2000-06-28 18:47:56 +00:00
										 |  |  | 	int depth; | 
					
						
							| 
									
										
										
										
											1993-01-21 16:07:51 +00:00
										 |  |  | 	/* If fp == NULL, the following are valid: */ | 
					
						
							| 
									
										
										
										
											1997-04-29 20:08:16 +00:00
										 |  |  | 	PyObject *str; | 
					
						
							| 
									
										
										
										
											1993-01-21 16:07:51 +00:00
										 |  |  | 	char *ptr; | 
					
						
							|  |  |  | 	char *end; | 
					
						
							|  |  |  | } WFILE; | 
					
						
							| 
									
										
										
										
											1991-06-04 19:42:30 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											1993-01-21 16:07:51 +00:00
										 |  |  | #define w_byte(c, p) if (((p)->fp)) putc((c), (p)->fp); \
 | 
					
						
							|  |  |  | 		      else if ((p)->ptr != (p)->end) *(p)->ptr++ = (c); \ | 
					
						
							|  |  |  | 			   else w_more(c, p) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | static void | 
					
						
							| 
									
										
										
										
											2000-07-23 18:24:06 +00:00
										 |  |  | w_more(int c, WFILE *p) | 
					
						
							| 
									
										
										
										
											1993-01-21 16:07:51 +00:00
										 |  |  | { | 
					
						
							|  |  |  | 	int size, newsize; | 
					
						
							|  |  |  | 	if (p->str == NULL) | 
					
						
							|  |  |  | 		return; /* An error already occurred */ | 
					
						
							| 
									
										
										
										
											1997-04-29 20:08:16 +00:00
										 |  |  | 	size = PyString_Size(p->str); | 
					
						
							| 
									
										
										
										
											1993-01-21 16:07:51 +00:00
										 |  |  | 	newsize = size + 1024; | 
					
						
							| 
									
										
										
										
											1997-04-29 20:08:16 +00:00
										 |  |  | 	if (_PyString_Resize(&p->str, newsize) != 0) { | 
					
						
							| 
									
										
										
										
											1993-01-21 16:07:51 +00:00
										 |  |  | 		p->ptr = p->end = NULL; | 
					
						
							|  |  |  | 	} | 
					
						
							|  |  |  | 	else { | 
					
						
							| 
									
										
										
										
											1997-04-29 20:08:16 +00:00
										 |  |  | 		p->ptr = PyString_AS_STRING((PyStringObject *)p->str) + size; | 
					
						
							|  |  |  | 		p->end = | 
					
						
							|  |  |  | 			PyString_AS_STRING((PyStringObject *)p->str) + newsize; | 
					
						
							| 
									
										
										
										
											2000-07-23 19:28:35 +00:00
										 |  |  | 		*p->ptr++ = Py_SAFE_DOWNCAST(c, int, char); | 
					
						
							| 
									
										
										
										
											1993-01-21 16:07:51 +00:00
										 |  |  | 	} | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | static void | 
					
						
							| 
									
										
										
										
											2000-07-22 18:47:25 +00:00
										 |  |  | w_string(char *s, int n, WFILE *p) | 
					
						
							| 
									
										
										
										
											1993-01-21 16:07:51 +00:00
										 |  |  | { | 
					
						
							|  |  |  | 	if (p->fp != NULL) { | 
					
						
							|  |  |  | 		fwrite(s, 1, n, p->fp); | 
					
						
							|  |  |  | 	} | 
					
						
							|  |  |  | 	else { | 
					
						
							|  |  |  | 		while (--n >= 0) { | 
					
						
							|  |  |  | 			w_byte(*s, p); | 
					
						
							|  |  |  | 			s++; | 
					
						
							|  |  |  | 		} | 
					
						
							|  |  |  | 	} | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | static void | 
					
						
							| 
									
										
										
										
											2000-07-22 18:47:25 +00:00
										 |  |  | w_short(int x, WFILE *p) | 
					
						
							| 
									
										
										
										
											1991-06-04 19:42:30 +00:00
										 |  |  | { | 
					
						
							| 
									
										
										
										
											1993-01-21 16:07:51 +00:00
										 |  |  | 	w_byte( x      & 0xff, p); | 
					
						
							|  |  |  | 	w_byte((x>> 8) & 0xff, p); | 
					
						
							| 
									
										
										
										
											1991-06-04 19:42:30 +00:00
										 |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											1993-01-21 16:07:51 +00:00
										 |  |  | static void | 
					
						
							| 
									
										
										
										
											2000-07-22 18:47:25 +00:00
										 |  |  | w_long(long x, WFILE *p) | 
					
						
							| 
									
										
										
										
											1991-06-04 19:42:30 +00:00
										 |  |  | { | 
					
						
							| 
									
										
										
										
											1993-01-21 16:07:51 +00:00
										 |  |  | 	w_byte((int)( x      & 0xff), p); | 
					
						
							|  |  |  | 	w_byte((int)((x>> 8) & 0xff), p); | 
					
						
							|  |  |  | 	w_byte((int)((x>>16) & 0xff), p); | 
					
						
							|  |  |  | 	w_byte((int)((x>>24) & 0xff), p); | 
					
						
							| 
									
										
										
										
											1991-06-04 19:42:30 +00:00
										 |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											1996-12-10 15:39:04 +00:00
										 |  |  | #if SIZEOF_LONG > 4
 | 
					
						
							| 
									
										
										
										
											1996-12-05 23:15:02 +00:00
										 |  |  | static void | 
					
						
							| 
									
										
										
										
											2000-07-22 18:47:25 +00:00
										 |  |  | w_long64(long x, WFILE *p) | 
					
						
							| 
									
										
										
										
											1996-12-05 23:15:02 +00:00
										 |  |  | { | 
					
						
							|  |  |  | 	w_long(x, p); | 
					
						
							| 
									
										
										
										
											1996-12-10 15:39:04 +00:00
										 |  |  | 	w_long(x>>32, p); | 
					
						
							| 
									
										
										
										
											1996-12-05 23:15:02 +00:00
										 |  |  | } | 
					
						
							| 
									
										
										
										
											1996-12-10 15:39:04 +00:00
										 |  |  | #endif
 | 
					
						
							| 
									
										
										
										
											1996-12-05 23:15:02 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											1993-01-21 16:07:51 +00:00
										 |  |  | static void | 
					
						
							| 
									
										
										
										
											2000-07-22 18:47:25 +00:00
										 |  |  | w_object(PyObject *v, WFILE *p) | 
					
						
							| 
									
										
										
										
											1991-06-04 19:42:30 +00:00
										 |  |  | { | 
					
						
							| 
									
										
										
										
											1995-02-17 15:10:07 +00:00
										 |  |  | 	int i, n; | 
					
						
							| 
									
										
										
										
											2000-06-28 18:47:56 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  | 	p->depth++; | 
					
						
							| 
									
										
										
										
											2001-01-28 00:27:39 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2000-06-28 18:47:56 +00:00
										 |  |  | 	if (p->depth > MAX_MARSHAL_STACK_DEPTH) { | 
					
						
							|  |  |  | 		p->error = 2; | 
					
						
							| 
									
										
										
										
											2001-01-28 00:27:39 +00:00
										 |  |  | 	} | 
					
						
							| 
									
										
										
										
											2000-06-28 18:47:56 +00:00
										 |  |  | 	else if (v == NULL) { | 
					
						
							| 
									
										
										
										
											1993-01-21 16:07:51 +00:00
										 |  |  | 		w_byte(TYPE_NULL, p); | 
					
						
							| 
									
										
										
										
											1998-04-10 22:27:42 +00:00
										 |  |  | 	} | 
					
						
							|  |  |  | 	else if (v == Py_None) { | 
					
						
							| 
									
										
										
										
											1993-01-21 16:07:51 +00:00
										 |  |  | 		w_byte(TYPE_NONE, p); | 
					
						
							| 
									
										
										
										
											1998-04-10 22:27:42 +00:00
										 |  |  | 	} | 
					
						
							| 
									
										
										
										
											2001-06-18 22:08:13 +00:00
										 |  |  | 	else if (v == PyExc_StopIteration) { | 
					
						
							|  |  |  | 		w_byte(TYPE_STOPITER, p); | 
					
						
							|  |  |  | 	} | 
					
						
							| 
									
										
										
										
											1998-04-10 22:27:42 +00:00
										 |  |  | 	else if (v == Py_Ellipsis) { | 
					
						
							|  |  |  | 	        w_byte(TYPE_ELLIPSIS, p); | 
					
						
							|  |  |  | 	} | 
					
						
							| 
									
										
										
										
											1997-04-29 20:08:16 +00:00
										 |  |  | 	else if (PyInt_Check(v)) { | 
					
						
							|  |  |  | 		long x = PyInt_AS_LONG((PyIntObject *)v); | 
					
						
							| 
									
										
										
										
											1996-12-10 15:39:04 +00:00
										 |  |  | #if SIZEOF_LONG > 4
 | 
					
						
							| 
									
										
										
										
											2001-04-10 05:02:52 +00:00
										 |  |  | 		long y = Py_ARITHMETIC_RIGHT_SHIFT(long, x, 31); | 
					
						
							| 
									
										
										
										
											1996-12-05 23:15:02 +00:00
										 |  |  | 		if (y && y != -1) { | 
					
						
							|  |  |  | 			w_byte(TYPE_INT64, p); | 
					
						
							|  |  |  | 			w_long64(x, p); | 
					
						
							|  |  |  | 		} | 
					
						
							| 
									
										
										
										
											1996-12-10 15:39:04 +00:00
										 |  |  | 		else | 
					
						
							|  |  |  | #endif
 | 
					
						
							|  |  |  | 			{ | 
					
						
							| 
									
										
										
										
											1996-12-05 23:15:02 +00:00
										 |  |  | 			w_byte(TYPE_INT, p); | 
					
						
							|  |  |  | 			w_long(x, p); | 
					
						
							|  |  |  | 		} | 
					
						
							| 
									
										
										
										
											1991-06-04 19:42:30 +00:00
										 |  |  | 	} | 
					
						
							| 
									
										
										
										
											1997-04-29 20:08:16 +00:00
										 |  |  | 	else if (PyLong_Check(v)) { | 
					
						
							|  |  |  | 		PyLongObject *ob = (PyLongObject *)v; | 
					
						
							| 
									
										
										
										
											1993-01-21 16:07:51 +00:00
										 |  |  | 		w_byte(TYPE_LONG, p); | 
					
						
							| 
									
										
										
										
											1991-06-04 19:42:30 +00:00
										 |  |  | 		n = ob->ob_size; | 
					
						
							| 
									
										
										
										
											1993-01-21 16:07:51 +00:00
										 |  |  | 		w_long((long)n, p); | 
					
						
							| 
									
										
										
										
											1991-06-04 19:42:30 +00:00
										 |  |  | 		if (n < 0) | 
					
						
							|  |  |  | 			n = -n; | 
					
						
							|  |  |  | 		for (i = 0; i < n; i++) | 
					
						
							| 
									
										
										
										
											1993-01-21 16:07:51 +00:00
										 |  |  | 			w_short(ob->ob_digit[i], p); | 
					
						
							| 
									
										
										
										
											1991-06-04 19:42:30 +00:00
										 |  |  | 	} | 
					
						
							| 
									
										
										
										
											1997-04-29 20:08:16 +00:00
										 |  |  | 	else if (PyFloat_Check(v)) { | 
					
						
							| 
									
										
										
										
											1991-06-04 19:42:30 +00:00
										 |  |  | 		char buf[256]; /* Plenty to format any double */ | 
					
						
							| 
									
										
										
										
											2001-05-08 15:19:57 +00:00
										 |  |  | 		PyFloat_AsReprString(buf, (PyFloatObject *)v); | 
					
						
							| 
									
										
										
										
											1991-06-04 19:42:30 +00:00
										 |  |  | 		n = strlen(buf); | 
					
						
							| 
									
										
										
										
											1993-01-21 16:07:51 +00:00
										 |  |  | 		w_byte(TYPE_FLOAT, p); | 
					
						
							| 
									
										
										
										
											1995-02-17 15:10:07 +00:00
										 |  |  | 		w_byte(n, p); | 
					
						
							|  |  |  | 		w_string(buf, n, p); | 
					
						
							| 
									
										
										
										
											1991-06-04 19:42:30 +00:00
										 |  |  | 	} | 
					
						
							| 
									
										
										
										
											1996-01-12 01:09:56 +00:00
										 |  |  | #ifndef WITHOUT_COMPLEX
 | 
					
						
							| 
									
										
										
										
											1997-04-29 20:08:16 +00:00
										 |  |  | 	else if (PyComplex_Check(v)) { | 
					
						
							| 
									
										
										
										
											1996-01-12 01:09:56 +00:00
										 |  |  | 		char buf[256]; /* Plenty to format any double */ | 
					
						
							| 
									
										
										
										
											1997-04-29 20:08:16 +00:00
										 |  |  | 		PyFloatObject *temp; | 
					
						
							| 
									
										
										
										
											1996-01-12 01:09:56 +00:00
										 |  |  | 		w_byte(TYPE_COMPLEX, p); | 
					
						
							| 
									
										
										
										
											1997-04-29 20:08:16 +00:00
										 |  |  | 		temp = (PyFloatObject*)PyFloat_FromDouble( | 
					
						
							|  |  |  | 			PyComplex_RealAsDouble(v)); | 
					
						
							| 
									
										
										
										
											2001-05-08 15:19:57 +00:00
										 |  |  | 		PyFloat_AsReprString(buf, temp); | 
					
						
							| 
									
										
										
										
											1997-04-29 20:08:16 +00:00
										 |  |  | 		Py_DECREF(temp); | 
					
						
							| 
									
										
										
										
											1996-01-12 01:09:56 +00:00
										 |  |  | 		n = strlen(buf); | 
					
						
							|  |  |  | 		w_byte(n, p); | 
					
						
							|  |  |  | 		w_string(buf, n, p); | 
					
						
							| 
									
										
										
										
											1997-04-29 20:08:16 +00:00
										 |  |  | 		temp = (PyFloatObject*)PyFloat_FromDouble( | 
					
						
							|  |  |  | 			PyComplex_ImagAsDouble(v)); | 
					
						
							| 
									
										
										
										
											2001-05-08 15:19:57 +00:00
										 |  |  | 		PyFloat_AsReprString(buf, temp); | 
					
						
							| 
									
										
										
										
											1997-04-29 20:08:16 +00:00
										 |  |  | 		Py_DECREF(temp); | 
					
						
							| 
									
										
										
										
											1996-01-12 01:09:56 +00:00
										 |  |  | 		n = strlen(buf); | 
					
						
							|  |  |  | 		w_byte(n, p); | 
					
						
							|  |  |  | 		w_string(buf, n, p); | 
					
						
							|  |  |  | 	} | 
					
						
							|  |  |  | #endif
 | 
					
						
							| 
									
										
										
										
											1997-04-29 20:08:16 +00:00
										 |  |  | 	else if (PyString_Check(v)) { | 
					
						
							| 
									
										
										
										
											1993-01-21 16:07:51 +00:00
										 |  |  | 		w_byte(TYPE_STRING, p); | 
					
						
							| 
									
										
										
										
											2000-03-10 23:03:02 +00:00
										 |  |  | 		n = PyString_GET_SIZE(v); | 
					
						
							| 
									
										
										
										
											1995-02-17 15:10:07 +00:00
										 |  |  | 		w_long((long)n, p); | 
					
						
							| 
									
										
										
										
											2000-03-10 23:03:02 +00:00
										 |  |  | 		w_string(PyString_AS_STRING(v), n, p); | 
					
						
							|  |  |  | 	} | 
					
						
							| 
									
										
										
										
											2001-08-17 18:39:25 +00:00
										 |  |  | #ifdef Py_USING_UNICODE
 | 
					
						
							| 
									
										
										
										
											2000-03-10 23:03:02 +00:00
										 |  |  | 	else if (PyUnicode_Check(v)) { | 
					
						
							|  |  |  | 	        PyObject *utf8; | 
					
						
							|  |  |  | 		utf8 = PyUnicode_AsUTF8String(v); | 
					
						
							|  |  |  | 		if (utf8 == NULL) { | 
					
						
							| 
									
										
										
										
											2000-06-28 23:24:19 +00:00
										 |  |  | 			p->depth--; | 
					
						
							|  |  |  | 			p->error = 1; | 
					
						
							|  |  |  | 			return; | 
					
						
							| 
									
										
										
										
											2000-03-10 23:03:02 +00:00
										 |  |  | 		} | 
					
						
							|  |  |  | 		w_byte(TYPE_UNICODE, p); | 
					
						
							|  |  |  | 		n = PyString_GET_SIZE(utf8); | 
					
						
							|  |  |  | 		w_long((long)n, p); | 
					
						
							|  |  |  | 		w_string(PyString_AS_STRING(utf8), n, p); | 
					
						
							|  |  |  | 		Py_DECREF(utf8); | 
					
						
							| 
									
										
										
										
											1991-06-04 19:42:30 +00:00
										 |  |  | 	} | 
					
						
							| 
									
										
										
										
											2001-08-17 18:39:25 +00:00
										 |  |  | #endif
 | 
					
						
							| 
									
										
										
										
											1997-04-29 20:08:16 +00:00
										 |  |  | 	else if (PyTuple_Check(v)) { | 
					
						
							| 
									
										
										
										
											1993-01-21 16:07:51 +00:00
										 |  |  | 		w_byte(TYPE_TUPLE, p); | 
					
						
							| 
									
										
										
										
											1997-04-29 20:08:16 +00:00
										 |  |  | 		n = PyTuple_Size(v); | 
					
						
							| 
									
										
										
										
											1995-02-17 15:10:07 +00:00
										 |  |  | 		w_long((long)n, p); | 
					
						
							| 
									
										
										
										
											1991-06-04 19:42:30 +00:00
										 |  |  | 		for (i = 0; i < n; i++) { | 
					
						
							| 
									
										
										
										
											1997-04-29 20:08:16 +00:00
										 |  |  | 			w_object(PyTuple_GET_ITEM(v, i), p); | 
					
						
							| 
									
										
										
										
											1991-06-04 19:42:30 +00:00
										 |  |  | 		} | 
					
						
							|  |  |  | 	} | 
					
						
							| 
									
										
										
										
											1997-04-29 20:08:16 +00:00
										 |  |  | 	else if (PyList_Check(v)) { | 
					
						
							| 
									
										
										
										
											1993-01-21 16:07:51 +00:00
										 |  |  | 		w_byte(TYPE_LIST, p); | 
					
						
							| 
									
										
										
										
											2000-03-10 23:03:02 +00:00
										 |  |  | 		n = PyList_GET_SIZE(v); | 
					
						
							| 
									
										
										
										
											1995-02-17 15:10:07 +00:00
										 |  |  | 		w_long((long)n, p); | 
					
						
							| 
									
										
										
										
											1991-06-04 19:42:30 +00:00
										 |  |  | 		for (i = 0; i < n; i++) { | 
					
						
							| 
									
										
										
										
											2000-03-10 23:03:02 +00:00
										 |  |  | 			w_object(PyList_GET_ITEM(v, i), p); | 
					
						
							| 
									
										
										
										
											1991-06-04 19:42:30 +00:00
										 |  |  | 		} | 
					
						
							|  |  |  | 	} | 
					
						
							| 
									
										
										
										
											1997-04-29 20:08:16 +00:00
										 |  |  | 	else if (PyDict_Check(v)) { | 
					
						
							| 
									
										
										
										
											1993-05-19 14:50:45 +00:00
										 |  |  | 		int pos; | 
					
						
							| 
									
										
										
										
											1997-04-29 20:08:16 +00:00
										 |  |  | 		PyObject *key, *value; | 
					
						
							| 
									
										
										
										
											1993-01-21 16:07:51 +00:00
										 |  |  | 		w_byte(TYPE_DICT, p); | 
					
						
							| 
									
										
										
										
											1991-06-07 13:58:22 +00:00
										 |  |  | 		/* This one is NULL object terminated! */ | 
					
						
							| 
									
										
										
										
											1993-05-19 14:50:45 +00:00
										 |  |  | 		pos = 0; | 
					
						
							| 
									
										
										
										
											1997-04-29 20:08:16 +00:00
										 |  |  | 		while (PyDict_Next(v, &pos, &key, &value)) { | 
					
						
							| 
									
										
										
										
											1993-05-19 14:50:45 +00:00
										 |  |  | 			w_object(key, p); | 
					
						
							|  |  |  | 			w_object(value, p); | 
					
						
							| 
									
										
										
										
											1991-06-07 13:58:22 +00:00
										 |  |  | 		} | 
					
						
							| 
									
										
										
										
											1997-04-29 20:08:16 +00:00
										 |  |  | 		w_object((PyObject *)NULL, p); | 
					
						
							| 
									
										
										
										
											1991-06-07 13:58:22 +00:00
										 |  |  | 	} | 
					
						
							| 
									
										
										
										
											1997-04-29 20:08:16 +00:00
										 |  |  | 	else if (PyCode_Check(v)) { | 
					
						
							|  |  |  | 		PyCodeObject *co = (PyCodeObject *)v; | 
					
						
							| 
									
										
										
										
											1993-01-21 16:07:51 +00:00
										 |  |  | 		w_byte(TYPE_CODE, p); | 
					
						
							| 
									
										
										
										
											1995-07-18 14:51:37 +00:00
										 |  |  | 		w_short(co->co_argcount, p); | 
					
						
							|  |  |  | 		w_short(co->co_nlocals, p); | 
					
						
							| 
									
										
										
										
											1997-01-17 21:07:08 +00:00
										 |  |  | 		w_short(co->co_stacksize, p); | 
					
						
							| 
									
										
										
										
											1995-07-18 14:51:37 +00:00
										 |  |  | 		w_short(co->co_flags, p); | 
					
						
							| 
									
										
										
										
											1998-10-07 19:42:25 +00:00
										 |  |  | 		w_object(co->co_code, p); | 
					
						
							| 
									
										
										
										
											1993-01-21 16:07:51 +00:00
										 |  |  | 		w_object(co->co_consts, p); | 
					
						
							|  |  |  | 		w_object(co->co_names, p); | 
					
						
							| 
									
										
										
										
											1995-07-18 14:51:37 +00:00
										 |  |  | 		w_object(co->co_varnames, p); | 
					
						
							| 
									
										
											  
											
												PEP 227 implementation
The majority of the changes are in the compiler.  The mainloop changes
primarily to implement the new opcodes and to pass a function's
closure to eval_code2().  Frames and functions got new slots to hold
the closure.
Include/compile.h
    Add co_freevars and co_cellvars slots to code objects.
    Update PyCode_New() to take freevars and cellvars as arguments
Include/funcobject.h
    Add func_closure slot to function objects.
    Add GetClosure()/SetClosure() functions (and corresponding
    macros) for getting at the closure.
Include/frameobject.h
    PyFrame_New() now takes a closure.
Include/opcode.h
    Add four new opcodes: MAKE_CLOSURE, LOAD_CLOSURE, LOAD_DEREF,
    STORE_DEREF.
    Remove comment about old requirement for opcodes to fit in 7
    bits.
compile.c
    Implement changes to code objects for co_freevars and co_cellvars.
    Modify symbol table to use st_cur_name (string object for the name
    of the current scope) and st_cur_children (list of nested blocks).
    Also define st_nested, which might more properly be called
    st_cur_nested.  Add several DEF_XXX flags to track def-use
    information for free variables.
    New or modified functions of note:
    com_make_closure(struct compiling *, PyCodeObject *)
        Emit LOAD_CLOSURE opcodes as needed to pass cells for free
        variables into nested scope.
    com_addop_varname(struct compiling *, int, char *)
        Emits opcodes for LOAD_DEREF and STORE_DEREF.
    get_ref_type(struct compiling *, char *name)
        Return NAME_CLOSURE if ref type is FREE or CELL
    symtable_load_symbols(struct compiling *)
        Decides what variables are cell or free based on def-use info.
        Can now raise SyntaxError if nested scopes are mixed with
        exec or from blah import *.
    make_scope_info(PyObject *, PyObject *, int, int)
        Helper functions for symtable scope stack.
    symtable_update_free_vars(struct symtable *)
        After a code block has been analyzed, it must check each of
        its children for free variables that are not defined in the
        block.  If a variable is free in a child and not defined in
        the parent, then it is defined by block the enclosing the
        current one or it is a global.  This does the right logic.
    symtable_add_use() is now a macro for symtable_add_def()
    symtable_assign(struct symtable *, node *)
        Use goto instead of for (;;)
    Fixed bug in symtable where name of keyword argument in function
    call was treated as assignment in the scope of the call site. Ex:
        def f():
            g(a=2) # a was considered a local of f
ceval.c
    eval_code2() now take one more argument, a closure.
    Implement LOAD_CLOSURE, LOAD_DEREF, STORE_DEREF, MAKE_CLOSURE>
    Also: When name error occurs for global variable, report that the
    name was global in the error mesage.
Objects/frameobject.c
    Initialize f_closure to be a tuple containing space for cellvars
    and freevars.  f_closure is NULL if neither are present.
Objects/funcobject.c
    Add support for func_closure.
Python/import.c
    Change the magic number.
Python/marshal.c
    Track changes to code objects.
											
										 
											2001-01-25 20:06:59 +00:00
										 |  |  | 		w_object(co->co_freevars, p); | 
					
						
							|  |  |  | 		w_object(co->co_cellvars, p); | 
					
						
							| 
									
										
										
										
											1993-01-21 16:07:51 +00:00
										 |  |  | 		w_object(co->co_filename, p); | 
					
						
							| 
									
										
										
										
											1993-03-29 10:43:31 +00:00
										 |  |  | 		w_object(co->co_name, p); | 
					
						
							| 
									
										
										
										
											1997-01-24 03:44:17 +00:00
										 |  |  | 		w_short(co->co_firstlineno, p); | 
					
						
							|  |  |  | 		w_object(co->co_lnotab, p); | 
					
						
							| 
									
										
										
										
											1991-06-04 19:42:30 +00:00
										 |  |  | 	} | 
					
						
							| 
									
										
										
										
											2001-11-09 22:02:48 +00:00
										 |  |  | 	else if (PyObject_CheckReadBuffer(v)) { | 
					
						
							| 
									
										
										
										
											1998-10-07 19:42:25 +00:00
										 |  |  | 		/* Write unknown buffer-style objects as a string */ | 
					
						
							|  |  |  | 		char *s; | 
					
						
							| 
									
										
										
										
											2001-11-09 22:02:48 +00:00
										 |  |  | 		PyBufferProcs *pb = v->ob_type->tp_as_buffer; | 
					
						
							| 
									
										
										
										
											1998-10-07 19:42:25 +00:00
										 |  |  | 		w_byte(TYPE_STRING, p); | 
					
						
							|  |  |  | 		n = (*pb->bf_getreadbuffer)(v, 0, (void **)&s); | 
					
						
							|  |  |  | 		w_long((long)n, p); | 
					
						
							|  |  |  | 		w_string(s, n, p); | 
					
						
							|  |  |  | 	} | 
					
						
							| 
									
										
										
										
											1991-06-04 19:42:30 +00:00
										 |  |  | 	else { | 
					
						
							| 
									
										
										
										
											1993-01-21 16:07:51 +00:00
										 |  |  | 		w_byte(TYPE_UNKNOWN, p); | 
					
						
							| 
									
										
										
										
											1996-06-26 20:41:23 +00:00
										 |  |  | 		p->error = 1; | 
					
						
							| 
									
										
										
										
											1991-06-04 19:42:30 +00:00
										 |  |  | 	} | 
					
						
							| 
									
										
										
										
											2000-06-28 23:24:19 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  | 	p->depth--; | 
					
						
							| 
									
										
										
										
											1991-06-04 19:42:30 +00:00
										 |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											1993-01-21 16:07:51 +00:00
										 |  |  | void | 
					
						
							| 
									
										
										
										
											2000-07-22 18:47:25 +00:00
										 |  |  | PyMarshal_WriteLongToFile(long x, FILE *fp) | 
					
						
							| 
									
										
										
										
											1993-01-21 16:07:51 +00:00
										 |  |  | { | 
					
						
							|  |  |  | 	WFILE wf; | 
					
						
							|  |  |  | 	wf.fp = fp; | 
					
						
							| 
									
										
										
										
											1996-06-26 20:41:23 +00:00
										 |  |  | 	wf.error = 0; | 
					
						
							| 
									
										
										
										
											2000-06-28 18:47:56 +00:00
										 |  |  | 	wf.depth = 0; | 
					
						
							| 
									
										
										
										
											1993-01-21 16:07:51 +00:00
										 |  |  | 	w_long(x, &wf); | 
					
						
							|  |  |  | } | 
					
						
							| 
									
										
										
										
											1991-06-04 19:42:30 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											1993-01-21 16:07:51 +00:00
										 |  |  | void | 
					
						
							| 
									
										
										
										
											2000-07-22 18:47:25 +00:00
										 |  |  | PyMarshal_WriteObjectToFile(PyObject *x, FILE *fp) | 
					
						
							| 
									
										
										
										
											1993-01-21 16:07:51 +00:00
										 |  |  | { | 
					
						
							|  |  |  | 	WFILE wf; | 
					
						
							|  |  |  | 	wf.fp = fp; | 
					
						
							| 
									
										
										
										
											1996-06-26 20:41:23 +00:00
										 |  |  | 	wf.error = 0; | 
					
						
							| 
									
										
										
										
											2000-06-28 23:24:19 +00:00
										 |  |  | 	wf.depth = 0; | 
					
						
							| 
									
										
										
										
											1993-01-21 16:07:51 +00:00
										 |  |  | 	w_object(x, &wf); | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | typedef WFILE RFILE; /* Same struct with different invariants */ | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											1995-03-09 12:12:11 +00:00
										 |  |  | #define rs_byte(p) (((p)->ptr != (p)->end) ? (unsigned char)*(p)->ptr++ : EOF)
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | #define r_byte(p) ((p)->fp ? getc((p)->fp) : rs_byte(p))
 | 
					
						
							| 
									
										
										
										
											1993-01-21 16:07:51 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  | static int | 
					
						
							| 
									
										
										
										
											2000-07-22 18:47:25 +00:00
										 |  |  | r_string(char *s, int n, RFILE *p) | 
					
						
							| 
									
										
										
										
											1993-01-21 16:07:51 +00:00
										 |  |  | { | 
					
						
							|  |  |  | 	if (p->fp != NULL) | 
					
						
							|  |  |  | 		return fread(s, 1, n, p->fp); | 
					
						
							|  |  |  | 	if (p->end - p->ptr < n) | 
					
						
							|  |  |  | 		n = p->end - p->ptr; | 
					
						
							|  |  |  | 	memcpy(s, p->ptr, n); | 
					
						
							|  |  |  | 	p->ptr += n; | 
					
						
							|  |  |  | 	return n; | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | static int | 
					
						
							| 
									
										
										
										
											2000-07-22 18:47:25 +00:00
										 |  |  | r_short(RFILE *p) | 
					
						
							| 
									
										
										
										
											1991-06-04 19:42:30 +00:00
										 |  |  | { | 
					
						
							|  |  |  | 	register short x; | 
					
						
							| 
									
										
										
										
											1993-01-21 16:07:51 +00:00
										 |  |  | 	x = r_byte(p); | 
					
						
							|  |  |  | 	x |= r_byte(p) << 8; | 
					
						
							| 
									
										
										
										
											2000-09-19 08:54:13 +00:00
										 |  |  | 	/* Sign-extension, in case short greater than 16 bits */ | 
					
						
							|  |  |  | 	x |= -(x & 0x8000); | 
					
						
							| 
									
										
										
										
											1991-06-04 19:42:30 +00:00
										 |  |  | 	return x; | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											1993-01-21 16:07:51 +00:00
										 |  |  | static long | 
					
						
							| 
									
										
										
										
											2000-07-22 18:47:25 +00:00
										 |  |  | r_long(RFILE *p) | 
					
						
							| 
									
										
										
										
											1991-06-04 19:42:30 +00:00
										 |  |  | { | 
					
						
							|  |  |  | 	register long x; | 
					
						
							| 
									
										
										
										
											1995-03-09 12:12:11 +00:00
										 |  |  | 	register FILE *fp = p->fp; | 
					
						
							|  |  |  | 	if (fp) { | 
					
						
							|  |  |  | 		x = getc(fp); | 
					
						
							|  |  |  | 		x |= (long)getc(fp) << 8; | 
					
						
							|  |  |  | 		x |= (long)getc(fp) << 16; | 
					
						
							|  |  |  | 		x |= (long)getc(fp) << 24; | 
					
						
							|  |  |  | 	} | 
					
						
							|  |  |  | 	else { | 
					
						
							|  |  |  | 		x = rs_byte(p); | 
					
						
							|  |  |  | 		x |= (long)rs_byte(p) << 8; | 
					
						
							|  |  |  | 		x |= (long)rs_byte(p) << 16; | 
					
						
							|  |  |  | 		x |= (long)rs_byte(p) << 24; | 
					
						
							|  |  |  | 	} | 
					
						
							| 
									
										
										
										
											1996-12-10 15:39:04 +00:00
										 |  |  | #if SIZEOF_LONG > 4
 | 
					
						
							| 
									
										
										
										
											1996-12-05 23:15:02 +00:00
										 |  |  | 	/* Sign extension for 64-bit machines */ | 
					
						
							| 
									
										
										
										
											2000-09-19 08:54:13 +00:00
										 |  |  | 	x |= -(x & 0x80000000L); | 
					
						
							| 
									
										
										
										
											1996-12-10 15:39:04 +00:00
										 |  |  | #endif
 | 
					
						
							| 
									
										
										
										
											1996-12-05 23:15:02 +00:00
										 |  |  | 	return x; | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2001-08-29 02:28:42 +00:00
										 |  |  | /* r_long64 deals with the TYPE_INT64 code.  On a machine with
 | 
					
						
							|  |  |  |    sizeof(long) > 4, it returns a Python int object, else a Python long | 
					
						
							|  |  |  |    object.  Note that w_long64 writes out TYPE_INT if 32 bits is enough, | 
					
						
							|  |  |  |    so there's no inefficiency here in returning a PyLong on 32-bit boxes | 
					
						
							|  |  |  |    for everything written via TYPE_INT64 (i.e., if an int is written via | 
					
						
							|  |  |  |    TYPE_INT64, it *needs* more than 32 bits). | 
					
						
							|  |  |  | */ | 
					
						
							|  |  |  | static PyObject * | 
					
						
							| 
									
										
										
										
											2000-07-22 18:47:25 +00:00
										 |  |  | r_long64(RFILE *p) | 
					
						
							| 
									
										
										
										
											1996-12-05 23:15:02 +00:00
										 |  |  | { | 
					
						
							| 
									
										
										
										
											2001-08-29 02:28:42 +00:00
										 |  |  | 	long lo4 = r_long(p); | 
					
						
							|  |  |  | 	long hi4 = r_long(p); | 
					
						
							| 
									
										
										
										
											1996-12-10 15:39:04 +00:00
										 |  |  | #if SIZEOF_LONG > 4
 | 
					
						
							| 
									
										
										
										
											2001-08-29 02:28:42 +00:00
										 |  |  | 	long x = (hi4 << 32) | (lo4 & 0xFFFFFFFFL); | 
					
						
							|  |  |  | 	return PyInt_FromLong(x); | 
					
						
							| 
									
										
										
										
											1996-12-10 15:39:04 +00:00
										 |  |  | #else
 | 
					
						
							| 
									
										
										
										
											2001-08-29 02:28:42 +00:00
										 |  |  | 	unsigned char buf[8]; | 
					
						
							|  |  |  | 	int one = 1; | 
					
						
							|  |  |  | 	int is_little_endian = (int)*(char*)&one; | 
					
						
							|  |  |  | 	if (is_little_endian) { | 
					
						
							|  |  |  | 		memcpy(buf, &lo4, 4); | 
					
						
							|  |  |  | 		memcpy(buf+4, &hi4, 4); | 
					
						
							| 
									
										
										
										
											1996-12-05 23:15:02 +00:00
										 |  |  | 	} | 
					
						
							| 
									
										
										
										
											2001-08-29 02:28:42 +00:00
										 |  |  | 	else { | 
					
						
							|  |  |  | 		memcpy(buf, &hi4, 4); | 
					
						
							|  |  |  | 		memcpy(buf+4, &lo4, 4); | 
					
						
							|  |  |  | 	} | 
					
						
							|  |  |  | 	return _PyLong_FromByteArray(buf, 8, is_little_endian, 1); | 
					
						
							| 
									
										
										
										
											1996-12-10 15:39:04 +00:00
										 |  |  | #endif
 | 
					
						
							| 
									
										
										
										
											1991-06-04 19:42:30 +00:00
										 |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											1997-04-29 20:08:16 +00:00
										 |  |  | static PyObject * | 
					
						
							| 
									
										
										
										
											2000-07-22 18:47:25 +00:00
										 |  |  | r_object(RFILE *p) | 
					
						
							| 
									
										
										
										
											1991-06-04 19:42:30 +00:00
										 |  |  | { | 
					
						
							| 
									
										
										
										
											1997-04-29 20:08:16 +00:00
										 |  |  | 	PyObject *v, *v2; | 
					
						
							| 
									
										
										
										
											1991-06-04 19:42:30 +00:00
										 |  |  | 	long i, n; | 
					
						
							| 
									
										
										
										
											1993-01-21 16:07:51 +00:00
										 |  |  | 	int type = r_byte(p); | 
					
						
							| 
									
										
										
										
											2001-01-28 00:27:39 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											1991-06-04 19:42:30 +00:00
										 |  |  | 	switch (type) { | 
					
						
							| 
									
										
										
										
											2001-01-28 00:27:39 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											1991-06-04 19:42:30 +00:00
										 |  |  | 	case EOF: | 
					
						
							| 
									
										
										
										
											1997-04-29 20:08:16 +00:00
										 |  |  | 		PyErr_SetString(PyExc_EOFError, | 
					
						
							|  |  |  | 				"EOF read where object expected"); | 
					
						
							| 
									
										
										
										
											1991-06-04 19:42:30 +00:00
										 |  |  | 		return NULL; | 
					
						
							| 
									
										
										
										
											2001-01-28 00:27:39 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											1991-06-04 19:42:30 +00:00
										 |  |  | 	case TYPE_NULL: | 
					
						
							|  |  |  | 		return NULL; | 
					
						
							| 
									
										
										
										
											2001-01-28 00:27:39 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											1991-06-04 19:42:30 +00:00
										 |  |  | 	case TYPE_NONE: | 
					
						
							| 
									
										
										
										
											1997-04-29 20:08:16 +00:00
										 |  |  | 		Py_INCREF(Py_None); | 
					
						
							|  |  |  | 		return Py_None; | 
					
						
							| 
									
										
										
										
											2001-01-28 00:27:39 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2001-06-18 22:08:13 +00:00
										 |  |  | 	case TYPE_STOPITER: | 
					
						
							|  |  |  | 		Py_INCREF(PyExc_StopIteration); | 
					
						
							|  |  |  | 		return PyExc_StopIteration; | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											1996-10-11 16:25:41 +00:00
										 |  |  | 	case TYPE_ELLIPSIS: | 
					
						
							| 
									
										
										
										
											1997-04-29 20:08:16 +00:00
										 |  |  | 		Py_INCREF(Py_Ellipsis); | 
					
						
							| 
									
										
										
										
											1996-10-11 16:25:41 +00:00
										 |  |  | 		return Py_Ellipsis; | 
					
						
							| 
									
										
										
										
											2001-01-28 00:27:39 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											1991-06-04 19:42:30 +00:00
										 |  |  | 	case TYPE_INT: | 
					
						
							| 
									
										
										
										
											1997-04-29 20:08:16 +00:00
										 |  |  | 		return PyInt_FromLong(r_long(p)); | 
					
						
							| 
									
										
										
										
											2001-01-28 00:27:39 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											1996-12-05 23:15:02 +00:00
										 |  |  | 	case TYPE_INT64: | 
					
						
							| 
									
										
										
										
											2001-08-29 02:28:42 +00:00
										 |  |  | 		return r_long64(p); | 
					
						
							| 
									
										
										
										
											2001-01-28 00:27:39 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											1991-06-04 19:42:30 +00:00
										 |  |  | 	case TYPE_LONG: | 
					
						
							|  |  |  | 		{ | 
					
						
							|  |  |  | 			int size; | 
					
						
							| 
									
										
										
										
											1997-04-29 20:08:16 +00:00
										 |  |  | 			PyLongObject *ob; | 
					
						
							| 
									
										
										
										
											1993-01-21 16:07:51 +00:00
										 |  |  | 			n = r_long(p); | 
					
						
							| 
									
										
										
										
											1991-06-04 19:42:30 +00:00
										 |  |  | 			size = n<0 ? -n : n; | 
					
						
							| 
									
										
										
										
											1997-04-29 20:08:16 +00:00
										 |  |  | 			ob = _PyLong_New(size); | 
					
						
							| 
									
										
										
										
											1991-06-04 19:42:30 +00:00
										 |  |  | 			if (ob == NULL) | 
					
						
							|  |  |  | 				return NULL; | 
					
						
							|  |  |  | 			ob->ob_size = n; | 
					
						
							|  |  |  | 			for (i = 0; i < size; i++) | 
					
						
							| 
									
										
										
										
											1993-01-21 16:07:51 +00:00
										 |  |  | 				ob->ob_digit[i] = r_short(p); | 
					
						
							| 
									
										
										
										
											1997-04-29 20:08:16 +00:00
										 |  |  | 			return (PyObject *)ob; | 
					
						
							| 
									
										
										
										
											1991-06-04 19:42:30 +00:00
										 |  |  | 		} | 
					
						
							| 
									
										
										
										
											2001-01-28 00:27:39 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											1991-06-04 19:42:30 +00:00
										 |  |  | 	case TYPE_FLOAT: | 
					
						
							|  |  |  | 		{ | 
					
						
							|  |  |  | 			char buf[256]; | 
					
						
							| 
									
										
										
										
											1997-02-14 22:58:07 +00:00
										 |  |  | 			double dx; | 
					
						
							| 
									
										
										
										
											1993-01-21 16:07:51 +00:00
										 |  |  | 			n = r_byte(p); | 
					
						
							|  |  |  | 			if (r_string(buf, (int)n, p) != n) { | 
					
						
							| 
									
										
										
										
											1997-04-29 20:08:16 +00:00
										 |  |  | 				PyErr_SetString(PyExc_EOFError, | 
					
						
							| 
									
										
										
										
											1991-06-04 19:42:30 +00:00
										 |  |  | 					"EOF read where object expected"); | 
					
						
							|  |  |  | 				return NULL; | 
					
						
							|  |  |  | 			} | 
					
						
							|  |  |  | 			buf[n] = '\0'; | 
					
						
							| 
									
										
										
										
											1997-02-14 22:58:07 +00:00
										 |  |  | 			PyFPE_START_PROTECT("atof", return 0) | 
					
						
							|  |  |  | 			dx = atof(buf); | 
					
						
							| 
									
										
										
										
											1997-03-14 04:32:50 +00:00
										 |  |  | 			PyFPE_END_PROTECT(dx) | 
					
						
							| 
									
										
										
										
											1997-04-29 20:08:16 +00:00
										 |  |  | 			return PyFloat_FromDouble(dx); | 
					
						
							| 
									
										
										
										
											1991-06-04 19:42:30 +00:00
										 |  |  | 		} | 
					
						
							| 
									
										
										
										
											2001-01-28 00:27:39 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											1996-01-12 01:09:56 +00:00
										 |  |  | #ifndef WITHOUT_COMPLEX
 | 
					
						
							|  |  |  | 	case TYPE_COMPLEX: | 
					
						
							|  |  |  | 		{ | 
					
						
							|  |  |  | 			char buf[256]; | 
					
						
							| 
									
										
										
										
											1996-07-21 02:27:43 +00:00
										 |  |  | 			Py_complex c; | 
					
						
							| 
									
										
										
										
											1996-01-12 01:09:56 +00:00
										 |  |  | 			n = r_byte(p); | 
					
						
							|  |  |  | 			if (r_string(buf, (int)n, p) != n) { | 
					
						
							| 
									
										
										
										
											1997-04-29 20:08:16 +00:00
										 |  |  | 				PyErr_SetString(PyExc_EOFError, | 
					
						
							| 
									
										
										
										
											1996-01-12 01:09:56 +00:00
										 |  |  | 					"EOF read where object expected"); | 
					
						
							|  |  |  | 				return NULL; | 
					
						
							|  |  |  | 			} | 
					
						
							|  |  |  | 			buf[n] = '\0'; | 
					
						
							| 
									
										
										
										
											1997-02-14 22:58:07 +00:00
										 |  |  | 			PyFPE_START_PROTECT("atof", return 0) | 
					
						
							| 
									
										
										
										
											1996-01-12 01:09:56 +00:00
										 |  |  | 			c.real = atof(buf); | 
					
						
							| 
									
										
										
										
											1997-03-14 04:32:50 +00:00
										 |  |  | 			PyFPE_END_PROTECT(c) | 
					
						
							| 
									
										
										
										
											1996-01-12 01:09:56 +00:00
										 |  |  | 			n = r_byte(p); | 
					
						
							|  |  |  | 			if (r_string(buf, (int)n, p) != n) { | 
					
						
							| 
									
										
										
										
											1997-04-29 20:08:16 +00:00
										 |  |  | 				PyErr_SetString(PyExc_EOFError, | 
					
						
							| 
									
										
										
										
											1996-01-12 01:09:56 +00:00
										 |  |  | 					"EOF read where object expected"); | 
					
						
							|  |  |  | 				return NULL; | 
					
						
							|  |  |  | 			} | 
					
						
							|  |  |  | 			buf[n] = '\0'; | 
					
						
							| 
									
										
										
										
											1997-02-14 22:58:07 +00:00
										 |  |  | 			PyFPE_START_PROTECT("atof", return 0) | 
					
						
							| 
									
										
										
										
											1996-01-12 01:09:56 +00:00
										 |  |  | 			c.imag = atof(buf); | 
					
						
							| 
									
										
										
										
											1997-03-14 04:32:50 +00:00
										 |  |  | 			PyFPE_END_PROTECT(c) | 
					
						
							| 
									
										
										
										
											1997-04-29 20:08:16 +00:00
										 |  |  | 			return PyComplex_FromCComplex(c); | 
					
						
							| 
									
										
										
										
											1996-01-12 01:09:56 +00:00
										 |  |  | 		} | 
					
						
							|  |  |  | #endif
 | 
					
						
							| 
									
										
										
										
											2001-01-28 00:27:39 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											1991-06-04 19:42:30 +00:00
										 |  |  | 	case TYPE_STRING: | 
					
						
							| 
									
										
										
										
											1993-01-21 16:07:51 +00:00
										 |  |  | 		n = r_long(p); | 
					
						
							| 
									
										
										
										
											1998-06-08 20:27:29 +00:00
										 |  |  | 		if (n < 0) { | 
					
						
							|  |  |  | 			PyErr_SetString(PyExc_ValueError, "bad marshal data"); | 
					
						
							|  |  |  | 			return NULL; | 
					
						
							|  |  |  | 		} | 
					
						
							| 
									
										
										
										
											1997-04-29 20:08:16 +00:00
										 |  |  | 		v = PyString_FromStringAndSize((char *)NULL, n); | 
					
						
							| 
									
										
										
										
											1991-06-04 19:42:30 +00:00
										 |  |  | 		if (v != NULL) { | 
					
						
							| 
									
										
										
										
											2000-03-10 23:03:02 +00:00
										 |  |  | 			if (r_string(PyString_AS_STRING(v), (int)n, p) != n) { | 
					
						
							| 
									
										
										
										
											1997-04-29 20:08:16 +00:00
										 |  |  | 				Py_DECREF(v); | 
					
						
							| 
									
										
										
										
											1991-06-04 19:42:30 +00:00
										 |  |  | 				v = NULL; | 
					
						
							| 
									
										
										
										
											1997-04-29 20:08:16 +00:00
										 |  |  | 				PyErr_SetString(PyExc_EOFError, | 
					
						
							| 
									
										
										
										
											1991-06-04 19:42:30 +00:00
										 |  |  | 					"EOF read where object expected"); | 
					
						
							|  |  |  | 			} | 
					
						
							|  |  |  | 		} | 
					
						
							|  |  |  | 		return v; | 
					
						
							| 
									
										
										
										
											2001-01-28 00:27:39 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2001-08-17 18:39:25 +00:00
										 |  |  | #ifdef Py_USING_UNICODE
 | 
					
						
							| 
									
										
										
										
											2000-03-10 23:03:02 +00:00
										 |  |  | 	case TYPE_UNICODE: | 
					
						
							|  |  |  | 	    { | 
					
						
							|  |  |  | 		char *buffer; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 		n = r_long(p); | 
					
						
							|  |  |  | 		if (n < 0) { | 
					
						
							|  |  |  | 			PyErr_SetString(PyExc_ValueError, "bad marshal data"); | 
					
						
							|  |  |  | 			return NULL; | 
					
						
							|  |  |  | 		} | 
					
						
							| 
									
										
										
										
											2000-05-03 23:44:39 +00:00
										 |  |  | 		buffer = PyMem_NEW(char, n); | 
					
						
							| 
									
										
										
										
											2000-03-10 23:03:02 +00:00
										 |  |  | 		if (buffer == NULL) | 
					
						
							| 
									
										
										
										
											2000-05-03 23:44:39 +00:00
										 |  |  | 			return PyErr_NoMemory(); | 
					
						
							| 
									
										
										
										
											2000-03-10 23:03:02 +00:00
										 |  |  | 		if (r_string(buffer, (int)n, p) != n) { | 
					
						
							| 
									
										
										
										
											2000-05-03 23:44:39 +00:00
										 |  |  | 			PyMem_DEL(buffer); | 
					
						
							| 
									
										
										
										
											2000-03-10 23:03:02 +00:00
										 |  |  | 			PyErr_SetString(PyExc_EOFError, | 
					
						
							|  |  |  | 				"EOF read where object expected"); | 
					
						
							|  |  |  | 			return NULL; | 
					
						
							|  |  |  | 		} | 
					
						
							|  |  |  | 		v = PyUnicode_DecodeUTF8(buffer, n, NULL); | 
					
						
							| 
									
										
										
										
											2000-05-03 23:44:39 +00:00
										 |  |  | 		PyMem_DEL(buffer); | 
					
						
							| 
									
										
										
										
											2000-03-10 23:03:02 +00:00
										 |  |  | 		return v; | 
					
						
							|  |  |  | 	    } | 
					
						
							| 
									
										
										
										
											2001-08-17 18:39:25 +00:00
										 |  |  | #endif
 | 
					
						
							| 
									
										
										
										
											2001-01-28 00:27:39 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											1991-06-04 19:42:30 +00:00
										 |  |  | 	case TYPE_TUPLE: | 
					
						
							| 
									
										
										
										
											1993-01-21 16:07:51 +00:00
										 |  |  | 		n = r_long(p); | 
					
						
							| 
									
										
										
										
											1998-06-08 20:27:29 +00:00
										 |  |  | 		if (n < 0) { | 
					
						
							|  |  |  | 			PyErr_SetString(PyExc_ValueError, "bad marshal data"); | 
					
						
							|  |  |  | 			return NULL; | 
					
						
							|  |  |  | 		} | 
					
						
							| 
									
										
										
										
											1997-04-29 20:08:16 +00:00
										 |  |  | 		v = PyTuple_New((int)n); | 
					
						
							| 
									
										
										
										
											1991-06-04 19:42:30 +00:00
										 |  |  | 		if (v == NULL) | 
					
						
							|  |  |  | 			return v; | 
					
						
							| 
									
										
										
										
											1995-10-27 13:21:28 +00:00
										 |  |  | 		for (i = 0; i < n; i++) { | 
					
						
							|  |  |  | 			v2 = r_object(p); | 
					
						
							|  |  |  | 			if ( v2 == NULL ) { | 
					
						
							| 
									
										
										
										
											1997-04-29 20:08:16 +00:00
										 |  |  | 				Py_DECREF(v); | 
					
						
							| 
									
										
										
										
											1995-10-27 13:21:28 +00:00
										 |  |  | 				v = NULL; | 
					
						
							|  |  |  | 				break; | 
					
						
							|  |  |  | 			} | 
					
						
							| 
									
										
										
										
											1997-04-29 20:08:16 +00:00
										 |  |  | 			PyTuple_SET_ITEM(v, (int)i, v2); | 
					
						
							| 
									
										
										
										
											1995-10-27 13:21:28 +00:00
										 |  |  | 		} | 
					
						
							| 
									
										
										
										
											1991-06-04 19:42:30 +00:00
										 |  |  | 		return v; | 
					
						
							| 
									
										
										
										
											2001-01-28 00:27:39 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											1991-06-04 19:42:30 +00:00
										 |  |  | 	case TYPE_LIST: | 
					
						
							| 
									
										
										
										
											1993-01-21 16:07:51 +00:00
										 |  |  | 		n = r_long(p); | 
					
						
							| 
									
										
										
										
											1998-06-08 20:27:29 +00:00
										 |  |  | 		if (n < 0) { | 
					
						
							|  |  |  | 			PyErr_SetString(PyExc_ValueError, "bad marshal data"); | 
					
						
							|  |  |  | 			return NULL; | 
					
						
							|  |  |  | 		} | 
					
						
							| 
									
										
										
										
											1997-04-29 20:08:16 +00:00
										 |  |  | 		v = PyList_New((int)n); | 
					
						
							| 
									
										
										
										
											1991-06-04 19:42:30 +00:00
										 |  |  | 		if (v == NULL) | 
					
						
							|  |  |  | 			return v; | 
					
						
							| 
									
										
										
										
											1995-10-27 13:21:28 +00:00
										 |  |  | 		for (i = 0; i < n; i++) { | 
					
						
							|  |  |  | 			v2 = r_object(p); | 
					
						
							|  |  |  | 			if ( v2 == NULL ) { | 
					
						
							| 
									
										
										
										
											1997-04-29 20:08:16 +00:00
										 |  |  | 				Py_DECREF(v); | 
					
						
							| 
									
										
										
										
											1995-10-27 13:21:28 +00:00
										 |  |  | 				v = NULL; | 
					
						
							|  |  |  | 				break; | 
					
						
							|  |  |  | 			} | 
					
						
							| 
									
										
										
										
											1997-04-29 20:08:16 +00:00
										 |  |  | 			PyList_SetItem(v, (int)i, v2); | 
					
						
							| 
									
										
										
										
											1995-10-27 13:21:28 +00:00
										 |  |  | 		} | 
					
						
							| 
									
										
										
										
											1991-06-04 19:42:30 +00:00
										 |  |  | 		return v; | 
					
						
							| 
									
										
										
										
											2001-01-28 00:27:39 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											1991-06-07 13:58:22 +00:00
										 |  |  | 	case TYPE_DICT: | 
					
						
							| 
									
										
										
										
											1997-04-29 20:08:16 +00:00
										 |  |  | 		v = PyDict_New(); | 
					
						
							| 
									
										
										
										
											1991-06-07 13:58:22 +00:00
										 |  |  | 		if (v == NULL) | 
					
						
							|  |  |  | 			return NULL; | 
					
						
							|  |  |  | 		for (;;) { | 
					
						
							| 
									
										
										
										
											1997-04-29 20:08:16 +00:00
										 |  |  | 			PyObject *key, *val; | 
					
						
							| 
									
										
										
										
											1993-01-21 16:07:51 +00:00
										 |  |  | 			key = r_object(p); | 
					
						
							| 
									
										
										
										
											1991-06-07 13:58:22 +00:00
										 |  |  | 			if (key == NULL) | 
					
						
							| 
									
										
										
										
											1996-06-26 20:41:23 +00:00
										 |  |  | 				break; /* XXX Assume TYPE_NULL, not an error */ | 
					
						
							| 
									
										
										
										
											1993-01-21 16:07:51 +00:00
										 |  |  | 			val = r_object(p); | 
					
						
							| 
									
										
										
										
											1996-06-26 20:41:23 +00:00
										 |  |  | 			if (val != NULL) | 
					
						
							| 
									
										
										
										
											1997-04-29 20:08:16 +00:00
										 |  |  | 				PyDict_SetItem(v, key, val); | 
					
						
							|  |  |  | 			Py_DECREF(key); | 
					
						
							|  |  |  | 			Py_XDECREF(val); | 
					
						
							| 
									
										
										
										
											1991-06-07 13:58:22 +00:00
										 |  |  | 		} | 
					
						
							|  |  |  | 		return v; | 
					
						
							| 
									
										
										
										
											2001-01-28 00:27:39 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											1991-06-04 19:42:30 +00:00
										 |  |  | 	case TYPE_CODE: | 
					
						
							| 
									
										
										
										
											2001-08-30 14:50:20 +00:00
										 |  |  | 		if (PyEval_GetRestricted()) { | 
					
						
							|  |  |  | 			PyErr_SetString(PyExc_RuntimeError, | 
					
						
							|  |  |  | 				"cannot unmarshal code objects in " | 
					
						
							|  |  |  | 				"restricted execution mode"); | 
					
						
							|  |  |  | 			return NULL; | 
					
						
							|  |  |  | 		} | 
					
						
							|  |  |  | 		else { | 
					
						
							| 
									
										
										
										
											1995-07-18 14:51:37 +00:00
										 |  |  | 			int argcount = r_short(p); | 
					
						
							|  |  |  | 			int nlocals = r_short(p); | 
					
						
							| 
									
										
										
										
											1997-01-17 21:07:08 +00:00
										 |  |  | 			int stacksize = r_short(p); | 
					
						
							| 
									
										
										
										
											1995-07-18 14:51:37 +00:00
										 |  |  | 			int flags = r_short(p); | 
					
						
							| 
									
										
										
										
											1997-04-29 20:08:16 +00:00
										 |  |  | 			PyObject *code = NULL; | 
					
						
							|  |  |  | 			PyObject *consts = NULL; | 
					
						
							|  |  |  | 			PyObject *names = NULL; | 
					
						
							|  |  |  | 			PyObject *varnames = NULL; | 
					
						
							| 
									
										
											  
											
												PEP 227 implementation
The majority of the changes are in the compiler.  The mainloop changes
primarily to implement the new opcodes and to pass a function's
closure to eval_code2().  Frames and functions got new slots to hold
the closure.
Include/compile.h
    Add co_freevars and co_cellvars slots to code objects.
    Update PyCode_New() to take freevars and cellvars as arguments
Include/funcobject.h
    Add func_closure slot to function objects.
    Add GetClosure()/SetClosure() functions (and corresponding
    macros) for getting at the closure.
Include/frameobject.h
    PyFrame_New() now takes a closure.
Include/opcode.h
    Add four new opcodes: MAKE_CLOSURE, LOAD_CLOSURE, LOAD_DEREF,
    STORE_DEREF.
    Remove comment about old requirement for opcodes to fit in 7
    bits.
compile.c
    Implement changes to code objects for co_freevars and co_cellvars.
    Modify symbol table to use st_cur_name (string object for the name
    of the current scope) and st_cur_children (list of nested blocks).
    Also define st_nested, which might more properly be called
    st_cur_nested.  Add several DEF_XXX flags to track def-use
    information for free variables.
    New or modified functions of note:
    com_make_closure(struct compiling *, PyCodeObject *)
        Emit LOAD_CLOSURE opcodes as needed to pass cells for free
        variables into nested scope.
    com_addop_varname(struct compiling *, int, char *)
        Emits opcodes for LOAD_DEREF and STORE_DEREF.
    get_ref_type(struct compiling *, char *name)
        Return NAME_CLOSURE if ref type is FREE or CELL
    symtable_load_symbols(struct compiling *)
        Decides what variables are cell or free based on def-use info.
        Can now raise SyntaxError if nested scopes are mixed with
        exec or from blah import *.
    make_scope_info(PyObject *, PyObject *, int, int)
        Helper functions for symtable scope stack.
    symtable_update_free_vars(struct symtable *)
        After a code block has been analyzed, it must check each of
        its children for free variables that are not defined in the
        block.  If a variable is free in a child and not defined in
        the parent, then it is defined by block the enclosing the
        current one or it is a global.  This does the right logic.
    symtable_add_use() is now a macro for symtable_add_def()
    symtable_assign(struct symtable *, node *)
        Use goto instead of for (;;)
    Fixed bug in symtable where name of keyword argument in function
    call was treated as assignment in the scope of the call site. Ex:
        def f():
            g(a=2) # a was considered a local of f
ceval.c
    eval_code2() now take one more argument, a closure.
    Implement LOAD_CLOSURE, LOAD_DEREF, STORE_DEREF, MAKE_CLOSURE>
    Also: When name error occurs for global variable, report that the
    name was global in the error mesage.
Objects/frameobject.c
    Initialize f_closure to be a tuple containing space for cellvars
    and freevars.  f_closure is NULL if neither are present.
Objects/funcobject.c
    Add support for func_closure.
Python/import.c
    Change the magic number.
Python/marshal.c
    Track changes to code objects.
											
										 
											2001-01-25 20:06:59 +00:00
										 |  |  | 			PyObject *freevars = NULL; | 
					
						
							|  |  |  | 			PyObject *cellvars = NULL; | 
					
						
							| 
									
										
										
										
											1997-04-29 20:08:16 +00:00
										 |  |  | 			PyObject *filename = NULL; | 
					
						
							|  |  |  | 			PyObject *name = NULL; | 
					
						
							| 
									
										
										
										
											1997-02-14 21:12:56 +00:00
										 |  |  | 			int firstlineno = 0; | 
					
						
							| 
									
										
										
										
											1997-04-29 20:08:16 +00:00
										 |  |  | 			PyObject *lnotab = NULL; | 
					
						
							| 
									
										
										
										
											2001-01-28 00:27:39 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											1995-10-27 13:21:28 +00:00
										 |  |  | 			code = r_object(p); | 
					
						
							|  |  |  | 			if (code) consts = r_object(p); | 
					
						
							|  |  |  | 			if (consts) names = r_object(p); | 
					
						
							|  |  |  | 			if (names) varnames = r_object(p); | 
					
						
							| 
									
										
											  
											
												PEP 227 implementation
The majority of the changes are in the compiler.  The mainloop changes
primarily to implement the new opcodes and to pass a function's
closure to eval_code2().  Frames and functions got new slots to hold
the closure.
Include/compile.h
    Add co_freevars and co_cellvars slots to code objects.
    Update PyCode_New() to take freevars and cellvars as arguments
Include/funcobject.h
    Add func_closure slot to function objects.
    Add GetClosure()/SetClosure() functions (and corresponding
    macros) for getting at the closure.
Include/frameobject.h
    PyFrame_New() now takes a closure.
Include/opcode.h
    Add four new opcodes: MAKE_CLOSURE, LOAD_CLOSURE, LOAD_DEREF,
    STORE_DEREF.
    Remove comment about old requirement for opcodes to fit in 7
    bits.
compile.c
    Implement changes to code objects for co_freevars and co_cellvars.
    Modify symbol table to use st_cur_name (string object for the name
    of the current scope) and st_cur_children (list of nested blocks).
    Also define st_nested, which might more properly be called
    st_cur_nested.  Add several DEF_XXX flags to track def-use
    information for free variables.
    New or modified functions of note:
    com_make_closure(struct compiling *, PyCodeObject *)
        Emit LOAD_CLOSURE opcodes as needed to pass cells for free
        variables into nested scope.
    com_addop_varname(struct compiling *, int, char *)
        Emits opcodes for LOAD_DEREF and STORE_DEREF.
    get_ref_type(struct compiling *, char *name)
        Return NAME_CLOSURE if ref type is FREE or CELL
    symtable_load_symbols(struct compiling *)
        Decides what variables are cell or free based on def-use info.
        Can now raise SyntaxError if nested scopes are mixed with
        exec or from blah import *.
    make_scope_info(PyObject *, PyObject *, int, int)
        Helper functions for symtable scope stack.
    symtable_update_free_vars(struct symtable *)
        After a code block has been analyzed, it must check each of
        its children for free variables that are not defined in the
        block.  If a variable is free in a child and not defined in
        the parent, then it is defined by block the enclosing the
        current one or it is a global.  This does the right logic.
    symtable_add_use() is now a macro for symtable_add_def()
    symtable_assign(struct symtable *, node *)
        Use goto instead of for (;;)
    Fixed bug in symtable where name of keyword argument in function
    call was treated as assignment in the scope of the call site. Ex:
        def f():
            g(a=2) # a was considered a local of f
ceval.c
    eval_code2() now take one more argument, a closure.
    Implement LOAD_CLOSURE, LOAD_DEREF, STORE_DEREF, MAKE_CLOSURE>
    Also: When name error occurs for global variable, report that the
    name was global in the error mesage.
Objects/frameobject.c
    Initialize f_closure to be a tuple containing space for cellvars
    and freevars.  f_closure is NULL if neither are present.
Objects/funcobject.c
    Add support for func_closure.
Python/import.c
    Change the magic number.
Python/marshal.c
    Track changes to code objects.
											
										 
											2001-01-25 20:06:59 +00:00
										 |  |  | 			if (varnames) freevars = r_object(p); | 
					
						
							|  |  |  | 			if (freevars) cellvars = r_object(p); | 
					
						
							|  |  |  | 			if (cellvars) filename = r_object(p); | 
					
						
							| 
									
										
										
										
											1995-10-27 13:21:28 +00:00
										 |  |  | 			if (filename) name = r_object(p); | 
					
						
							| 
									
										
										
										
											1997-01-24 03:44:17 +00:00
										 |  |  | 			if (name) { | 
					
						
							|  |  |  | 				firstlineno = r_short(p); | 
					
						
							|  |  |  | 				lnotab = r_object(p); | 
					
						
							|  |  |  | 			} | 
					
						
							| 
									
										
										
										
											2001-01-28 00:27:39 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											1997-04-29 20:08:16 +00:00
										 |  |  | 			if (!PyErr_Occurred()) { | 
					
						
							|  |  |  | 				v = (PyObject *) PyCode_New( | 
					
						
							| 
									
										
										
										
											2001-01-28 00:27:39 +00:00
										 |  |  | 					argcount, nlocals, stacksize, flags, | 
					
						
							| 
									
										
										
										
											1995-07-18 14:51:37 +00:00
										 |  |  | 					code, consts, names, varnames, | 
					
						
							| 
									
										
										
										
											2001-01-28 00:27:39 +00:00
										 |  |  | 					freevars, cellvars, filename, name, | 
					
						
							|  |  |  | 					firstlineno, lnotab); | 
					
						
							| 
									
										
										
										
											1991-06-04 19:42:30 +00:00
										 |  |  | 			} | 
					
						
							|  |  |  | 			else | 
					
						
							|  |  |  | 				v = NULL; | 
					
						
							| 
									
										
										
										
											1997-04-29 20:08:16 +00:00
										 |  |  | 			Py_XDECREF(code); | 
					
						
							|  |  |  | 			Py_XDECREF(consts); | 
					
						
							|  |  |  | 			Py_XDECREF(names); | 
					
						
							|  |  |  | 			Py_XDECREF(varnames); | 
					
						
							| 
									
										
											  
											
												PEP 227 implementation
The majority of the changes are in the compiler.  The mainloop changes
primarily to implement the new opcodes and to pass a function's
closure to eval_code2().  Frames and functions got new slots to hold
the closure.
Include/compile.h
    Add co_freevars and co_cellvars slots to code objects.
    Update PyCode_New() to take freevars and cellvars as arguments
Include/funcobject.h
    Add func_closure slot to function objects.
    Add GetClosure()/SetClosure() functions (and corresponding
    macros) for getting at the closure.
Include/frameobject.h
    PyFrame_New() now takes a closure.
Include/opcode.h
    Add four new opcodes: MAKE_CLOSURE, LOAD_CLOSURE, LOAD_DEREF,
    STORE_DEREF.
    Remove comment about old requirement for opcodes to fit in 7
    bits.
compile.c
    Implement changes to code objects for co_freevars and co_cellvars.
    Modify symbol table to use st_cur_name (string object for the name
    of the current scope) and st_cur_children (list of nested blocks).
    Also define st_nested, which might more properly be called
    st_cur_nested.  Add several DEF_XXX flags to track def-use
    information for free variables.
    New or modified functions of note:
    com_make_closure(struct compiling *, PyCodeObject *)
        Emit LOAD_CLOSURE opcodes as needed to pass cells for free
        variables into nested scope.
    com_addop_varname(struct compiling *, int, char *)
        Emits opcodes for LOAD_DEREF and STORE_DEREF.
    get_ref_type(struct compiling *, char *name)
        Return NAME_CLOSURE if ref type is FREE or CELL
    symtable_load_symbols(struct compiling *)
        Decides what variables are cell or free based on def-use info.
        Can now raise SyntaxError if nested scopes are mixed with
        exec or from blah import *.
    make_scope_info(PyObject *, PyObject *, int, int)
        Helper functions for symtable scope stack.
    symtable_update_free_vars(struct symtable *)
        After a code block has been analyzed, it must check each of
        its children for free variables that are not defined in the
        block.  If a variable is free in a child and not defined in
        the parent, then it is defined by block the enclosing the
        current one or it is a global.  This does the right logic.
    symtable_add_use() is now a macro for symtable_add_def()
    symtable_assign(struct symtable *, node *)
        Use goto instead of for (;;)
    Fixed bug in symtable where name of keyword argument in function
    call was treated as assignment in the scope of the call site. Ex:
        def f():
            g(a=2) # a was considered a local of f
ceval.c
    eval_code2() now take one more argument, a closure.
    Implement LOAD_CLOSURE, LOAD_DEREF, STORE_DEREF, MAKE_CLOSURE>
    Also: When name error occurs for global variable, report that the
    name was global in the error mesage.
Objects/frameobject.c
    Initialize f_closure to be a tuple containing space for cellvars
    and freevars.  f_closure is NULL if neither are present.
Objects/funcobject.c
    Add support for func_closure.
Python/import.c
    Change the magic number.
Python/marshal.c
    Track changes to code objects.
											
										 
											2001-01-25 20:06:59 +00:00
										 |  |  | 			Py_XDECREF(freevars); | 
					
						
							|  |  |  | 			Py_XDECREF(cellvars); | 
					
						
							| 
									
										
										
										
											1997-04-29 20:08:16 +00:00
										 |  |  | 			Py_XDECREF(filename); | 
					
						
							|  |  |  | 			Py_XDECREF(name); | 
					
						
							| 
									
										
										
										
											1997-07-26 23:30:18 +00:00
										 |  |  | 			Py_XDECREF(lnotab); | 
					
						
							| 
									
										
										
										
											1991-06-04 19:42:30 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  | 		} | 
					
						
							|  |  |  | 		return v; | 
					
						
							| 
									
										
										
										
											2001-01-28 00:27:39 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											1991-06-04 19:42:30 +00:00
										 |  |  | 	default: | 
					
						
							| 
									
										
										
										
											1996-06-26 20:41:23 +00:00
										 |  |  | 		/* Bogus data got written, which isn't ideal.
 | 
					
						
							|  |  |  | 		   This will let you keep working and recover. */ | 
					
						
							| 
									
										
										
										
											1998-06-08 20:27:29 +00:00
										 |  |  | 		PyErr_SetString(PyExc_ValueError, "bad marshal data"); | 
					
						
							|  |  |  | 		return NULL; | 
					
						
							| 
									
										
										
										
											2001-01-28 00:27:39 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											1991-06-04 19:42:30 +00:00
										 |  |  | 	} | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2001-10-19 01:46:21 +00:00
										 |  |  | int | 
					
						
							|  |  |  | PyMarshal_ReadShortFromFile(FILE *fp) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  | 	RFILE rf; | 
					
						
							|  |  |  | 	rf.fp = fp; | 
					
						
							|  |  |  | 	return r_short(&rf); | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											1993-01-21 16:07:51 +00:00
										 |  |  | long | 
					
						
							| 
									
										
										
										
											2000-07-22 18:47:25 +00:00
										 |  |  | PyMarshal_ReadLongFromFile(FILE *fp) | 
					
						
							| 
									
										
										
										
											1993-01-21 16:07:51 +00:00
										 |  |  | { | 
					
						
							|  |  |  | 	RFILE rf; | 
					
						
							|  |  |  | 	rf.fp = fp; | 
					
						
							|  |  |  | 	return r_long(&rf); | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2001-01-18 04:39:16 +00:00
										 |  |  | #ifdef HAVE_FSTAT
 | 
					
						
							|  |  |  | /* Return size of file in bytes; < 0 if unknown. */ | 
					
						
							|  |  |  | static off_t | 
					
						
							|  |  |  | getfilesize(FILE *fp) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  | 	struct stat st; | 
					
						
							|  |  |  | 	if (fstat(fileno(fp), &st) != 0) | 
					
						
							|  |  |  | 		return -1; | 
					
						
							|  |  |  | 	else | 
					
						
							|  |  |  | 		return st.st_size; | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | #endif
 | 
					
						
							| 
									
										
										
										
											2001-01-28 00:27:39 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2001-01-18 04:39:16 +00:00
										 |  |  | /* If we can get the size of the file up-front, and it's reasonably small,
 | 
					
						
							|  |  |  |  * read it in one gulp and delegate to ...FromString() instead.  Much quicker | 
					
						
							|  |  |  |  * than reading a byte at a time from file; speeds .pyc imports. | 
					
						
							| 
									
										
										
										
											2001-01-28 00:27:39 +00:00
										 |  |  |  * CAUTION:  since this may read the entire remainder of the file, don't | 
					
						
							|  |  |  |  * call it unless you know you're done with the file. | 
					
						
							| 
									
										
										
										
											2001-01-18 04:39:16 +00:00
										 |  |  |  */ | 
					
						
							| 
									
										
										
										
											1997-04-29 20:08:16 +00:00
										 |  |  | PyObject * | 
					
						
							| 
									
										
										
										
											2001-01-28 00:27:39 +00:00
										 |  |  | PyMarshal_ReadLastObjectFromFile(FILE *fp) | 
					
						
							| 
									
										
										
										
											1993-01-21 16:07:51 +00:00
										 |  |  | { | 
					
						
							| 
									
										
										
										
											2001-01-18 04:39:16 +00:00
										 |  |  | /* 75% of 2.1's .pyc files can exploit SMALL_FILE_LIMIT.
 | 
					
						
							|  |  |  |  * REASONABLE_FILE_LIMIT is by defn something big enough for Tkinter.pyc. | 
					
						
							|  |  |  |  */ | 
					
						
							|  |  |  | #define SMALL_FILE_LIMIT (1L << 14)
 | 
					
						
							|  |  |  | #define REASONABLE_FILE_LIMIT (1L << 18)
 | 
					
						
							|  |  |  | #ifdef HAVE_FSTAT
 | 
					
						
							|  |  |  | 	off_t filesize; | 
					
						
							|  |  |  | #endif
 | 
					
						
							| 
									
										
										
										
											1997-04-29 20:08:16 +00:00
										 |  |  | 	if (PyErr_Occurred()) { | 
					
						
							| 
									
										
										
										
											1995-01-02 19:04:15 +00:00
										 |  |  | 		fprintf(stderr, "XXX rd_object called with exception set\n"); | 
					
						
							|  |  |  | 		return NULL; | 
					
						
							|  |  |  | 	} | 
					
						
							| 
									
										
										
										
											2001-01-18 04:39:16 +00:00
										 |  |  | #ifdef HAVE_FSTAT
 | 
					
						
							|  |  |  | 	filesize = getfilesize(fp); | 
					
						
							|  |  |  | 	if (filesize > 0) { | 
					
						
							|  |  |  | 		char buf[SMALL_FILE_LIMIT]; | 
					
						
							|  |  |  | 		char* pBuf = NULL; | 
					
						
							|  |  |  | 		if (filesize <= SMALL_FILE_LIMIT) | 
					
						
							|  |  |  | 			pBuf = buf; | 
					
						
							|  |  |  | 		else if (filesize <= REASONABLE_FILE_LIMIT) | 
					
						
							|  |  |  | 			pBuf = (char *)PyMem_MALLOC(filesize); | 
					
						
							|  |  |  | 		if (pBuf != NULL) { | 
					
						
							|  |  |  | 			PyObject* v; | 
					
						
							|  |  |  | 			size_t n = fread(pBuf, 1, filesize, fp); | 
					
						
							|  |  |  | 			v = PyMarshal_ReadObjectFromString(pBuf, n); | 
					
						
							|  |  |  | 			if (pBuf != buf) | 
					
						
							|  |  |  | 				PyMem_FREE(pBuf); | 
					
						
							|  |  |  | 			return v; | 
					
						
							|  |  |  | 		} | 
					
						
							| 
									
										
										
										
											2001-01-28 00:27:39 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2001-01-18 04:39:16 +00:00
										 |  |  | 	} | 
					
						
							|  |  |  | #endif
 | 
					
						
							| 
									
										
										
										
											2001-01-28 00:27:39 +00:00
										 |  |  | 	/* We don't have fstat, or we do but the file is larger than
 | 
					
						
							|  |  |  | 	 * REASONABLE_FILE_LIMIT or malloc failed -- read a byte at a time. | 
					
						
							|  |  |  | 	 */ | 
					
						
							|  |  |  | 	return PyMarshal_ReadObjectFromFile(fp); | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2001-01-18 04:39:16 +00:00
										 |  |  | #undef SMALL_FILE_LIMIT
 | 
					
						
							|  |  |  | #undef REASONABLE_FILE_LIMIT
 | 
					
						
							| 
									
										
										
										
											1993-01-21 16:07:51 +00:00
										 |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2001-01-28 00:27:39 +00:00
										 |  |  | PyObject * | 
					
						
							|  |  |  | PyMarshal_ReadObjectFromFile(FILE *fp) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  | 	RFILE rf; | 
					
						
							|  |  |  | 	if (PyErr_Occurred()) { | 
					
						
							|  |  |  | 		fprintf(stderr, "XXX rd_object called with exception set\n"); | 
					
						
							|  |  |  | 		return NULL; | 
					
						
							|  |  |  | 	} | 
					
						
							|  |  |  | 	rf.fp = fp; | 
					
						
							|  |  |  | 	return r_object(&rf); | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											1997-04-29 20:08:16 +00:00
										 |  |  | PyObject * | 
					
						
							| 
									
										
										
										
											2000-07-22 18:47:25 +00:00
										 |  |  | PyMarshal_ReadObjectFromString(char *str, int len) | 
					
						
							| 
									
										
										
										
											1993-04-01 20:59:32 +00:00
										 |  |  | { | 
					
						
							|  |  |  | 	RFILE rf; | 
					
						
							| 
									
										
										
										
											1997-04-29 20:08:16 +00:00
										 |  |  | 	if (PyErr_Occurred()) { | 
					
						
							| 
									
										
										
										
											1995-01-02 19:04:15 +00:00
										 |  |  | 		fprintf(stderr, "XXX rds_object called with exception set\n"); | 
					
						
							|  |  |  | 		return NULL; | 
					
						
							|  |  |  | 	} | 
					
						
							| 
									
										
										
										
											1993-04-01 20:59:32 +00:00
										 |  |  | 	rf.fp = NULL; | 
					
						
							|  |  |  | 	rf.str = NULL; | 
					
						
							|  |  |  | 	rf.ptr = str; | 
					
						
							|  |  |  | 	rf.end = str + len; | 
					
						
							|  |  |  | 	return r_object(&rf); | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											1997-04-29 20:08:16 +00:00
										 |  |  | PyObject * | 
					
						
							| 
									
										
										
										
											2000-07-22 18:47:25 +00:00
										 |  |  | PyMarshal_WriteObjectToString(PyObject *x) /* wrs_object() */ | 
					
						
							| 
									
										
										
										
											1996-08-19 22:07:17 +00:00
										 |  |  | { | 
					
						
							|  |  |  | 	WFILE wf; | 
					
						
							|  |  |  | 	wf.fp = NULL; | 
					
						
							| 
									
										
										
										
											1997-04-29 20:08:16 +00:00
										 |  |  | 	wf.str = PyString_FromStringAndSize((char *)NULL, 50); | 
					
						
							| 
									
										
										
										
											1996-08-19 22:07:17 +00:00
										 |  |  | 	if (wf.str == NULL) | 
					
						
							|  |  |  | 		return NULL; | 
					
						
							| 
									
										
										
										
											1997-04-29 20:08:16 +00:00
										 |  |  | 	wf.ptr = PyString_AS_STRING((PyStringObject *)wf.str); | 
					
						
							|  |  |  | 	wf.end = wf.ptr + PyString_Size(wf.str); | 
					
						
							| 
									
										
										
										
											1996-08-19 22:07:17 +00:00
										 |  |  | 	wf.error = 0; | 
					
						
							| 
									
										
										
										
											2000-06-28 18:47:56 +00:00
										 |  |  | 	wf.depth = 0; | 
					
						
							| 
									
										
										
										
											1996-08-19 22:07:17 +00:00
										 |  |  | 	w_object(x, &wf); | 
					
						
							|  |  |  | 	if (wf.str != NULL) | 
					
						
							| 
									
										
										
										
											1997-04-29 20:08:16 +00:00
										 |  |  | 		_PyString_Resize(&wf.str, | 
					
						
							|  |  |  | 		    (int) (wf.ptr - | 
					
						
							|  |  |  | 			   PyString_AS_STRING((PyStringObject *)wf.str))); | 
					
						
							| 
									
										
										
										
											1996-08-19 22:07:17 +00:00
										 |  |  | 	if (wf.error) { | 
					
						
							| 
									
										
										
										
											1997-04-29 20:08:16 +00:00
										 |  |  | 		Py_XDECREF(wf.str); | 
					
						
							| 
									
										
										
										
											2001-01-28 00:27:39 +00:00
										 |  |  | 		PyErr_SetString(PyExc_ValueError, | 
					
						
							| 
									
										
										
										
											2000-06-28 18:47:56 +00:00
										 |  |  | 				(wf.error==1)?"unmarshallable object" | 
					
						
							|  |  |  | 				:"object too deeply nested to marshal"); | 
					
						
							| 
									
										
										
										
											1996-08-19 22:07:17 +00:00
										 |  |  | 		return NULL; | 
					
						
							|  |  |  | 	} | 
					
						
							|  |  |  | 	return wf.str; | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											1991-06-07 13:58:22 +00:00
										 |  |  | /* And an interface for Python programs... */ | 
					
						
							| 
									
										
										
										
											1991-06-04 19:42:30 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											1997-04-29 20:08:16 +00:00
										 |  |  | static PyObject * | 
					
						
							| 
									
										
										
										
											2000-07-22 18:47:25 +00:00
										 |  |  | marshal_dump(PyObject *self, PyObject *args) | 
					
						
							| 
									
										
										
										
											1991-06-04 19:42:30 +00:00
										 |  |  | { | 
					
						
							| 
									
										
										
										
											1993-01-21 16:07:51 +00:00
										 |  |  | 	WFILE wf; | 
					
						
							| 
									
										
										
										
											1997-04-29 20:08:16 +00:00
										 |  |  | 	PyObject *x; | 
					
						
							|  |  |  | 	PyObject *f; | 
					
						
							| 
									
										
										
										
											2000-03-31 00:37:41 +00:00
										 |  |  | 	if (!PyArg_ParseTuple(args, "OO:dump", &x, &f)) | 
					
						
							| 
									
										
										
										
											1991-06-04 19:42:30 +00:00
										 |  |  | 		return NULL; | 
					
						
							| 
									
										
										
										
											1997-04-29 20:08:16 +00:00
										 |  |  | 	if (!PyFile_Check(f)) { | 
					
						
							|  |  |  | 		PyErr_SetString(PyExc_TypeError, | 
					
						
							|  |  |  | 				"marshal.dump() 2nd arg must be file"); | 
					
						
							| 
									
										
										
										
											1991-06-04 19:42:30 +00:00
										 |  |  | 		return NULL; | 
					
						
							|  |  |  | 	} | 
					
						
							| 
									
										
										
										
											1997-04-29 20:08:16 +00:00
										 |  |  | 	wf.fp = PyFile_AsFile(f); | 
					
						
							| 
									
										
										
										
											1993-01-21 16:07:51 +00:00
										 |  |  | 	wf.str = NULL; | 
					
						
							|  |  |  | 	wf.ptr = wf.end = NULL; | 
					
						
							| 
									
										
										
										
											1996-06-26 20:41:23 +00:00
										 |  |  | 	wf.error = 0; | 
					
						
							| 
									
										
										
										
											2000-06-28 18:47:56 +00:00
										 |  |  | 	wf.depth = 0; | 
					
						
							| 
									
										
										
										
											1993-01-21 16:07:51 +00:00
										 |  |  | 	w_object(x, &wf); | 
					
						
							| 
									
										
										
										
											1996-06-26 20:41:23 +00:00
										 |  |  | 	if (wf.error) { | 
					
						
							| 
									
										
										
										
											2001-01-28 00:27:39 +00:00
										 |  |  | 		PyErr_SetString(PyExc_ValueError, | 
					
						
							| 
									
										
										
										
											2000-06-28 18:47:56 +00:00
										 |  |  | 				(wf.error==1)?"unmarshallable object" | 
					
						
							|  |  |  | 				:"object too deeply nested to marshal"); | 
					
						
							| 
									
										
										
										
											1996-06-26 20:41:23 +00:00
										 |  |  | 		return NULL; | 
					
						
							|  |  |  | 	} | 
					
						
							| 
									
										
										
										
											1997-04-29 20:08:16 +00:00
										 |  |  | 	Py_INCREF(Py_None); | 
					
						
							|  |  |  | 	return Py_None; | 
					
						
							| 
									
										
										
										
											1991-06-04 19:42:30 +00:00
										 |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											1997-04-29 20:08:16 +00:00
										 |  |  | static PyObject * | 
					
						
							| 
									
										
										
										
											2000-07-22 18:47:25 +00:00
										 |  |  | marshal_load(PyObject *self, PyObject *args) | 
					
						
							| 
									
										
										
										
											1991-06-04 19:42:30 +00:00
										 |  |  | { | 
					
						
							| 
									
										
										
										
											1993-01-21 16:07:51 +00:00
										 |  |  | 	RFILE rf; | 
					
						
							| 
									
										
										
										
											1997-04-29 20:08:16 +00:00
										 |  |  | 	PyObject *f; | 
					
						
							|  |  |  | 	PyObject *v; | 
					
						
							| 
									
										
										
										
											2000-03-31 00:37:41 +00:00
										 |  |  | 	if (!PyArg_ParseTuple(args, "O:load", &f)) | 
					
						
							| 
									
										
										
										
											1993-01-21 16:07:51 +00:00
										 |  |  | 		return NULL; | 
					
						
							| 
									
										
										
										
											1997-04-29 20:08:16 +00:00
										 |  |  | 	if (!PyFile_Check(f)) { | 
					
						
							|  |  |  | 		PyErr_SetString(PyExc_TypeError, | 
					
						
							|  |  |  | 				"marshal.load() arg must be file"); | 
					
						
							| 
									
										
										
										
											1991-06-04 19:42:30 +00:00
										 |  |  | 		return NULL; | 
					
						
							|  |  |  | 	} | 
					
						
							| 
									
										
										
										
											1997-04-29 20:08:16 +00:00
										 |  |  | 	rf.fp = PyFile_AsFile(f); | 
					
						
							| 
									
										
										
										
											1993-01-21 16:07:51 +00:00
										 |  |  | 	rf.str = NULL; | 
					
						
							|  |  |  | 	rf.ptr = rf.end = NULL; | 
					
						
							| 
									
										
										
										
											1997-04-29 20:08:16 +00:00
										 |  |  | 	PyErr_Clear(); | 
					
						
							| 
									
										
										
										
											1993-01-21 16:07:51 +00:00
										 |  |  | 	v = r_object(&rf); | 
					
						
							| 
									
										
										
										
											1997-04-29 20:08:16 +00:00
										 |  |  | 	if (PyErr_Occurred()) { | 
					
						
							|  |  |  | 		Py_XDECREF(v); | 
					
						
							| 
									
										
										
										
											1993-01-21 16:07:51 +00:00
										 |  |  | 		v = NULL; | 
					
						
							|  |  |  | 	} | 
					
						
							|  |  |  | 	return v; | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											1997-04-29 20:08:16 +00:00
										 |  |  | static PyObject * | 
					
						
							| 
									
										
										
										
											2000-07-22 18:47:25 +00:00
										 |  |  | marshal_dumps(PyObject *self, PyObject *args) | 
					
						
							| 
									
										
										
										
											1993-01-21 16:07:51 +00:00
										 |  |  | { | 
					
						
							| 
									
										
										
										
											1997-04-29 20:08:16 +00:00
										 |  |  | 	PyObject *x; | 
					
						
							| 
									
										
										
										
											2000-03-31 00:37:41 +00:00
										 |  |  | 	if (!PyArg_ParseTuple(args, "O:dumps", &x)) | 
					
						
							| 
									
										
										
										
											1993-01-21 16:07:51 +00:00
										 |  |  | 		return NULL; | 
					
						
							| 
									
										
										
										
											1996-08-19 22:07:17 +00:00
										 |  |  | 	return PyMarshal_WriteObjectToString(x); | 
					
						
							| 
									
										
										
										
											1993-01-21 16:07:51 +00:00
										 |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											1997-04-29 20:08:16 +00:00
										 |  |  | static PyObject * | 
					
						
							| 
									
										
										
										
											2000-07-22 18:47:25 +00:00
										 |  |  | marshal_loads(PyObject *self, PyObject *args) | 
					
						
							| 
									
										
										
										
											1993-01-21 16:07:51 +00:00
										 |  |  | { | 
					
						
							|  |  |  | 	RFILE rf; | 
					
						
							| 
									
										
										
										
											1997-04-29 20:08:16 +00:00
										 |  |  | 	PyObject *v; | 
					
						
							| 
									
										
										
										
											1993-01-21 16:07:51 +00:00
										 |  |  | 	char *s; | 
					
						
							|  |  |  | 	int n; | 
					
						
							| 
									
										
										
										
											2000-03-31 00:37:41 +00:00
										 |  |  | 	if (!PyArg_ParseTuple(args, "s#:loads", &s, &n)) | 
					
						
							| 
									
										
										
										
											1993-01-21 16:07:51 +00:00
										 |  |  | 		return NULL; | 
					
						
							|  |  |  | 	rf.fp = NULL; | 
					
						
							|  |  |  | 	rf.str = args; | 
					
						
							|  |  |  | 	rf.ptr = s; | 
					
						
							|  |  |  | 	rf.end = s + n; | 
					
						
							| 
									
										
										
										
											1997-04-29 20:08:16 +00:00
										 |  |  | 	PyErr_Clear(); | 
					
						
							| 
									
										
										
										
											1993-01-21 16:07:51 +00:00
										 |  |  | 	v = r_object(&rf); | 
					
						
							| 
									
										
										
										
											1997-04-29 20:08:16 +00:00
										 |  |  | 	if (PyErr_Occurred()) { | 
					
						
							|  |  |  | 		Py_XDECREF(v); | 
					
						
							| 
									
										
										
										
											1991-06-04 19:42:30 +00:00
										 |  |  | 		v = NULL; | 
					
						
							|  |  |  | 	} | 
					
						
							|  |  |  | 	return v; | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											1997-04-29 20:08:16 +00:00
										 |  |  | static PyMethodDef marshal_methods[] = { | 
					
						
							| 
									
										
										
										
											2000-03-31 00:37:41 +00:00
										 |  |  | 	{"dump",	marshal_dump,	1}, | 
					
						
							|  |  |  | 	{"load",	marshal_load,	1}, | 
					
						
							|  |  |  | 	{"dumps",	marshal_dumps,	1}, | 
					
						
							|  |  |  | 	{"loads",	marshal_loads,	1}, | 
					
						
							| 
									
										
										
										
											1991-06-04 19:42:30 +00:00
										 |  |  | 	{NULL,		NULL}		/* sentinel */ | 
					
						
							|  |  |  | }; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | void | 
					
						
							| 
									
										
										
										
											2000-07-22 18:47:25 +00:00
										 |  |  | PyMarshal_Init(void) | 
					
						
							| 
									
										
										
										
											1991-06-04 19:42:30 +00:00
										 |  |  | { | 
					
						
							| 
									
										
										
										
											1997-04-29 20:08:16 +00:00
										 |  |  | 	(void) Py_InitModule("marshal", marshal_methods); | 
					
						
							| 
									
										
										
										
											1991-06-04 19:42:30 +00:00
										 |  |  | } |