cpython-lru_cache-weakref: Python/marshal.c annotate

annotate Python/marshal.c @ 33579:8a5c87f685cd legacy-trunk

Add set_unittest_reportflags() to the public API. Docs will follow "soon", after I repair the LaTeX I somehow damaged.

author	Tim Peters <tim.peters@gmail.com>
date	Sun, 26 Sep 2004 01:50:24 +0000
parents	3df36e2e5ddc
children	ea340006c1f3

rev	line source
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2 /* Write Python objects to files and read them back.
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3 This is intended for writing and reading compiled Python code only;
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4 a true persistent storage facility would be much harder, since
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	5 it would have to take circular links and sharing into account. */
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	6
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	7 #include "Python.h"
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	8 #include "longintrepr.h"
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	9 #include "compile.h"
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	10 #include "marshal.h"
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	11
13070 7392e71f6cce Michael Hudson <mwh21@cam.ac.uk>: Fred Drake <fdrake@acm.org> parents: 12576 diff changeset	12 /* High water mark to determine when the marshalled object is dangerously deep
7392e71f6cce Michael Hudson <mwh21@cam.ac.uk>: Fred Drake <fdrake@acm.org> parents: 12576 diff changeset	13 * and risks coring the interpreter. When the object stack gets this deep,
7392e71f6cce Michael Hudson <mwh21@cam.ac.uk>: Fred Drake <fdrake@acm.org> parents: 12576 diff changeset	14 * raise an exception instead of continuing.
7392e71f6cce Michael Hudson <mwh21@cam.ac.uk>: Fred Drake <fdrake@acm.org> parents: 12576 diff changeset	15 */
7392e71f6cce Michael Hudson <mwh21@cam.ac.uk>: Fred Drake <fdrake@acm.org> parents: 12576 diff changeset	16 #define MAX_MARSHAL_STACK_DEPTH 5000
7392e71f6cce Michael Hudson <mwh21@cam.ac.uk>: Fred Drake <fdrake@acm.org> parents: 12576 diff changeset	17
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	18 #define TYPE_NULL '0'
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	19 #define TYPE_NONE 'N'
22785 aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22705 diff changeset	20 #define TYPE_FALSE 'F'
aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22705 diff changeset	21 #define TYPE_TRUE 'T'
18148 7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 17707 diff changeset	22 #define TYPE_STOPITER 'S'
4403 3b3f7c3f6da2 Ellipses -> Ellipsis rename (the dictionary really says that it should Guido van Rossum <guido@python.org> parents: 4039 diff changeset	23 #define TYPE_ELLIPSIS '.'
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	24 #define TYPE_INT 'i'
4592 3bf9e2beaf8c Tentative changes to make this work better on 64-bit machines. Guido van Rossum <guido@python.org> parents: 4503 diff changeset	25 #define TYPE_INT64 'I'
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	26 #define TYPE_FLOAT 'f'
3323 6098aaa8ae7f changes for complex numbers Guido van Rossum <guido@python.org> parents: 3234 diff changeset	27 #define TYPE_COMPLEX 'x'
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	28 #define TYPE_LONG 'l'
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	29 #define TYPE_STRING 's'
32422 3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	30 #define TYPE_INTERNED 't'
3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	31 #define TYPE_STRINGREF 'R'
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	32 #define TYPE_TUPLE '('
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	33 #define TYPE_LIST '['
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	34 #define TYPE_DICT '{'
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2503 diff changeset	35 #define TYPE_CODE 'c'
11976 513354d87a85 Marc-Andre Lemburg: support marshalling Unicode objects (code 'u'). Guido van Rossum <guido@python.org> parents: 9300 diff changeset	36 #define TYPE_UNICODE 'u'
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	37 #define TYPE_UNKNOWN '?'
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	38
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	39 typedef struct {
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	40 FILE *fp;
3731 de1cb33219e3 Jeremy's patches for more robust handling of unmarshallable types. Guido van Rossum <guido@python.org> parents: 3620 diff changeset	41 int error;
13070 7392e71f6cce Michael Hudson <mwh21@cam.ac.uk>: Fred Drake <fdrake@acm.org> parents: 12576 diff changeset	42 int depth;
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	43 /* If fp == NULL, the following are valid: */
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	44 PyObject *str;
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	45 char *ptr;
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	46 char *end;
32422 3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	47 PyObject strings; / dict on marshal, list on unmarshal */
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	48 } WFILE;
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	49
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	50 #define w_byte(c, p) if (((p)->fp)) putc((c), (p)->fp); \
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	51 else if ((p)->ptr != (p)->end) *(p)->ptr++ = (c); \
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	52 else w_more(c, p)
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	53
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	54 static void
13672 bfc5b2a8c11f -- changed w_more to take an integer instead of a char Fredrik Lundh <fredrik@pythonware.com> parents: 13658 diff changeset	55 w_more(int c, WFILE *p)
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	56 {
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	57 int size, newsize;
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	58 if (p->str == NULL)
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	59 return; /* An error already occurred */
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	60 size = PyString_Size(p->str);
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	61 newsize = size + 1024;
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	62 if (_PyString_Resize(&p->str, newsize) != 0) {
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	63 p->ptr = p->end = NULL;
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	64 }
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	65 else {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	66 p->ptr = PyString_AS_STRING((PyStringObject *)p->str) + size;
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	67 p->end =
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	68 PyString_AS_STRING((PyStringObject *)p->str) + newsize;
13674 c90d94d287d7 Included assert.h in Python.h -- it's absurd that this basic tool of Tim Peters <tim.peters@gmail.com> parents: 13672 diff changeset	69 *p->ptr++ = Py_SAFE_DOWNCAST(c, int, char);
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	70 }
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	71 }
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	72
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	73 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13447 diff changeset	74 w_string(char s, int n, WFILE p)
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	75 {
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	76 if (p->fp != NULL) {
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	77 fwrite(s, 1, n, p->fp);
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	78 }
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	79 else {
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	80 while (--n >= 0) {
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	81 w_byte(*s, p);
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	82 s++;
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	83 }
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	84 }
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	85 }
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	86
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	87 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13447 diff changeset	88 w_short(int x, WFILE *p)
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	89 {
24434 9ef82377669d Fix SF 588452: debug build crashes on marshal.dumps([128] * 1000). Thomas Heller <theller@ctypes.org> parents: 23851 diff changeset	90 w_byte((char)( x & 0xff), p);
9ef82377669d Fix SF 588452: debug build crashes on marshal.dumps([128] * 1000). Thomas Heller <theller@ctypes.org> parents: 23851 diff changeset	91 w_byte((char)((x>> 8) & 0xff), p);
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	92 }
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	93
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	94 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13447 diff changeset	95 w_long(long x, WFILE *p)
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	96 {
24435 7dc3f4077e59 Whitespace normalization. Thomas Heller <theller@ctypes.org> parents: 24434 diff changeset	97 w_byte((char)( x & 0xff), p);
7dc3f4077e59 Whitespace normalization. Thomas Heller <theller@ctypes.org> parents: 24434 diff changeset	98 w_byte((char)((x>> 8) & 0xff), p);
7dc3f4077e59 Whitespace normalization. Thomas Heller <theller@ctypes.org> parents: 24434 diff changeset	99 w_byte((char)((x>>16) & 0xff), p);
7dc3f4077e59 Whitespace normalization. Thomas Heller <theller@ctypes.org> parents: 24434 diff changeset	100 w_byte((char)((x>>24) & 0xff), p);
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	101 }
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	102
4656 186c2ad4abf3 Better way to handle 64-bit ints, keeping gcc -Wall happy. Guido van Rossum <guido@python.org> parents: 4592 diff changeset	103 #if SIZEOF_LONG > 4
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	104 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13447 diff changeset	105 w_long64(long x, WFILE *p)
4592 3bf9e2beaf8c Tentative changes to make this work better on 64-bit machines. Guido van Rossum <guido@python.org> parents: 4503 diff changeset	106 {
3bf9e2beaf8c Tentative changes to make this work better on 64-bit machines. Guido van Rossum <guido@python.org> parents: 4503 diff changeset	107 w_long(x, p);
4656 186c2ad4abf3 Better way to handle 64-bit ints, keeping gcc -Wall happy. Guido van Rossum <guido@python.org> parents: 4592 diff changeset	108 w_long(x>>32, p);
4592 3bf9e2beaf8c Tentative changes to make this work better on 64-bit machines. Guido van Rossum <guido@python.org> parents: 4503 diff changeset	109 }
4656 186c2ad4abf3 Better way to handle 64-bit ints, keeping gcc -Wall happy. Guido van Rossum <guido@python.org> parents: 4592 diff changeset	110 #endif
4592 3bf9e2beaf8c Tentative changes to make this work better on 64-bit machines. Guido van Rossum <guido@python.org> parents: 4503 diff changeset	111
3bf9e2beaf8c Tentative changes to make this work better on 64-bit machines. Guido van Rossum <guido@python.org> parents: 4503 diff changeset	112 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13447 diff changeset	113 w_object(PyObject v, WFILE p)
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	114 {
2368 663aa059e29f hope to fix DEC Alpha gcc problems by declaring ints instead of longs Guido van Rossum <guido@python.org> parents: 2062 diff changeset	115 int i, n;
13070 7392e71f6cce Michael Hudson <mwh21@cam.ac.uk>: Fred Drake <fdrake@acm.org> parents: 12576 diff changeset	116
7392e71f6cce Michael Hudson <mwh21@cam.ac.uk>: Fred Drake <fdrake@acm.org> parents: 12576 diff changeset	117 p->depth++;
16311 8c41f3861aad It's unclear whether PyMarshal_XXX() are part of the public or private API. Tim Peters <tim.peters@gmail.com> parents: 16257 diff changeset	118
13070 7392e71f6cce Michael Hudson <mwh21@cam.ac.uk>: Fred Drake <fdrake@acm.org> parents: 12576 diff changeset	119 if (p->depth > MAX_MARSHAL_STACK_DEPTH) {
7392e71f6cce Michael Hudson <mwh21@cam.ac.uk>: Fred Drake <fdrake@acm.org> parents: 12576 diff changeset	120 p->error = 2;
16311 8c41f3861aad It's unclear whether PyMarshal_XXX() are part of the public or private API. Tim Peters <tim.peters@gmail.com> parents: 16257 diff changeset	121 }
13070 7392e71f6cce Michael Hudson <mwh21@cam.ac.uk>: Fred Drake <fdrake@acm.org> parents: 12576 diff changeset	122 else if (v == NULL) {
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	123 w_byte(TYPE_NULL, p);
7982 a909a2869ac5 Make new gcc -Wall happy Guido van Rossum <guido@python.org> parents: 5905 diff changeset	124 }
a909a2869ac5 Make new gcc -Wall happy Guido van Rossum <guido@python.org> parents: 5905 diff changeset	125 else if (v == Py_None) {
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	126 w_byte(TYPE_NONE, p);
7982 a909a2869ac5 Make new gcc -Wall happy Guido van Rossum <guido@python.org> parents: 5905 diff changeset	127 }
18148 7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 17707 diff changeset	128 else if (v == PyExc_StopIteration) {
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 17707 diff changeset	129 w_byte(TYPE_STOPITER, p);
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 17707 diff changeset	130 }
7982 a909a2869ac5 Make new gcc -Wall happy Guido van Rossum <guido@python.org> parents: 5905 diff changeset	131 else if (v == Py_Ellipsis) {
a909a2869ac5 Make new gcc -Wall happy Guido van Rossum <guido@python.org> parents: 5905 diff changeset	132 w_byte(TYPE_ELLIPSIS, p);
a909a2869ac5 Make new gcc -Wall happy Guido van Rossum <guido@python.org> parents: 5905 diff changeset	133 }
22785 aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22705 diff changeset	134 else if (v == Py_False) {
aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22705 diff changeset	135 w_byte(TYPE_FALSE, p);
aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22705 diff changeset	136 }
aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22705 diff changeset	137 else if (v == Py_True) {
aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22705 diff changeset	138 w_byte(TYPE_TRUE, p);
aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22705 diff changeset	139 }
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	140 else if (PyInt_Check(v)) {
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	141 long x = PyInt_AS_LONG((PyIntObject *)v);
4656 186c2ad4abf3 Better way to handle 64-bit ints, keeping gcc -Wall happy. Guido van Rossum <guido@python.org> parents: 4592 diff changeset	142 #if SIZEOF_LONG > 4
17368 bb75d93f6a31 test_pickle works on sizeof(long)==8 boxes again. Tim Peters <tim.peters@gmail.com> parents: 16311 diff changeset	143 long y = Py_ARITHMETIC_RIGHT_SHIFT(long, x, 31);
4592 3bf9e2beaf8c Tentative changes to make this work better on 64-bit machines. Guido van Rossum <guido@python.org> parents: 4503 diff changeset	144 if (y && y != -1) {
3bf9e2beaf8c Tentative changes to make this work better on 64-bit machines. Guido van Rossum <guido@python.org> parents: 4503 diff changeset	145 w_byte(TYPE_INT64, p);
3bf9e2beaf8c Tentative changes to make this work better on 64-bit machines. Guido van Rossum <guido@python.org> parents: 4503 diff changeset	146 w_long64(x, p);
3bf9e2beaf8c Tentative changes to make this work better on 64-bit machines. Guido van Rossum <guido@python.org> parents: 4503 diff changeset	147 }
4656 186c2ad4abf3 Better way to handle 64-bit ints, keeping gcc -Wall happy. Guido van Rossum <guido@python.org> parents: 4592 diff changeset	148 else
186c2ad4abf3 Better way to handle 64-bit ints, keeping gcc -Wall happy. Guido van Rossum <guido@python.org> parents: 4592 diff changeset	149 #endif
186c2ad4abf3 Better way to handle 64-bit ints, keeping gcc -Wall happy. Guido van Rossum <guido@python.org> parents: 4592 diff changeset	150 {
4592 3bf9e2beaf8c Tentative changes to make this work better on 64-bit machines. Guido van Rossum <guido@python.org> parents: 4503 diff changeset	151 w_byte(TYPE_INT, p);
3bf9e2beaf8c Tentative changes to make this work better on 64-bit machines. Guido van Rossum <guido@python.org> parents: 4503 diff changeset	152 w_long(x, p);
3bf9e2beaf8c Tentative changes to make this work better on 64-bit machines. Guido van Rossum <guido@python.org> parents: 4503 diff changeset	153 }
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	154 }
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	155 else if (PyLong_Check(v)) {
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	156 PyLongObject ob = (PyLongObject )v;
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	157 w_byte(TYPE_LONG, p);
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	158 n = ob->ob_size;
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	159 w_long((long)n, p);
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	160 if (n < 0)
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	161 n = -n;
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	162 for (i = 0; i < n; i++)
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	163 w_short(ob->ob_digit[i], p);
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	164 }
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	165 else if (PyFloat_Check(v)) {
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	166 char buf[256]; /* Plenty to format any double */
17707 fe4c1034b480 SF bug #422177: Results from .pyc differs from .py Tim Peters <tim.peters@gmail.com> parents: 17368 diff changeset	167 PyFloat_AsReprString(buf, (PyFloatObject *)v);
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	168 n = strlen(buf);
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	169 w_byte(TYPE_FLOAT, p);
2368 663aa059e29f hope to fix DEC Alpha gcc problems by declaring ints instead of longs Guido van Rossum <guido@python.org> parents: 2062 diff changeset	170 w_byte(n, p);
663aa059e29f hope to fix DEC Alpha gcc problems by declaring ints instead of longs Guido van Rossum <guido@python.org> parents: 2062 diff changeset	171 w_string(buf, n, p);
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	172 }
3323 6098aaa8ae7f changes for complex numbers Guido van Rossum <guido@python.org> parents: 3234 diff changeset	173 #ifndef WITHOUT_COMPLEX
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	174 else if (PyComplex_Check(v)) {
3323 6098aaa8ae7f changes for complex numbers Guido van Rossum <guido@python.org> parents: 3234 diff changeset	175 char buf[256]; /* Plenty to format any double */
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	176 PyFloatObject *temp;
3323 6098aaa8ae7f changes for complex numbers Guido van Rossum <guido@python.org> parents: 3234 diff changeset	177 w_byte(TYPE_COMPLEX, p);
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	178 temp = (PyFloatObject*)PyFloat_FromDouble(
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	179 PyComplex_RealAsDouble(v));
17707 fe4c1034b480 SF bug #422177: Results from .pyc differs from .py Tim Peters <tim.peters@gmail.com> parents: 17368 diff changeset	180 PyFloat_AsReprString(buf, temp);
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	181 Py_DECREF(temp);
3323 6098aaa8ae7f changes for complex numbers Guido van Rossum <guido@python.org> parents: 3234 diff changeset	182 n = strlen(buf);
6098aaa8ae7f changes for complex numbers Guido van Rossum <guido@python.org> parents: 3234 diff changeset	183 w_byte(n, p);
6098aaa8ae7f changes for complex numbers Guido van Rossum <guido@python.org> parents: 3234 diff changeset	184 w_string(buf, n, p);
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	185 temp = (PyFloatObject*)PyFloat_FromDouble(
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	186 PyComplex_ImagAsDouble(v));
17707 fe4c1034b480 SF bug #422177: Results from .pyc differs from .py Tim Peters <tim.peters@gmail.com> parents: 17368 diff changeset	187 PyFloat_AsReprString(buf, temp);
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	188 Py_DECREF(temp);
3323 6098aaa8ae7f changes for complex numbers Guido van Rossum <guido@python.org> parents: 3234 diff changeset	189 n = strlen(buf);
6098aaa8ae7f changes for complex numbers Guido van Rossum <guido@python.org> parents: 3234 diff changeset	190 w_byte(n, p);
6098aaa8ae7f changes for complex numbers Guido van Rossum <guido@python.org> parents: 3234 diff changeset	191 w_string(buf, n, p);
6098aaa8ae7f changes for complex numbers Guido van Rossum <guido@python.org> parents: 3234 diff changeset	192 }
6098aaa8ae7f changes for complex numbers Guido van Rossum <guido@python.org> parents: 3234 diff changeset	193 #endif
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	194 else if (PyString_Check(v)) {
32422 3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	195 if (p->strings && PyString_CHECK_INTERNED(v)) {
3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	196 PyObject *o = PyDict_GetItem(p->strings, v);
3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	197 if (o) {
3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	198 long w = PyInt_AsLong(o);
3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	199 w_byte(TYPE_STRINGREF, p);
3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	200 w_long(w, p);
3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	201 goto exit;
3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	202 }
3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	203 else {
3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	204 o = PyInt_FromLong(PyDict_Size(p->strings));
3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	205 PyDict_SetItem(p->strings, v, o);
3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	206 Py_DECREF(o);
3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	207 w_byte(TYPE_INTERNED, p);
3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	208 }
3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	209 }
3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	210 else {
3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	211 w_byte(TYPE_STRING, p);
3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	212 }
11976 513354d87a85 Marc-Andre Lemburg: support marshalling Unicode objects (code 'u'). Guido van Rossum <guido@python.org> parents: 9300 diff changeset	213 n = PyString_GET_SIZE(v);
2368 663aa059e29f hope to fix DEC Alpha gcc problems by declaring ints instead of longs Guido van Rossum <guido@python.org> parents: 2062 diff changeset	214 w_long((long)n, p);
11976 513354d87a85 Marc-Andre Lemburg: support marshalling Unicode objects (code 'u'). Guido van Rossum <guido@python.org> parents: 9300 diff changeset	215 w_string(PyString_AS_STRING(v), n, p);
513354d87a85 Marc-Andre Lemburg: support marshalling Unicode objects (code 'u'). Guido van Rossum <guido@python.org> parents: 9300 diff changeset	216 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 18148 diff changeset	217 #ifdef Py_USING_UNICODE
11976 513354d87a85 Marc-Andre Lemburg: support marshalling Unicode objects (code 'u'). Guido van Rossum <guido@python.org> parents: 9300 diff changeset	218 else if (PyUnicode_Check(v)) {
513354d87a85 Marc-Andre Lemburg: support marshalling Unicode objects (code 'u'). Guido van Rossum <guido@python.org> parents: 9300 diff changeset	219 PyObject *utf8;
513354d87a85 Marc-Andre Lemburg: support marshalling Unicode objects (code 'u'). Guido van Rossum <guido@python.org> parents: 9300 diff changeset	220 utf8 = PyUnicode_AsUTF8String(v);
513354d87a85 Marc-Andre Lemburg: support marshalling Unicode objects (code 'u'). Guido van Rossum <guido@python.org> parents: 9300 diff changeset	221 if (utf8 == NULL) {
13106 a6725acdf33b Urmpf. Quality control on this patch lapsed a bit. :-( Guido van Rossum <guido@python.org> parents: 13070 diff changeset	222 p->depth--;
a6725acdf33b Urmpf. Quality control on this patch lapsed a bit. :-( Guido van Rossum <guido@python.org> parents: 13070 diff changeset	223 p->error = 1;
a6725acdf33b Urmpf. Quality control on this patch lapsed a bit. :-( Guido van Rossum <guido@python.org> parents: 13070 diff changeset	224 return;
11976 513354d87a85 Marc-Andre Lemburg: support marshalling Unicode objects (code 'u'). Guido van Rossum <guido@python.org> parents: 9300 diff changeset	225 }
513354d87a85 Marc-Andre Lemburg: support marshalling Unicode objects (code 'u'). Guido van Rossum <guido@python.org> parents: 9300 diff changeset	226 w_byte(TYPE_UNICODE, p);
513354d87a85 Marc-Andre Lemburg: support marshalling Unicode objects (code 'u'). Guido van Rossum <guido@python.org> parents: 9300 diff changeset	227 n = PyString_GET_SIZE(utf8);
513354d87a85 Marc-Andre Lemburg: support marshalling Unicode objects (code 'u'). Guido van Rossum <guido@python.org> parents: 9300 diff changeset	228 w_long((long)n, p);
513354d87a85 Marc-Andre Lemburg: support marshalling Unicode objects (code 'u'). Guido van Rossum <guido@python.org> parents: 9300 diff changeset	229 w_string(PyString_AS_STRING(utf8), n, p);
513354d87a85 Marc-Andre Lemburg: support marshalling Unicode objects (code 'u'). Guido van Rossum <guido@python.org> parents: 9300 diff changeset	230 Py_DECREF(utf8);
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	231 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 18148 diff changeset	232 #endif
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	233 else if (PyTuple_Check(v)) {
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	234 w_byte(TYPE_TUPLE, p);
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	235 n = PyTuple_Size(v);
2368 663aa059e29f hope to fix DEC Alpha gcc problems by declaring ints instead of longs Guido van Rossum <guido@python.org> parents: 2062 diff changeset	236 w_long((long)n, p);
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	237 for (i = 0; i < n; i++) {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	238 w_object(PyTuple_GET_ITEM(v, i), p);
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	239 }
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	240 }
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	241 else if (PyList_Check(v)) {
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	242 w_byte(TYPE_LIST, p);
11976 513354d87a85 Marc-Andre Lemburg: support marshalling Unicode objects (code 'u'). Guido van Rossum <guido@python.org> parents: 9300 diff changeset	243 n = PyList_GET_SIZE(v);
2368 663aa059e29f hope to fix DEC Alpha gcc problems by declaring ints instead of longs Guido van Rossum <guido@python.org> parents: 2062 diff changeset	244 w_long((long)n, p);
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	245 for (i = 0; i < n; i++) {
11976 513354d87a85 Marc-Andre Lemburg: support marshalling Unicode objects (code 'u'). Guido van Rossum <guido@python.org> parents: 9300 diff changeset	246 w_object(PyList_GET_ITEM(v, i), p);
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	247 }
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	248 }
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	249 else if (PyDict_Check(v)) {
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1270 diff changeset	250 int pos;
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	251 PyObject key, value;
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	252 w_byte(TYPE_DICT, p);
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	253 /* This one is NULL object terminated! */
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1270 diff changeset	254 pos = 0;
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	255 while (PyDict_Next(v, &pos, &key, &value)) {
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1270 diff changeset	256 w_object(key, p);
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1270 diff changeset	257 w_object(value, p);
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	258 }
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	259 w_object((PyObject *)NULL, p);
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	260 }
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	261 else if (PyCode_Check(v)) {
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	262 PyCodeObject co = (PyCodeObject )v;
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	263 w_byte(TYPE_CODE, p);
23851 d6ae544acd24 Fix SF bug # 561858 Assertion with very long lists Neal Norwitz <nnorwitz@gmail.com> parents: 22785 diff changeset	264 w_long(co->co_argcount, p);
d6ae544acd24 Fix SF bug # 561858 Assertion with very long lists Neal Norwitz <nnorwitz@gmail.com> parents: 22785 diff changeset	265 w_long(co->co_nlocals, p);
d6ae544acd24 Fix SF bug # 561858 Assertion with very long lists Neal Norwitz <nnorwitz@gmail.com> parents: 22785 diff changeset	266 w_long(co->co_stacksize, p);
d6ae544acd24 Fix SF bug # 561858 Assertion with very long lists Neal Norwitz <nnorwitz@gmail.com> parents: 22785 diff changeset	267 w_long(co->co_flags, p);
9293 0a67db47e1d0 Changes to support other object types besides strings Guido van Rossum <guido@python.org> parents: 8465 diff changeset	268 w_object(co->co_code, p);
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	269 w_object(co->co_consts, p);
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	270 w_object(co->co_names, p);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2503 diff changeset	271 w_object(co->co_varnames, p);
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 15979 diff changeset	272 w_object(co->co_freevars, p);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 15979 diff changeset	273 w_object(co->co_cellvars, p);
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	274 w_object(co->co_filename, p);
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1191 diff changeset	275 w_object(co->co_name, p);
23851 d6ae544acd24 Fix SF bug # 561858 Assertion with very long lists Neal Norwitz <nnorwitz@gmail.com> parents: 22785 diff changeset	276 w_long(co->co_firstlineno, p);
5042 9b7e0cf51990 Marshal the line number table of code objects. Guido van Rossum <guido@python.org> parents: 4995 diff changeset	277 w_object(co->co_lnotab, p);
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	278 }
20947 c555f1e7c4be Use PyObject_CheckReadBuffer(). Jeremy Hylton <jeremy@alum.mit.edu> parents: 20552 diff changeset	279 else if (PyObject_CheckReadBuffer(v)) {
9293 0a67db47e1d0 Changes to support other object types besides strings Guido van Rossum <guido@python.org> parents: 8465 diff changeset	280 /* Write unknown buffer-style objects as a string */
0a67db47e1d0 Changes to support other object types besides strings Guido van Rossum <guido@python.org> parents: 8465 diff changeset	281 char *s;
20947 c555f1e7c4be Use PyObject_CheckReadBuffer(). Jeremy Hylton <jeremy@alum.mit.edu> parents: 20552 diff changeset	282 PyBufferProcs *pb = v->ob_type->tp_as_buffer;
9293 0a67db47e1d0 Changes to support other object types besides strings Guido van Rossum <guido@python.org> parents: 8465 diff changeset	283 w_byte(TYPE_STRING, p);
0a67db47e1d0 Changes to support other object types besides strings Guido van Rossum <guido@python.org> parents: 8465 diff changeset	284 n = (pb->bf_getreadbuffer)(v, 0, (void *)&s);
0a67db47e1d0 Changes to support other object types besides strings Guido van Rossum <guido@python.org> parents: 8465 diff changeset	285 w_long((long)n, p);
0a67db47e1d0 Changes to support other object types besides strings Guido van Rossum <guido@python.org> parents: 8465 diff changeset	286 w_string(s, n, p);
0a67db47e1d0 Changes to support other object types besides strings Guido van Rossum <guido@python.org> parents: 8465 diff changeset	287 }
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	288 else {
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	289 w_byte(TYPE_UNKNOWN, p);
3731 de1cb33219e3 Jeremy's patches for more robust handling of unmarshallable types. Guido van Rossum <guido@python.org> parents: 3620 diff changeset	290 p->error = 1;
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	291 }
32422 3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	292 exit:
13106 a6725acdf33b Urmpf. Quality control on this patch lapsed a bit. :-( Guido van Rossum <guido@python.org> parents: 13070 diff changeset	293 p->depth--;
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	294 }
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	295
32422 3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	296 /* version currently has no effect for writing longs. */
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	297 void
32422 3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	298 PyMarshal_WriteLongToFile(long x, FILE *fp, int version)
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	299 {
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	300 WFILE wf;
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	301 wf.fp = fp;
3731 de1cb33219e3 Jeremy's patches for more robust handling of unmarshallable types. Guido van Rossum <guido@python.org> parents: 3620 diff changeset	302 wf.error = 0;
13070 7392e71f6cce Michael Hudson <mwh21@cam.ac.uk>: Fred Drake <fdrake@acm.org> parents: 12576 diff changeset	303 wf.depth = 0;
32422 3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	304 wf.strings = NULL;
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	305 w_long(x, &wf);
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	306 }
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	307
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	308 void
32422 3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	309 PyMarshal_WriteObjectToFile(PyObject x, FILE fp, int version)
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	310 {
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	311 WFILE wf;
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	312 wf.fp = fp;
3731 de1cb33219e3 Jeremy's patches for more robust handling of unmarshallable types. Guido van Rossum <guido@python.org> parents: 3620 diff changeset	313 wf.error = 0;
13106 a6725acdf33b Urmpf. Quality control on this patch lapsed a bit. :-( Guido van Rossum <guido@python.org> parents: 13070 diff changeset	314 wf.depth = 0;
32422 3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	315 wf.strings = (version > 0) ? PyDict_New() : NULL;
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	316 w_object(x, &wf);
32422 3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	317 Py_XDECREF(wf.strings);
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	318 }
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	319
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	320 typedef WFILE RFILE; /* Same struct with different invariants */
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	321
2503 4dd1af0ddef0 various tuple related optimizations; remove unused b/w compat code from ceval.c Guido van Rossum <guido@python.org> parents: 2368 diff changeset	322 #define rs_byte(p) (((p)->ptr != (p)->end) ? (unsigned char)*(p)->ptr++ : EOF)
4dd1af0ddef0 various tuple related optimizations; remove unused b/w compat code from ceval.c Guido van Rossum <guido@python.org> parents: 2368 diff changeset	323
4dd1af0ddef0 various tuple related optimizations; remove unused b/w compat code from ceval.c Guido van Rossum <guido@python.org> parents: 2368 diff changeset	324 #define r_byte(p) ((p)->fp ? getc((p)->fp) : rs_byte(p))
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	325
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	326 static int
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13447 diff changeset	327 r_string(char s, int n, RFILE p)
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	328 {
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	329 if (p->fp != NULL)
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	330 return fread(s, 1, n, p->fp);
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	331 if (p->end - p->ptr < n)
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	332 n = p->end - p->ptr;
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	333 memcpy(s, p->ptr, n);
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	334 p->ptr += n;
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	335 return n;
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	336 }
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	337
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	338 static int
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13447 diff changeset	339 r_short(RFILE *p)
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	340 {
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	341 register short x;
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	342 x = r_byte(p);
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	343 x \|= r_byte(p) << 8;
14678 94ca87a3e5ee Obscure marshal fixes: Tim Peters <tim.peters@gmail.com> parents: 14375 diff changeset	344 /* Sign-extension, in case short greater than 16 bits */
94ca87a3e5ee Obscure marshal fixes: Tim Peters <tim.peters@gmail.com> parents: 14375 diff changeset	345 x \|= -(x & 0x8000);
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	346 return x;
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	347 }
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	348
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	349 static long
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13447 diff changeset	350 r_long(RFILE *p)
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	351 {
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	352 register long x;
2503 4dd1af0ddef0 various tuple related optimizations; remove unused b/w compat code from ceval.c Guido van Rossum <guido@python.org> parents: 2368 diff changeset	353 register FILE *fp = p->fp;
4dd1af0ddef0 various tuple related optimizations; remove unused b/w compat code from ceval.c Guido van Rossum <guido@python.org> parents: 2368 diff changeset	354 if (fp) {
4dd1af0ddef0 various tuple related optimizations; remove unused b/w compat code from ceval.c Guido van Rossum <guido@python.org> parents: 2368 diff changeset	355 x = getc(fp);
4dd1af0ddef0 various tuple related optimizations; remove unused b/w compat code from ceval.c Guido van Rossum <guido@python.org> parents: 2368 diff changeset	356 x \|= (long)getc(fp) << 8;
4dd1af0ddef0 various tuple related optimizations; remove unused b/w compat code from ceval.c Guido van Rossum <guido@python.org> parents: 2368 diff changeset	357 x \|= (long)getc(fp) << 16;
4dd1af0ddef0 various tuple related optimizations; remove unused b/w compat code from ceval.c Guido van Rossum <guido@python.org> parents: 2368 diff changeset	358 x \|= (long)getc(fp) << 24;
4dd1af0ddef0 various tuple related optimizations; remove unused b/w compat code from ceval.c Guido van Rossum <guido@python.org> parents: 2368 diff changeset	359 }
4dd1af0ddef0 various tuple related optimizations; remove unused b/w compat code from ceval.c Guido van Rossum <guido@python.org> parents: 2368 diff changeset	360 else {
4dd1af0ddef0 various tuple related optimizations; remove unused b/w compat code from ceval.c Guido van Rossum <guido@python.org> parents: 2368 diff changeset	361 x = rs_byte(p);
4dd1af0ddef0 various tuple related optimizations; remove unused b/w compat code from ceval.c Guido van Rossum <guido@python.org> parents: 2368 diff changeset	362 x \|= (long)rs_byte(p) << 8;
4dd1af0ddef0 various tuple related optimizations; remove unused b/w compat code from ceval.c Guido van Rossum <guido@python.org> parents: 2368 diff changeset	363 x \|= (long)rs_byte(p) << 16;
4dd1af0ddef0 various tuple related optimizations; remove unused b/w compat code from ceval.c Guido van Rossum <guido@python.org> parents: 2368 diff changeset	364 x \|= (long)rs_byte(p) << 24;
4dd1af0ddef0 various tuple related optimizations; remove unused b/w compat code from ceval.c Guido van Rossum <guido@python.org> parents: 2368 diff changeset	365 }
4656 186c2ad4abf3 Better way to handle 64-bit ints, keeping gcc -Wall happy. Guido van Rossum <guido@python.org> parents: 4592 diff changeset	366 #if SIZEOF_LONG > 4
4592 3bf9e2beaf8c Tentative changes to make this work better on 64-bit machines. Guido van Rossum <guido@python.org> parents: 4503 diff changeset	367 /* Sign extension for 64-bit machines */
14678 94ca87a3e5ee Obscure marshal fixes: Tim Peters <tim.peters@gmail.com> parents: 14375 diff changeset	368 x \|= -(x & 0x80000000L);
4656 186c2ad4abf3 Better way to handle 64-bit ints, keeping gcc -Wall happy. Guido van Rossum <guido@python.org> parents: 4592 diff changeset	369 #endif
4592 3bf9e2beaf8c Tentative changes to make this work better on 64-bit machines. Guido van Rossum <guido@python.org> parents: 4503 diff changeset	370 return x;
3bf9e2beaf8c Tentative changes to make this work better on 64-bit machines. Guido van Rossum <guido@python.org> parents: 4503 diff changeset	371 }
3bf9e2beaf8c Tentative changes to make this work better on 64-bit machines. Guido van Rossum <guido@python.org> parents: 4503 diff changeset	372
19547 7e628f60245e marshal.c r_long64: When reading a TYPE_INT64 value on a box with 32-bit Tim Peters <tim.peters@gmail.com> parents: 19343 diff changeset	373 /* r_long64 deals with the TYPE_INT64 code. On a machine with
7e628f60245e marshal.c r_long64: When reading a TYPE_INT64 value on a box with 32-bit Tim Peters <tim.peters@gmail.com> parents: 19343 diff changeset	374 sizeof(long) > 4, it returns a Python int object, else a Python long
7e628f60245e marshal.c r_long64: When reading a TYPE_INT64 value on a box with 32-bit Tim Peters <tim.peters@gmail.com> parents: 19343 diff changeset	375 object. Note that w_long64 writes out TYPE_INT if 32 bits is enough,
7e628f60245e marshal.c r_long64: When reading a TYPE_INT64 value on a box with 32-bit Tim Peters <tim.peters@gmail.com> parents: 19343 diff changeset	376 so there's no inefficiency here in returning a PyLong on 32-bit boxes
7e628f60245e marshal.c r_long64: When reading a TYPE_INT64 value on a box with 32-bit Tim Peters <tim.peters@gmail.com> parents: 19343 diff changeset	377 for everything written via TYPE_INT64 (i.e., if an int is written via
7e628f60245e marshal.c r_long64: When reading a TYPE_INT64 value on a box with 32-bit Tim Peters <tim.peters@gmail.com> parents: 19343 diff changeset	378 TYPE_INT64, it needs more than 32 bits).
7e628f60245e marshal.c r_long64: When reading a TYPE_INT64 value on a box with 32-bit Tim Peters <tim.peters@gmail.com> parents: 19343 diff changeset	379 */
7e628f60245e marshal.c r_long64: When reading a TYPE_INT64 value on a box with 32-bit Tim Peters <tim.peters@gmail.com> parents: 19343 diff changeset	380 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13447 diff changeset	381 r_long64(RFILE *p)
4592 3bf9e2beaf8c Tentative changes to make this work better on 64-bit machines. Guido van Rossum <guido@python.org> parents: 4503 diff changeset	382 {
19547 7e628f60245e marshal.c r_long64: When reading a TYPE_INT64 value on a box with 32-bit Tim Peters <tim.peters@gmail.com> parents: 19343 diff changeset	383 long lo4 = r_long(p);
7e628f60245e marshal.c r_long64: When reading a TYPE_INT64 value on a box with 32-bit Tim Peters <tim.peters@gmail.com> parents: 19343 diff changeset	384 long hi4 = r_long(p);
4656 186c2ad4abf3 Better way to handle 64-bit ints, keeping gcc -Wall happy. Guido van Rossum <guido@python.org> parents: 4592 diff changeset	385 #if SIZEOF_LONG > 4
19547 7e628f60245e marshal.c r_long64: When reading a TYPE_INT64 value on a box with 32-bit Tim Peters <tim.peters@gmail.com> parents: 19343 diff changeset	386 long x = (hi4 << 32) \| (lo4 & 0xFFFFFFFFL);
7e628f60245e marshal.c r_long64: When reading a TYPE_INT64 value on a box with 32-bit Tim Peters <tim.peters@gmail.com> parents: 19343 diff changeset	387 return PyInt_FromLong(x);
4656 186c2ad4abf3 Better way to handle 64-bit ints, keeping gcc -Wall happy. Guido van Rossum <guido@python.org> parents: 4592 diff changeset	388 #else
19547 7e628f60245e marshal.c r_long64: When reading a TYPE_INT64 value on a box with 32-bit Tim Peters <tim.peters@gmail.com> parents: 19343 diff changeset	389 unsigned char buf[8];
7e628f60245e marshal.c r_long64: When reading a TYPE_INT64 value on a box with 32-bit Tim Peters <tim.peters@gmail.com> parents: 19343 diff changeset	390 int one = 1;
7e628f60245e marshal.c r_long64: When reading a TYPE_INT64 value on a box with 32-bit Tim Peters <tim.peters@gmail.com> parents: 19343 diff changeset	391 int is_little_endian = (int)(char)&one;
7e628f60245e marshal.c r_long64: When reading a TYPE_INT64 value on a box with 32-bit Tim Peters <tim.peters@gmail.com> parents: 19343 diff changeset	392 if (is_little_endian) {
7e628f60245e marshal.c r_long64: When reading a TYPE_INT64 value on a box with 32-bit Tim Peters <tim.peters@gmail.com> parents: 19343 diff changeset	393 memcpy(buf, &lo4, 4);
7e628f60245e marshal.c r_long64: When reading a TYPE_INT64 value on a box with 32-bit Tim Peters <tim.peters@gmail.com> parents: 19343 diff changeset	394 memcpy(buf+4, &hi4, 4);
4592 3bf9e2beaf8c Tentative changes to make this work better on 64-bit machines. Guido van Rossum <guido@python.org> parents: 4503 diff changeset	395 }
19547 7e628f60245e marshal.c r_long64: When reading a TYPE_INT64 value on a box with 32-bit Tim Peters <tim.peters@gmail.com> parents: 19343 diff changeset	396 else {
7e628f60245e marshal.c r_long64: When reading a TYPE_INT64 value on a box with 32-bit Tim Peters <tim.peters@gmail.com> parents: 19343 diff changeset	397 memcpy(buf, &hi4, 4);
7e628f60245e marshal.c r_long64: When reading a TYPE_INT64 value on a box with 32-bit Tim Peters <tim.peters@gmail.com> parents: 19343 diff changeset	398 memcpy(buf+4, &lo4, 4);
7e628f60245e marshal.c r_long64: When reading a TYPE_INT64 value on a box with 32-bit Tim Peters <tim.peters@gmail.com> parents: 19343 diff changeset	399 }
7e628f60245e marshal.c r_long64: When reading a TYPE_INT64 value on a box with 32-bit Tim Peters <tim.peters@gmail.com> parents: 19343 diff changeset	400 return _PyLong_FromByteArray(buf, 8, is_little_endian, 1);
4656 186c2ad4abf3 Better way to handle 64-bit ints, keeping gcc -Wall happy. Guido van Rossum <guido@python.org> parents: 4592 diff changeset	401 #endif
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	402 }
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	403
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	404 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13447 diff changeset	405 r_object(RFILE *p)
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	406 {
31824 331de8b9d1ed Marshal clean-up (SF patch #873224) Armin Rigo <arigo@tunes.org> parents: 30311 diff changeset	407 /* NULL is a valid return value, it does not necessarily means that
331de8b9d1ed Marshal clean-up (SF patch #873224) Armin Rigo <arigo@tunes.org> parents: 30311 diff changeset	408 an exception is set. */
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	409 PyObject v, v2;
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	410 long i, n;
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	411 int type = r_byte(p);
16311 8c41f3861aad It's unclear whether PyMarshal_XXX() are part of the public or private API. Tim Peters <tim.peters@gmail.com> parents: 16257 diff changeset	412
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	413 switch (type) {
16311 8c41f3861aad It's unclear whether PyMarshal_XXX() are part of the public or private API. Tim Peters <tim.peters@gmail.com> parents: 16257 diff changeset	414
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	415 case EOF:
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	416 PyErr_SetString(PyExc_EOFError,
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	417 "EOF read where object expected");
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	418 return NULL;
16311 8c41f3861aad It's unclear whether PyMarshal_XXX() are part of the public or private API. Tim Peters <tim.peters@gmail.com> parents: 16257 diff changeset	419
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	420 case TYPE_NULL:
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	421 return NULL;
16311 8c41f3861aad It's unclear whether PyMarshal_XXX() are part of the public or private API. Tim Peters <tim.peters@gmail.com> parents: 16257 diff changeset	422
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	423 case TYPE_NONE:
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	424 Py_INCREF(Py_None);
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	425 return Py_None;
16311 8c41f3861aad It's unclear whether PyMarshal_XXX() are part of the public or private API. Tim Peters <tim.peters@gmail.com> parents: 16257 diff changeset	426
18148 7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 17707 diff changeset	427 case TYPE_STOPITER:
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 17707 diff changeset	428 Py_INCREF(PyExc_StopIteration);
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 17707 diff changeset	429 return PyExc_StopIteration;
7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 17707 diff changeset	430
4403 3b3f7c3f6da2 Ellipses -> Ellipsis rename (the dictionary really says that it should Guido van Rossum <guido@python.org> parents: 4039 diff changeset	431 case TYPE_ELLIPSIS:
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	432 Py_INCREF(Py_Ellipsis);
4403 3b3f7c3f6da2 Ellipses -> Ellipsis rename (the dictionary really says that it should Guido van Rossum <guido@python.org> parents: 4039 diff changeset	433 return Py_Ellipsis;
16311 8c41f3861aad It's unclear whether PyMarshal_XXX() are part of the public or private API. Tim Peters <tim.peters@gmail.com> parents: 16257 diff changeset	434
22785 aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22705 diff changeset	435 case TYPE_FALSE:
aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22705 diff changeset	436 Py_INCREF(Py_False);
aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22705 diff changeset	437 return Py_False;
aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22705 diff changeset	438
aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22705 diff changeset	439 case TYPE_TRUE:
aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22705 diff changeset	440 Py_INCREF(Py_True);
aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22705 diff changeset	441 return Py_True;
aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22705 diff changeset	442
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	443 case TYPE_INT:
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	444 return PyInt_FromLong(r_long(p));
16311 8c41f3861aad It's unclear whether PyMarshal_XXX() are part of the public or private API. Tim Peters <tim.peters@gmail.com> parents: 16257 diff changeset	445
4592 3bf9e2beaf8c Tentative changes to make this work better on 64-bit machines. Guido van Rossum <guido@python.org> parents: 4503 diff changeset	446 case TYPE_INT64:
19547 7e628f60245e marshal.c r_long64: When reading a TYPE_INT64 value on a box with 32-bit Tim Peters <tim.peters@gmail.com> parents: 19343 diff changeset	447 return r_long64(p);
16311 8c41f3861aad It's unclear whether PyMarshal_XXX() are part of the public or private API. Tim Peters <tim.peters@gmail.com> parents: 16257 diff changeset	448
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	449 case TYPE_LONG:
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	450 {
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	451 int size;
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	452 PyLongObject *ob;
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	453 n = r_long(p);
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	454 size = n<0 ? -n : n;
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	455 ob = _PyLong_New(size);
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	456 if (ob == NULL)
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	457 return NULL;
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	458 ob->ob_size = n;
31824 331de8b9d1ed Marshal clean-up (SF patch #873224) Armin Rigo <arigo@tunes.org> parents: 30311 diff changeset	459 for (i = 0; i < size; i++) {
331de8b9d1ed Marshal clean-up (SF patch #873224) Armin Rigo <arigo@tunes.org> parents: 30311 diff changeset	460 int digit = r_short(p);
331de8b9d1ed Marshal clean-up (SF patch #873224) Armin Rigo <arigo@tunes.org> parents: 30311 diff changeset	461 if (digit < 0) {
331de8b9d1ed Marshal clean-up (SF patch #873224) Armin Rigo <arigo@tunes.org> parents: 30311 diff changeset	462 Py_DECREF(ob);
331de8b9d1ed Marshal clean-up (SF patch #873224) Armin Rigo <arigo@tunes.org> parents: 30311 diff changeset	463 PyErr_SetString(PyExc_ValueError,
331de8b9d1ed Marshal clean-up (SF patch #873224) Armin Rigo <arigo@tunes.org> parents: 30311 diff changeset	464 "bad marshal data");
331de8b9d1ed Marshal clean-up (SF patch #873224) Armin Rigo <arigo@tunes.org> parents: 30311 diff changeset	465 return NULL;
331de8b9d1ed Marshal clean-up (SF patch #873224) Armin Rigo <arigo@tunes.org> parents: 30311 diff changeset	466 }
331de8b9d1ed Marshal clean-up (SF patch #873224) Armin Rigo <arigo@tunes.org> parents: 30311 diff changeset	467 ob->ob_digit[i] = digit;
331de8b9d1ed Marshal clean-up (SF patch #873224) Armin Rigo <arigo@tunes.org> parents: 30311 diff changeset	468 }
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	469 return (PyObject *)ob;
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	470 }
16311 8c41f3861aad It's unclear whether PyMarshal_XXX() are part of the public or private API. Tim Peters <tim.peters@gmail.com> parents: 16257 diff changeset	471
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	472 case TYPE_FLOAT:
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	473 {
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	474 char buf[256];
5119 bda01a374762 Changes for Lee Busby's SIGFPE patch set. Guido van Rossum <guido@python.org> parents: 5115 diff changeset	475 double dx;
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	476 n = r_byte(p);
31824 331de8b9d1ed Marshal clean-up (SF patch #873224) Armin Rigo <arigo@tunes.org> parents: 30311 diff changeset	477 if (n == EOF \|\| r_string(buf, (int)n, p) != n) {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	478 PyErr_SetString(PyExc_EOFError,
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	479 "EOF read where object expected");
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	480 return NULL;
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	481 }
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	482 buf[n] = '\0';
5119 bda01a374762 Changes for Lee Busby's SIGFPE patch set. Guido van Rossum <guido@python.org> parents: 5115 diff changeset	483 PyFPE_START_PROTECT("atof", return 0)
32305 13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: 31824 diff changeset	484 dx = PyOS_ascii_atof(buf);
5197 74c12704a0bd New form of PyFPE_END_PROTECT macro. Guido van Rossum <guido@python.org> parents: 5119 diff changeset	485 PyFPE_END_PROTECT(dx)
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	486 return PyFloat_FromDouble(dx);
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	487 }
16311 8c41f3861aad It's unclear whether PyMarshal_XXX() are part of the public or private API. Tim Peters <tim.peters@gmail.com> parents: 16257 diff changeset	488
3323 6098aaa8ae7f changes for complex numbers Guido van Rossum <guido@python.org> parents: 3234 diff changeset	489 #ifndef WITHOUT_COMPLEX
6098aaa8ae7f changes for complex numbers Guido van Rossum <guido@python.org> parents: 3234 diff changeset	490 case TYPE_COMPLEX:
6098aaa8ae7f changes for complex numbers Guido van Rossum <guido@python.org> parents: 3234 diff changeset	491 {
6098aaa8ae7f changes for complex numbers Guido van Rossum <guido@python.org> parents: 3234 diff changeset	492 char buf[256];
3766 516490c8192c Py_complex; and WITHOUT_COMPLEX added to getargs.c Guido van Rossum <guido@python.org> parents: 3731 diff changeset	493 Py_complex c;
3323 6098aaa8ae7f changes for complex numbers Guido van Rossum <guido@python.org> parents: 3234 diff changeset	494 n = r_byte(p);
31824 331de8b9d1ed Marshal clean-up (SF patch #873224) Armin Rigo <arigo@tunes.org> parents: 30311 diff changeset	495 if (n == EOF \|\| r_string(buf, (int)n, p) != n) {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	496 PyErr_SetString(PyExc_EOFError,
3323 6098aaa8ae7f changes for complex numbers Guido van Rossum <guido@python.org> parents: 3234 diff changeset	497 "EOF read where object expected");
6098aaa8ae7f changes for complex numbers Guido van Rossum <guido@python.org> parents: 3234 diff changeset	498 return NULL;
6098aaa8ae7f changes for complex numbers Guido van Rossum <guido@python.org> parents: 3234 diff changeset	499 }
6098aaa8ae7f changes for complex numbers Guido van Rossum <guido@python.org> parents: 3234 diff changeset	500 buf[n] = '\0';
5119 bda01a374762 Changes for Lee Busby's SIGFPE patch set. Guido van Rossum <guido@python.org> parents: 5115 diff changeset	501 PyFPE_START_PROTECT("atof", return 0)
32305 13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: 31824 diff changeset	502 c.real = PyOS_ascii_atof(buf);
5197 74c12704a0bd New form of PyFPE_END_PROTECT macro. Guido van Rossum <guido@python.org> parents: 5119 diff changeset	503 PyFPE_END_PROTECT(c)
3323 6098aaa8ae7f changes for complex numbers Guido van Rossum <guido@python.org> parents: 3234 diff changeset	504 n = r_byte(p);
31824 331de8b9d1ed Marshal clean-up (SF patch #873224) Armin Rigo <arigo@tunes.org> parents: 30311 diff changeset	505 if (n == EOF \|\| r_string(buf, (int)n, p) != n) {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	506 PyErr_SetString(PyExc_EOFError,
3323 6098aaa8ae7f changes for complex numbers Guido van Rossum <guido@python.org> parents: 3234 diff changeset	507 "EOF read where object expected");
6098aaa8ae7f changes for complex numbers Guido van Rossum <guido@python.org> parents: 3234 diff changeset	508 return NULL;
6098aaa8ae7f changes for complex numbers Guido van Rossum <guido@python.org> parents: 3234 diff changeset	509 }
6098aaa8ae7f changes for complex numbers Guido van Rossum <guido@python.org> parents: 3234 diff changeset	510 buf[n] = '\0';
5119 bda01a374762 Changes for Lee Busby's SIGFPE patch set. Guido van Rossum <guido@python.org> parents: 5115 diff changeset	511 PyFPE_START_PROTECT("atof", return 0)
32305 13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: 31824 diff changeset	512 c.imag = PyOS_ascii_atof(buf);
5197 74c12704a0bd New form of PyFPE_END_PROTECT macro. Guido van Rossum <guido@python.org> parents: 5119 diff changeset	513 PyFPE_END_PROTECT(c)
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	514 return PyComplex_FromCComplex(c);
3323 6098aaa8ae7f changes for complex numbers Guido van Rossum <guido@python.org> parents: 3234 diff changeset	515 }
6098aaa8ae7f changes for complex numbers Guido van Rossum <guido@python.org> parents: 3234 diff changeset	516 #endif
16311 8c41f3861aad It's unclear whether PyMarshal_XXX() are part of the public or private API. Tim Peters <tim.peters@gmail.com> parents: 16257 diff changeset	517
32422 3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	518 case TYPE_INTERNED:
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	519 case TYPE_STRING:
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	520 n = r_long(p);
8465 0e6fbbe3b63c When unmarshalling, add test for negative lengths on strings, tuples Guido van Rossum <guido@python.org> parents: 8329 diff changeset	521 if (n < 0) {
0e6fbbe3b63c When unmarshalling, add test for negative lengths on strings, tuples Guido van Rossum <guido@python.org> parents: 8329 diff changeset	522 PyErr_SetString(PyExc_ValueError, "bad marshal data");
0e6fbbe3b63c When unmarshalling, add test for negative lengths on strings, tuples Guido van Rossum <guido@python.org> parents: 8329 diff changeset	523 return NULL;
0e6fbbe3b63c When unmarshalling, add test for negative lengths on strings, tuples Guido van Rossum <guido@python.org> parents: 8329 diff changeset	524 }
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	525 v = PyString_FromStringAndSize((char *)NULL, n);
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	526 if (v != NULL) {
11976 513354d87a85 Marc-Andre Lemburg: support marshalling Unicode objects (code 'u'). Guido van Rossum <guido@python.org> parents: 9300 diff changeset	527 if (r_string(PyString_AS_STRING(v), (int)n, p) != n) {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	528 Py_DECREF(v);
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	529 v = NULL;
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	530 PyErr_SetString(PyExc_EOFError,
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	531 "EOF read where object expected");
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	532 }
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	533 }
32422 3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	534 if (type == TYPE_INTERNED) {
3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	535 PyString_InternInPlace(&v);
3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	536 PyList_Append(p->strings, v);
3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	537 }
3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	538 return v;
3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	539
3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	540 case TYPE_STRINGREF:
3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	541 n = r_long(p);
3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	542 v = PyList_GET_ITEM(p->strings, n);
3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	543 Py_INCREF(v);
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	544 return v;
16311 8c41f3861aad It's unclear whether PyMarshal_XXX() are part of the public or private API. Tim Peters <tim.peters@gmail.com> parents: 16257 diff changeset	545
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 18148 diff changeset	546 #ifdef Py_USING_UNICODE
11976 513354d87a85 Marc-Andre Lemburg: support marshalling Unicode objects (code 'u'). Guido van Rossum <guido@python.org> parents: 9300 diff changeset	547 case TYPE_UNICODE:
513354d87a85 Marc-Andre Lemburg: support marshalling Unicode objects (code 'u'). Guido van Rossum <guido@python.org> parents: 9300 diff changeset	548 {
513354d87a85 Marc-Andre Lemburg: support marshalling Unicode objects (code 'u'). Guido van Rossum <guido@python.org> parents: 9300 diff changeset	549 char *buffer;
513354d87a85 Marc-Andre Lemburg: support marshalling Unicode objects (code 'u'). Guido van Rossum <guido@python.org> parents: 9300 diff changeset	550
513354d87a85 Marc-Andre Lemburg: support marshalling Unicode objects (code 'u'). Guido van Rossum <guido@python.org> parents: 9300 diff changeset	551 n = r_long(p);
513354d87a85 Marc-Andre Lemburg: support marshalling Unicode objects (code 'u'). Guido van Rossum <guido@python.org> parents: 9300 diff changeset	552 if (n < 0) {
513354d87a85 Marc-Andre Lemburg: support marshalling Unicode objects (code 'u'). Guido van Rossum <guido@python.org> parents: 9300 diff changeset	553 PyErr_SetString(PyExc_ValueError, "bad marshal data");
513354d87a85 Marc-Andre Lemburg: support marshalling Unicode objects (code 'u'). Guido van Rossum <guido@python.org> parents: 9300 diff changeset	554 return NULL;
513354d87a85 Marc-Andre Lemburg: support marshalling Unicode objects (code 'u'). Guido van Rossum <guido@python.org> parents: 9300 diff changeset	555 }
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12135 diff changeset	556 buffer = PyMem_NEW(char, n);
11976 513354d87a85 Marc-Andre Lemburg: support marshalling Unicode objects (code 'u'). Guido van Rossum <guido@python.org> parents: 9300 diff changeset	557 if (buffer == NULL)
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12135 diff changeset	558 return PyErr_NoMemory();
11976 513354d87a85 Marc-Andre Lemburg: support marshalling Unicode objects (code 'u'). Guido van Rossum <guido@python.org> parents: 9300 diff changeset	559 if (r_string(buffer, (int)n, p) != n) {
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12135 diff changeset	560 PyMem_DEL(buffer);
11976 513354d87a85 Marc-Andre Lemburg: support marshalling Unicode objects (code 'u'). Guido van Rossum <guido@python.org> parents: 9300 diff changeset	561 PyErr_SetString(PyExc_EOFError,
513354d87a85 Marc-Andre Lemburg: support marshalling Unicode objects (code 'u'). Guido van Rossum <guido@python.org> parents: 9300 diff changeset	562 "EOF read where object expected");
513354d87a85 Marc-Andre Lemburg: support marshalling Unicode objects (code 'u'). Guido van Rossum <guido@python.org> parents: 9300 diff changeset	563 return NULL;
513354d87a85 Marc-Andre Lemburg: support marshalling Unicode objects (code 'u'). Guido van Rossum <guido@python.org> parents: 9300 diff changeset	564 }
513354d87a85 Marc-Andre Lemburg: support marshalling Unicode objects (code 'u'). Guido van Rossum <guido@python.org> parents: 9300 diff changeset	565 v = PyUnicode_DecodeUTF8(buffer, n, NULL);
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12135 diff changeset	566 PyMem_DEL(buffer);
11976 513354d87a85 Marc-Andre Lemburg: support marshalling Unicode objects (code 'u'). Guido van Rossum <guido@python.org> parents: 9300 diff changeset	567 return v;
513354d87a85 Marc-Andre Lemburg: support marshalling Unicode objects (code 'u'). Guido van Rossum <guido@python.org> parents: 9300 diff changeset	568 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 18148 diff changeset	569 #endif
16311 8c41f3861aad It's unclear whether PyMarshal_XXX() are part of the public or private API. Tim Peters <tim.peters@gmail.com> parents: 16257 diff changeset	570
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	571 case TYPE_TUPLE:
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	572 n = r_long(p);
8465 0e6fbbe3b63c When unmarshalling, add test for negative lengths on strings, tuples Guido van Rossum <guido@python.org> parents: 8329 diff changeset	573 if (n < 0) {
0e6fbbe3b63c When unmarshalling, add test for negative lengths on strings, tuples Guido van Rossum <guido@python.org> parents: 8329 diff changeset	574 PyErr_SetString(PyExc_ValueError, "bad marshal data");
0e6fbbe3b63c When unmarshalling, add test for negative lengths on strings, tuples Guido van Rossum <guido@python.org> parents: 8329 diff changeset	575 return NULL;
0e6fbbe3b63c When unmarshalling, add test for negative lengths on strings, tuples Guido van Rossum <guido@python.org> parents: 8329 diff changeset	576 }
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	577 v = PyTuple_New((int)n);
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	578 if (v == NULL)
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	579 return v;
3234 aafe7d634985 Made a bit more robust against out-of-memory situations Jack Jansen <jack.jansen@cwi.nl> parents: 3012 diff changeset	580 for (i = 0; i < n; i++) {
aafe7d634985 Made a bit more robust against out-of-memory situations Jack Jansen <jack.jansen@cwi.nl> parents: 3012 diff changeset	581 v2 = r_object(p);
aafe7d634985 Made a bit more robust against out-of-memory situations Jack Jansen <jack.jansen@cwi.nl> parents: 3012 diff changeset	582 if ( v2 == NULL ) {
31824 331de8b9d1ed Marshal clean-up (SF patch #873224) Armin Rigo <arigo@tunes.org> parents: 30311 diff changeset	583 if (!PyErr_Occurred())
331de8b9d1ed Marshal clean-up (SF patch #873224) Armin Rigo <arigo@tunes.org> parents: 30311 diff changeset	584 PyErr_SetString(PyExc_TypeError,
331de8b9d1ed Marshal clean-up (SF patch #873224) Armin Rigo <arigo@tunes.org> parents: 30311 diff changeset	585 "NULL object in marshal data");
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	586 Py_DECREF(v);
3234 aafe7d634985 Made a bit more robust against out-of-memory situations Jack Jansen <jack.jansen@cwi.nl> parents: 3012 diff changeset	587 v = NULL;
aafe7d634985 Made a bit more robust against out-of-memory situations Jack Jansen <jack.jansen@cwi.nl> parents: 3012 diff changeset	588 break;
aafe7d634985 Made a bit more robust against out-of-memory situations Jack Jansen <jack.jansen@cwi.nl> parents: 3012 diff changeset	589 }
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	590 PyTuple_SET_ITEM(v, (int)i, v2);
3234 aafe7d634985 Made a bit more robust against out-of-memory situations Jack Jansen <jack.jansen@cwi.nl> parents: 3012 diff changeset	591 }
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	592 return v;
16311 8c41f3861aad It's unclear whether PyMarshal_XXX() are part of the public or private API. Tim Peters <tim.peters@gmail.com> parents: 16257 diff changeset	593
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	594 case TYPE_LIST:
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	595 n = r_long(p);
8465 0e6fbbe3b63c When unmarshalling, add test for negative lengths on strings, tuples Guido van Rossum <guido@python.org> parents: 8329 diff changeset	596 if (n < 0) {
0e6fbbe3b63c When unmarshalling, add test for negative lengths on strings, tuples Guido van Rossum <guido@python.org> parents: 8329 diff changeset	597 PyErr_SetString(PyExc_ValueError, "bad marshal data");
0e6fbbe3b63c When unmarshalling, add test for negative lengths on strings, tuples Guido van Rossum <guido@python.org> parents: 8329 diff changeset	598 return NULL;
0e6fbbe3b63c When unmarshalling, add test for negative lengths on strings, tuples Guido van Rossum <guido@python.org> parents: 8329 diff changeset	599 }
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	600 v = PyList_New((int)n);
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	601 if (v == NULL)
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	602 return v;
3234 aafe7d634985 Made a bit more robust against out-of-memory situations Jack Jansen <jack.jansen@cwi.nl> parents: 3012 diff changeset	603 for (i = 0; i < n; i++) {
aafe7d634985 Made a bit more robust against out-of-memory situations Jack Jansen <jack.jansen@cwi.nl> parents: 3012 diff changeset	604 v2 = r_object(p);
aafe7d634985 Made a bit more robust against out-of-memory situations Jack Jansen <jack.jansen@cwi.nl> parents: 3012 diff changeset	605 if ( v2 == NULL ) {
31824 331de8b9d1ed Marshal clean-up (SF patch #873224) Armin Rigo <arigo@tunes.org> parents: 30311 diff changeset	606 if (!PyErr_Occurred())
331de8b9d1ed Marshal clean-up (SF patch #873224) Armin Rigo <arigo@tunes.org> parents: 30311 diff changeset	607 PyErr_SetString(PyExc_TypeError,
331de8b9d1ed Marshal clean-up (SF patch #873224) Armin Rigo <arigo@tunes.org> parents: 30311 diff changeset	608 "NULL object in marshal data");
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	609 Py_DECREF(v);
3234 aafe7d634985 Made a bit more robust against out-of-memory situations Jack Jansen <jack.jansen@cwi.nl> parents: 3012 diff changeset	610 v = NULL;
aafe7d634985 Made a bit more robust against out-of-memory situations Jack Jansen <jack.jansen@cwi.nl> parents: 3012 diff changeset	611 break;
aafe7d634985 Made a bit more robust against out-of-memory situations Jack Jansen <jack.jansen@cwi.nl> parents: 3012 diff changeset	612 }
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	613 PyList_SetItem(v, (int)i, v2);
3234 aafe7d634985 Made a bit more robust against out-of-memory situations Jack Jansen <jack.jansen@cwi.nl> parents: 3012 diff changeset	614 }
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	615 return v;
16311 8c41f3861aad It's unclear whether PyMarshal_XXX() are part of the public or private API. Tim Peters <tim.peters@gmail.com> parents: 16257 diff changeset	616
279 9c924f9c3b16 Add marshalling for dictionaries. Guido van Rossum <guido@python.org> parents: 272 diff changeset	617 case TYPE_DICT:
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	618 v = PyDict_New();
279 9c924f9c3b16 Add marshalling for dictionaries. Guido van Rossum <guido@python.org> parents: 272 diff changeset	619 if (v == NULL)
9c924f9c3b16 Add marshalling for dictionaries. Guido van Rossum <guido@python.org> parents: 272 diff changeset	620 return NULL;
9c924f9c3b16 Add marshalling for dictionaries. Guido van Rossum <guido@python.org> parents: 272 diff changeset	621 for (;;) {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	622 PyObject key, val;
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	623 key = r_object(p);
279 9c924f9c3b16 Add marshalling for dictionaries. Guido van Rossum <guido@python.org> parents: 272 diff changeset	624 if (key == NULL)
31824 331de8b9d1ed Marshal clean-up (SF patch #873224) Armin Rigo <arigo@tunes.org> parents: 30311 diff changeset	625 break;
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	626 val = r_object(p);
3731 de1cb33219e3 Jeremy's patches for more robust handling of unmarshallable types. Guido van Rossum <guido@python.org> parents: 3620 diff changeset	627 if (val != NULL)
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	628 PyDict_SetItem(v, key, val);
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	629 Py_DECREF(key);
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	630 Py_XDECREF(val);
279 9c924f9c3b16 Add marshalling for dictionaries. Guido van Rossum <guido@python.org> parents: 272 diff changeset	631 }
31824 331de8b9d1ed Marshal clean-up (SF patch #873224) Armin Rigo <arigo@tunes.org> parents: 30311 diff changeset	632 if (PyErr_Occurred()) {
331de8b9d1ed Marshal clean-up (SF patch #873224) Armin Rigo <arigo@tunes.org> parents: 30311 diff changeset	633 Py_DECREF(v);
331de8b9d1ed Marshal clean-up (SF patch #873224) Armin Rigo <arigo@tunes.org> parents: 30311 diff changeset	634 v = NULL;
331de8b9d1ed Marshal clean-up (SF patch #873224) Armin Rigo <arigo@tunes.org> parents: 30311 diff changeset	635 }
279 9c924f9c3b16 Add marshalling for dictionaries. Guido van Rossum <guido@python.org> parents: 272 diff changeset	636 return v;
16311 8c41f3861aad It's unclear whether PyMarshal_XXX() are part of the public or private API. Tim Peters <tim.peters@gmail.com> parents: 16257 diff changeset	637
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	638 case TYPE_CODE:
19605 10bf4bed5096 fix for part of bug #453523: disable unmarshalling of code objects in Michael W. Hudson <mwh@python.net> parents: 19547 diff changeset	639 if (PyEval_GetRestricted()) {
10bf4bed5096 fix for part of bug #453523: disable unmarshalling of code objects in Michael W. Hudson <mwh@python.net> parents: 19547 diff changeset	640 PyErr_SetString(PyExc_RuntimeError,
10bf4bed5096 fix for part of bug #453523: disable unmarshalling of code objects in Michael W. Hudson <mwh@python.net> parents: 19547 diff changeset	641 "cannot unmarshal code objects in "
10bf4bed5096 fix for part of bug #453523: disable unmarshalling of code objects in Michael W. Hudson <mwh@python.net> parents: 19547 diff changeset	642 "restricted execution mode");
10bf4bed5096 fix for part of bug #453523: disable unmarshalling of code objects in Michael W. Hudson <mwh@python.net> parents: 19547 diff changeset	643 return NULL;
10bf4bed5096 fix for part of bug #453523: disable unmarshalling of code objects in Michael W. Hudson <mwh@python.net> parents: 19547 diff changeset	644 }
10bf4bed5096 fix for part of bug #453523: disable unmarshalling of code objects in Michael W. Hudson <mwh@python.net> parents: 19547 diff changeset	645 else {
23851 d6ae544acd24 Fix SF bug # 561858 Assertion with very long lists Neal Norwitz <nnorwitz@gmail.com> parents: 22785 diff changeset	646 int argcount = r_long(p);
d6ae544acd24 Fix SF bug # 561858 Assertion with very long lists Neal Norwitz <nnorwitz@gmail.com> parents: 22785 diff changeset	647 int nlocals = r_long(p);
d6ae544acd24 Fix SF bug # 561858 Assertion with very long lists Neal Norwitz <nnorwitz@gmail.com> parents: 22785 diff changeset	648 int stacksize = r_long(p);
d6ae544acd24 Fix SF bug # 561858 Assertion with very long lists Neal Norwitz <nnorwitz@gmail.com> parents: 22785 diff changeset	649 int flags = r_long(p);
31824 331de8b9d1ed Marshal clean-up (SF patch #873224) Armin Rigo <arigo@tunes.org> parents: 30311 diff changeset	650 PyObject *code = r_object(p);
331de8b9d1ed Marshal clean-up (SF patch #873224) Armin Rigo <arigo@tunes.org> parents: 30311 diff changeset	651 PyObject *consts = r_object(p);
331de8b9d1ed Marshal clean-up (SF patch #873224) Armin Rigo <arigo@tunes.org> parents: 30311 diff changeset	652 PyObject *names = r_object(p);
331de8b9d1ed Marshal clean-up (SF patch #873224) Armin Rigo <arigo@tunes.org> parents: 30311 diff changeset	653 PyObject *varnames = r_object(p);
331de8b9d1ed Marshal clean-up (SF patch #873224) Armin Rigo <arigo@tunes.org> parents: 30311 diff changeset	654 PyObject *freevars = r_object(p);
331de8b9d1ed Marshal clean-up (SF patch #873224) Armin Rigo <arigo@tunes.org> parents: 30311 diff changeset	655 PyObject *cellvars = r_object(p);
331de8b9d1ed Marshal clean-up (SF patch #873224) Armin Rigo <arigo@tunes.org> parents: 30311 diff changeset	656 PyObject *filename = r_object(p);
331de8b9d1ed Marshal clean-up (SF patch #873224) Armin Rigo <arigo@tunes.org> parents: 30311 diff changeset	657 PyObject *name = r_object(p);
331de8b9d1ed Marshal clean-up (SF patch #873224) Armin Rigo <arigo@tunes.org> parents: 30311 diff changeset	658 int firstlineno = r_long(p);
331de8b9d1ed Marshal clean-up (SF patch #873224) Armin Rigo <arigo@tunes.org> parents: 30311 diff changeset	659 PyObject *lnotab = r_object(p);
16311 8c41f3861aad It's unclear whether PyMarshal_XXX() are part of the public or private API. Tim Peters <tim.peters@gmail.com> parents: 16257 diff changeset	660
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	661 if (!PyErr_Occurred()) {
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	662 v = (PyObject *) PyCode_New(
16311 8c41f3861aad It's unclear whether PyMarshal_XXX() are part of the public or private API. Tim Peters <tim.peters@gmail.com> parents: 16257 diff changeset	663 argcount, nlocals, stacksize, flags,
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2503 diff changeset	664 code, consts, names, varnames,
16311 8c41f3861aad It's unclear whether PyMarshal_XXX() are part of the public or private API. Tim Peters <tim.peters@gmail.com> parents: 16257 diff changeset	665 freevars, cellvars, filename, name,
8c41f3861aad It's unclear whether PyMarshal_XXX() are part of the public or private API. Tim Peters <tim.peters@gmail.com> parents: 16257 diff changeset	666 firstlineno, lnotab);
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	667 }
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	668 else
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	669 v = NULL;
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	670 Py_XDECREF(code);
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	671 Py_XDECREF(consts);
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	672 Py_XDECREF(names);
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	673 Py_XDECREF(varnames);
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 15979 diff changeset	674 Py_XDECREF(freevars);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 15979 diff changeset	675 Py_XDECREF(cellvars);
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	676 Py_XDECREF(filename);
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	677 Py_XDECREF(name);
5905 c2423843a26f Plugged a leak. (The same as the one plugged in compile.c -- forgot Guido van Rossum <guido@python.org> parents: 5608 diff changeset	678 Py_XDECREF(lnotab);
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	679
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	680 }
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	681 return v;
16311 8c41f3861aad It's unclear whether PyMarshal_XXX() are part of the public or private API. Tim Peters <tim.peters@gmail.com> parents: 16257 diff changeset	682
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	683 default:
3731 de1cb33219e3 Jeremy's patches for more robust handling of unmarshallable types. Guido van Rossum <guido@python.org> parents: 3620 diff changeset	684 /* Bogus data got written, which isn't ideal.
de1cb33219e3 Jeremy's patches for more robust handling of unmarshallable types. Guido van Rossum <guido@python.org> parents: 3620 diff changeset	685 This will let you keep working and recover. */
8465 0e6fbbe3b63c When unmarshalling, add test for negative lengths on strings, tuples Guido van Rossum <guido@python.org> parents: 8329 diff changeset	686 PyErr_SetString(PyExc_ValueError, "bad marshal data");
0e6fbbe3b63c When unmarshalling, add test for negative lengths on strings, tuples Guido van Rossum <guido@python.org> parents: 8329 diff changeset	687 return NULL;
16311 8c41f3861aad It's unclear whether PyMarshal_XXX() are part of the public or private API. Tim Peters <tim.peters@gmail.com> parents: 16257 diff changeset	688
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	689 }
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	690 }
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	691
32343 54b257e55f99 Make private function static Neal Norwitz <nnorwitz@gmail.com> parents: 32305 diff changeset	692 static PyObject *
31824 331de8b9d1ed Marshal clean-up (SF patch #873224) Armin Rigo <arigo@tunes.org> parents: 30311 diff changeset	693 read_object(RFILE *p)
331de8b9d1ed Marshal clean-up (SF patch #873224) Armin Rigo <arigo@tunes.org> parents: 30311 diff changeset	694 {
331de8b9d1ed Marshal clean-up (SF patch #873224) Armin Rigo <arigo@tunes.org> parents: 30311 diff changeset	695 PyObject *v;
331de8b9d1ed Marshal clean-up (SF patch #873224) Armin Rigo <arigo@tunes.org> parents: 30311 diff changeset	696 if (PyErr_Occurred()) {
331de8b9d1ed Marshal clean-up (SF patch #873224) Armin Rigo <arigo@tunes.org> parents: 30311 diff changeset	697 fprintf(stderr, "XXX readobject called with exception set\n");
331de8b9d1ed Marshal clean-up (SF patch #873224) Armin Rigo <arigo@tunes.org> parents: 30311 diff changeset	698 return NULL;
331de8b9d1ed Marshal clean-up (SF patch #873224) Armin Rigo <arigo@tunes.org> parents: 30311 diff changeset	699 }
331de8b9d1ed Marshal clean-up (SF patch #873224) Armin Rigo <arigo@tunes.org> parents: 30311 diff changeset	700 v = r_object(p);
331de8b9d1ed Marshal clean-up (SF patch #873224) Armin Rigo <arigo@tunes.org> parents: 30311 diff changeset	701 if (v == NULL && !PyErr_Occurred())
331de8b9d1ed Marshal clean-up (SF patch #873224) Armin Rigo <arigo@tunes.org> parents: 30311 diff changeset	702 PyErr_SetString(PyExc_TypeError, "NULL object in marshal data");
331de8b9d1ed Marshal clean-up (SF patch #873224) Armin Rigo <arigo@tunes.org> parents: 30311 diff changeset	703 return v;
331de8b9d1ed Marshal clean-up (SF patch #873224) Armin Rigo <arigo@tunes.org> parents: 30311 diff changeset	704 }
331de8b9d1ed Marshal clean-up (SF patch #873224) Armin Rigo <arigo@tunes.org> parents: 30311 diff changeset	705
20552 65dd6157f999 SF patch #470393 (Jim Ahlstrom): Add missing marshal function Guido van Rossum <guido@python.org> parents: 19605 diff changeset	706 int
65dd6157f999 SF patch #470393 (Jim Ahlstrom): Add missing marshal function Guido van Rossum <guido@python.org> parents: 19605 diff changeset	707 PyMarshal_ReadShortFromFile(FILE *fp)
65dd6157f999 SF patch #470393 (Jim Ahlstrom): Add missing marshal function Guido van Rossum <guido@python.org> parents: 19605 diff changeset	708 {
65dd6157f999 SF patch #470393 (Jim Ahlstrom): Add missing marshal function Guido van Rossum <guido@python.org> parents: 19605 diff changeset	709 RFILE rf;
65dd6157f999 SF patch #470393 (Jim Ahlstrom): Add missing marshal function Guido van Rossum <guido@python.org> parents: 19605 diff changeset	710 rf.fp = fp;
32422 3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	711 rf.strings = NULL;
20552 65dd6157f999 SF patch #470393 (Jim Ahlstrom): Add missing marshal function Guido van Rossum <guido@python.org> parents: 19605 diff changeset	712 return r_short(&rf);
65dd6157f999 SF patch #470393 (Jim Ahlstrom): Add missing marshal function Guido van Rossum <guido@python.org> parents: 19605 diff changeset	713 }
65dd6157f999 SF patch #470393 (Jim Ahlstrom): Add missing marshal function Guido van Rossum <guido@python.org> parents: 19605 diff changeset	714
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	715 long
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13447 diff changeset	716 PyMarshal_ReadLongFromFile(FILE *fp)
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	717 {
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	718 RFILE rf;
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	719 rf.fp = fp;
32422 3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	720 rf.strings = NULL;
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	721 return r_long(&rf);
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	722 }
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	723
15979 a36a4932e399 Variant of SF patch 103252: Startup optimize: read .pyc as string, not with getc(). Tim Peters <tim.peters@gmail.com>* parents: 15408 diff changeset	724 #ifdef HAVE_FSTAT
a36a4932e399 Variant of SF patch 103252: Startup optimize: read .pyc as string, not with getc(). Tim Peters <tim.peters@gmail.com>* parents: 15408 diff changeset	725 /* Return size of file in bytes; < 0 if unknown. */
a36a4932e399 Variant of SF patch 103252: Startup optimize: read .pyc as string, not with getc(). Tim Peters <tim.peters@gmail.com>* parents: 15408 diff changeset	726 static off_t
a36a4932e399 Variant of SF patch 103252: Startup optimize: read .pyc as string, not with getc(). Tim Peters <tim.peters@gmail.com>* parents: 15408 diff changeset	727 getfilesize(FILE *fp)
a36a4932e399 Variant of SF patch 103252: Startup optimize: read .pyc as string, not with getc(). Tim Peters <tim.peters@gmail.com>* parents: 15408 diff changeset	728 {
a36a4932e399 Variant of SF patch 103252: Startup optimize: read .pyc as string, not with getc(). Tim Peters <tim.peters@gmail.com>* parents: 15408 diff changeset	729 struct stat st;
a36a4932e399 Variant of SF patch 103252: Startup optimize: read .pyc as string, not with getc(). Tim Peters <tim.peters@gmail.com>* parents: 15408 diff changeset	730 if (fstat(fileno(fp), &st) != 0)
a36a4932e399 Variant of SF patch 103252: Startup optimize: read .pyc as string, not with getc(). Tim Peters <tim.peters@gmail.com>* parents: 15408 diff changeset	731 return -1;
a36a4932e399 Variant of SF patch 103252: Startup optimize: read .pyc as string, not with getc(). Tim Peters <tim.peters@gmail.com>* parents: 15408 diff changeset	732 else
a36a4932e399 Variant of SF patch 103252: Startup optimize: read .pyc as string, not with getc(). Tim Peters <tim.peters@gmail.com>* parents: 15408 diff changeset	733 return st.st_size;
a36a4932e399 Variant of SF patch 103252: Startup optimize: read .pyc as string, not with getc(). Tim Peters <tim.peters@gmail.com>* parents: 15408 diff changeset	734 }
a36a4932e399 Variant of SF patch 103252: Startup optimize: read .pyc as string, not with getc(). Tim Peters <tim.peters@gmail.com>* parents: 15408 diff changeset	735 #endif
16311 8c41f3861aad It's unclear whether PyMarshal_XXX() are part of the public or private API. Tim Peters <tim.peters@gmail.com> parents: 16257 diff changeset	736
15979 a36a4932e399 Variant of SF patch 103252: Startup optimize: read .pyc as string, not with getc(). Tim Peters <tim.peters@gmail.com>* parents: 15408 diff changeset	737 /* If we can get the size of the file up-front, and it's reasonably small,
a36a4932e399 Variant of SF patch 103252: Startup optimize: read .pyc as string, not with getc(). Tim Peters <tim.peters@gmail.com>* parents: 15408 diff changeset	738 * read it in one gulp and delegate to ...FromString() instead. Much quicker
a36a4932e399 Variant of SF patch 103252: Startup optimize: read .pyc as string, not with getc(). Tim Peters <tim.peters@gmail.com>* parents: 15408 diff changeset	739 * than reading a byte at a time from file; speeds .pyc imports.
16311 8c41f3861aad It's unclear whether PyMarshal_XXX() are part of the public or private API. Tim Peters <tim.peters@gmail.com> parents: 16257 diff changeset	740 * CAUTION: since this may read the entire remainder of the file, don't
8c41f3861aad It's unclear whether PyMarshal_XXX() are part of the public or private API. Tim Peters <tim.peters@gmail.com> parents: 16257 diff changeset	741 * call it unless you know you're done with the file.
15979 a36a4932e399 Variant of SF patch 103252: Startup optimize: read .pyc as string, not with getc(). Tim Peters <tim.peters@gmail.com>* parents: 15408 diff changeset	742 */
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	743 PyObject *
16311 8c41f3861aad It's unclear whether PyMarshal_XXX() are part of the public or private API. Tim Peters <tim.peters@gmail.com> parents: 16257 diff changeset	744 PyMarshal_ReadLastObjectFromFile(FILE *fp)
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	745 {
15979 a36a4932e399 Variant of SF patch 103252: Startup optimize: read .pyc as string, not with getc(). Tim Peters <tim.peters@gmail.com>* parents: 15408 diff changeset	746 /* 75% of 2.1's .pyc files can exploit SMALL_FILE_LIMIT.
a36a4932e399 Variant of SF patch 103252: Startup optimize: read .pyc as string, not with getc(). Tim Peters <tim.peters@gmail.com>* parents: 15408 diff changeset	747 * REASONABLE_FILE_LIMIT is by defn something big enough for Tkinter.pyc.
a36a4932e399 Variant of SF patch 103252: Startup optimize: read .pyc as string, not with getc(). Tim Peters <tim.peters@gmail.com>* parents: 15408 diff changeset	748 */
a36a4932e399 Variant of SF patch 103252: Startup optimize: read .pyc as string, not with getc(). Tim Peters <tim.peters@gmail.com>* parents: 15408 diff changeset	749 #define SMALL_FILE_LIMIT (1L << 14)
a36a4932e399 Variant of SF patch 103252: Startup optimize: read .pyc as string, not with getc(). Tim Peters <tim.peters@gmail.com>* parents: 15408 diff changeset	750 #define REASONABLE_FILE_LIMIT (1L << 18)
a36a4932e399 Variant of SF patch 103252: Startup optimize: read .pyc as string, not with getc(). Tim Peters <tim.peters@gmail.com>* parents: 15408 diff changeset	751 #ifdef HAVE_FSTAT
a36a4932e399 Variant of SF patch 103252: Startup optimize: read .pyc as string, not with getc(). Tim Peters <tim.peters@gmail.com>* parents: 15408 diff changeset	752 off_t filesize;
a36a4932e399 Variant of SF patch 103252: Startup optimize: read .pyc as string, not with getc(). Tim Peters <tim.peters@gmail.com>* parents: 15408 diff changeset	753 #endif
a36a4932e399 Variant of SF patch 103252: Startup optimize: read .pyc as string, not with getc(). Tim Peters <tim.peters@gmail.com>* parents: 15408 diff changeset	754 #ifdef HAVE_FSTAT
a36a4932e399 Variant of SF patch 103252: Startup optimize: read .pyc as string, not with getc(). Tim Peters <tim.peters@gmail.com>* parents: 15408 diff changeset	755 filesize = getfilesize(fp);
a36a4932e399 Variant of SF patch 103252: Startup optimize: read .pyc as string, not with getc(). Tim Peters <tim.peters@gmail.com>* parents: 15408 diff changeset	756 if (filesize > 0) {
a36a4932e399 Variant of SF patch 103252: Startup optimize: read .pyc as string, not with getc(). Tim Peters <tim.peters@gmail.com>* parents: 15408 diff changeset	757 char buf[SMALL_FILE_LIMIT];
a36a4932e399 Variant of SF patch 103252: Startup optimize: read .pyc as string, not with getc(). Tim Peters <tim.peters@gmail.com>* parents: 15408 diff changeset	758 char* pBuf = NULL;
a36a4932e399 Variant of SF patch 103252: Startup optimize: read .pyc as string, not with getc(). Tim Peters <tim.peters@gmail.com>* parents: 15408 diff changeset	759 if (filesize <= SMALL_FILE_LIMIT)
a36a4932e399 Variant of SF patch 103252: Startup optimize: read .pyc as string, not with getc(). Tim Peters <tim.peters@gmail.com>* parents: 15408 diff changeset	760 pBuf = buf;
a36a4932e399 Variant of SF patch 103252: Startup optimize: read .pyc as string, not with getc(). Tim Peters <tim.peters@gmail.com>* parents: 15408 diff changeset	761 else if (filesize <= REASONABLE_FILE_LIMIT)
a36a4932e399 Variant of SF patch 103252: Startup optimize: read .pyc as string, not with getc(). Tim Peters <tim.peters@gmail.com>* parents: 15408 diff changeset	762 pBuf = (char *)PyMem_MALLOC(filesize);
a36a4932e399 Variant of SF patch 103252: Startup optimize: read .pyc as string, not with getc(). Tim Peters <tim.peters@gmail.com>* parents: 15408 diff changeset	763 if (pBuf != NULL) {
a36a4932e399 Variant of SF patch 103252: Startup optimize: read .pyc as string, not with getc(). Tim Peters <tim.peters@gmail.com>* parents: 15408 diff changeset	764 PyObject* v;
a36a4932e399 Variant of SF patch 103252: Startup optimize: read .pyc as string, not with getc(). Tim Peters <tim.peters@gmail.com>* parents: 15408 diff changeset	765 size_t n = fread(pBuf, 1, filesize, fp);
a36a4932e399 Variant of SF patch 103252: Startup optimize: read .pyc as string, not with getc(). Tim Peters <tim.peters@gmail.com>* parents: 15408 diff changeset	766 v = PyMarshal_ReadObjectFromString(pBuf, n);
a36a4932e399 Variant of SF patch 103252: Startup optimize: read .pyc as string, not with getc(). Tim Peters <tim.peters@gmail.com>* parents: 15408 diff changeset	767 if (pBuf != buf)
a36a4932e399 Variant of SF patch 103252: Startup optimize: read .pyc as string, not with getc(). Tim Peters <tim.peters@gmail.com>* parents: 15408 diff changeset	768 PyMem_FREE(pBuf);
a36a4932e399 Variant of SF patch 103252: Startup optimize: read .pyc as string, not with getc(). Tim Peters <tim.peters@gmail.com>* parents: 15408 diff changeset	769 return v;
a36a4932e399 Variant of SF patch 103252: Startup optimize: read .pyc as string, not with getc(). Tim Peters <tim.peters@gmail.com>* parents: 15408 diff changeset	770 }
16311 8c41f3861aad It's unclear whether PyMarshal_XXX() are part of the public or private API. Tim Peters <tim.peters@gmail.com> parents: 16257 diff changeset	771
15979 a36a4932e399 Variant of SF patch 103252: Startup optimize: read .pyc as string, not with getc(). Tim Peters <tim.peters@gmail.com>* parents: 15408 diff changeset	772 }
a36a4932e399 Variant of SF patch 103252: Startup optimize: read .pyc as string, not with getc(). Tim Peters <tim.peters@gmail.com>* parents: 15408 diff changeset	773 #endif
16311 8c41f3861aad It's unclear whether PyMarshal_XXX() are part of the public or private API. Tim Peters <tim.peters@gmail.com> parents: 16257 diff changeset	774 /* We don't have fstat, or we do but the file is larger than
8c41f3861aad It's unclear whether PyMarshal_XXX() are part of the public or private API. Tim Peters <tim.peters@gmail.com> parents: 16257 diff changeset	775 * REASONABLE_FILE_LIMIT or malloc failed -- read a byte at a time.
8c41f3861aad It's unclear whether PyMarshal_XXX() are part of the public or private API. Tim Peters <tim.peters@gmail.com> parents: 16257 diff changeset	776 */
8c41f3861aad It's unclear whether PyMarshal_XXX() are part of the public or private API. Tim Peters <tim.peters@gmail.com> parents: 16257 diff changeset	777 return PyMarshal_ReadObjectFromFile(fp);
8c41f3861aad It's unclear whether PyMarshal_XXX() are part of the public or private API. Tim Peters <tim.peters@gmail.com> parents: 16257 diff changeset	778
8c41f3861aad It's unclear whether PyMarshal_XXX() are part of the public or private API. Tim Peters <tim.peters@gmail.com> parents: 16257 diff changeset	779 #undef SMALL_FILE_LIMIT
8c41f3861aad It's unclear whether PyMarshal_XXX() are part of the public or private API. Tim Peters <tim.peters@gmail.com> parents: 16257 diff changeset	780 #undef REASONABLE_FILE_LIMIT
8c41f3861aad It's unclear whether PyMarshal_XXX() are part of the public or private API. Tim Peters <tim.peters@gmail.com> parents: 16257 diff changeset	781 }
8c41f3861aad It's unclear whether PyMarshal_XXX() are part of the public or private API. Tim Peters <tim.peters@gmail.com> parents: 16257 diff changeset	782
8c41f3861aad It's unclear whether PyMarshal_XXX() are part of the public or private API. Tim Peters <tim.peters@gmail.com> parents: 16257 diff changeset	783 PyObject *
8c41f3861aad It's unclear whether PyMarshal_XXX() are part of the public or private API. Tim Peters <tim.peters@gmail.com> parents: 16257 diff changeset	784 PyMarshal_ReadObjectFromFile(FILE *fp)
8c41f3861aad It's unclear whether PyMarshal_XXX() are part of the public or private API. Tim Peters <tim.peters@gmail.com> parents: 16257 diff changeset	785 {
8c41f3861aad It's unclear whether PyMarshal_XXX() are part of the public or private API. Tim Peters <tim.peters@gmail.com> parents: 16257 diff changeset	786 RFILE rf;
32422 3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	787 PyObject *result;
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	788 rf.fp = fp;
32422 3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	789 rf.strings = PyList_New(0);
3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	790 result = r_object(&rf);
3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	791 Py_DECREF(rf.strings);
3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	792 return result;
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	793 }
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	794
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	795 PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13447 diff changeset	796 PyMarshal_ReadObjectFromString(char *str, int len)
1270 14369a5e6167 Support for frozen scripts; added -i option. Guido van Rossum <guido@python.org> parents: 1257 diff changeset	797 {
14369a5e6167 Support for frozen scripts; added -i option. Guido van Rossum <guido@python.org> parents: 1257 diff changeset	798 RFILE rf;
32422 3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	799 PyObject *result;
1270 14369a5e6167 Support for frozen scripts; added -i option. Guido van Rossum <guido@python.org> parents: 1257 diff changeset	800 rf.fp = NULL;
14369a5e6167 Support for frozen scripts; added -i option. Guido van Rossum <guido@python.org> parents: 1257 diff changeset	801 rf.ptr = str;
14369a5e6167 Support for frozen scripts; added -i option. Guido van Rossum <guido@python.org> parents: 1257 diff changeset	802 rf.end = str + len;
32422 3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	803 rf.strings = PyList_New(0);
3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	804 result = r_object(&rf);
3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	805 Py_DECREF(rf.strings);
3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	806 return result;
1270 14369a5e6167 Support for frozen scripts; added -i option. Guido van Rossum <guido@python.org> parents: 1257 diff changeset	807 }
14369a5e6167 Support for frozen scripts; added -i option. Guido van Rossum <guido@python.org> parents: 1257 diff changeset	808
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	809 PyObject *
32422 3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	810 PyMarshal_WriteObjectToString(PyObject *x, int version)
4039 23f280ab5409 Added PyMarshal_WriteObjectToString() (moved the relevant code there Guido van Rossum <guido@python.org>* parents: 3839 diff changeset	811 {
23f280ab5409 Added PyMarshal_WriteObjectToString() (moved the relevant code there Guido van Rossum <guido@python.org>* parents: 3839 diff changeset	812 WFILE wf;
23f280ab5409 Added PyMarshal_WriteObjectToString() (moved the relevant code there Guido van Rossum <guido@python.org>* parents: 3839 diff changeset	813 wf.fp = NULL;
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	814 wf.str = PyString_FromStringAndSize((char *)NULL, 50);
4039 23f280ab5409 Added PyMarshal_WriteObjectToString() (moved the relevant code there Guido van Rossum <guido@python.org>* parents: 3839 diff changeset	815 if (wf.str == NULL)
23f280ab5409 Added PyMarshal_WriteObjectToString() (moved the relevant code there Guido van Rossum <guido@python.org>* parents: 3839 diff changeset	816 return NULL;
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	817 wf.ptr = PyString_AS_STRING((PyStringObject *)wf.str);
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	818 wf.end = wf.ptr + PyString_Size(wf.str);
4039 23f280ab5409 Added PyMarshal_WriteObjectToString() (moved the relevant code there Guido van Rossum <guido@python.org>* parents: 3839 diff changeset	819 wf.error = 0;
13070 7392e71f6cce Michael Hudson <mwh21@cam.ac.uk>: Fred Drake <fdrake@acm.org> parents: 12576 diff changeset	820 wf.depth = 0;
32422 3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	821 wf.strings = (version > 0) ? PyDict_New() : NULL;
4039 23f280ab5409 Added PyMarshal_WriteObjectToString() (moved the relevant code there Guido van Rossum <guido@python.org>* parents: 3839 diff changeset	822 w_object(x, &wf);
32422 3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	823 Py_XDECREF(wf.strings);
4039 23f280ab5409 Added PyMarshal_WriteObjectToString() (moved the relevant code there Guido van Rossum <guido@python.org>* parents: 3839 diff changeset	824 if (wf.str != NULL)
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	825 _PyString_Resize(&wf.str,
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	826 (int) (wf.ptr -
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	827 PyString_AS_STRING((PyStringObject *)wf.str)));
4039 23f280ab5409 Added PyMarshal_WriteObjectToString() (moved the relevant code there Guido van Rossum <guido@python.org>* parents: 3839 diff changeset	828 if (wf.error) {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	829 Py_XDECREF(wf.str);
16311 8c41f3861aad It's unclear whether PyMarshal_XXX() are part of the public or private API. Tim Peters <tim.peters@gmail.com> parents: 16257 diff changeset	830 PyErr_SetString(PyExc_ValueError,
13070 7392e71f6cce Michael Hudson <mwh21@cam.ac.uk>: Fred Drake <fdrake@acm.org> parents: 12576 diff changeset	831 (wf.error==1)?"unmarshallable object"
7392e71f6cce Michael Hudson <mwh21@cam.ac.uk>: Fred Drake <fdrake@acm.org> parents: 12576 diff changeset	832 :"object too deeply nested to marshal");
4039 23f280ab5409 Added PyMarshal_WriteObjectToString() (moved the relevant code there Guido van Rossum <guido@python.org>* parents: 3839 diff changeset	833 return NULL;
23f280ab5409 Added PyMarshal_WriteObjectToString() (moved the relevant code there Guido van Rossum <guido@python.org>* parents: 3839 diff changeset	834 }
23f280ab5409 Added PyMarshal_WriteObjectToString() (moved the relevant code there Guido van Rossum <guido@python.org>* parents: 3839 diff changeset	835 return wf.str;
23f280ab5409 Added PyMarshal_WriteObjectToString() (moved the relevant code there Guido van Rossum <guido@python.org>* parents: 3839 diff changeset	836 }
23f280ab5409 Added PyMarshal_WriteObjectToString() (moved the relevant code there Guido van Rossum <guido@python.org>* parents: 3839 diff changeset	837
279 9c924f9c3b16 Add marshalling for dictionaries. Guido van Rossum <guido@python.org> parents: 272 diff changeset	838 /* And an interface for Python programs... */
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	839
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	840 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13447 diff changeset	841 marshal_dump(PyObject self, PyObject args)
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	842 {
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	843 WFILE wf;
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	844 PyObject *x;
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	845 PyObject *f;
32422 3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	846 int version = Py_MARSHAL_VERSION;
3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	847 if (!PyArg_ParseTuple(args, "OO\|i:dump", &x, &f, &version))
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	848 return NULL;
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	849 if (!PyFile_Check(f)) {
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	850 PyErr_SetString(PyExc_TypeError,
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	851 "marshal.dump() 2nd arg must be file");
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	852 return NULL;
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	853 }
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	854 wf.fp = PyFile_AsFile(f);
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	855 wf.str = NULL;
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	856 wf.ptr = wf.end = NULL;
3731 de1cb33219e3 Jeremy's patches for more robust handling of unmarshallable types. Guido van Rossum <guido@python.org> parents: 3620 diff changeset	857 wf.error = 0;
13070 7392e71f6cce Michael Hudson <mwh21@cam.ac.uk>: Fred Drake <fdrake@acm.org> parents: 12576 diff changeset	858 wf.depth = 0;
32422 3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	859 wf.strings = (version > 0) ? PyDict_New() : 0;
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	860 w_object(x, &wf);
32422 3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	861 Py_XDECREF(wf.strings);
3731 de1cb33219e3 Jeremy's patches for more robust handling of unmarshallable types. Guido van Rossum <guido@python.org> parents: 3620 diff changeset	862 if (wf.error) {
16311 8c41f3861aad It's unclear whether PyMarshal_XXX() are part of the public or private API. Tim Peters <tim.peters@gmail.com> parents: 16257 diff changeset	863 PyErr_SetString(PyExc_ValueError,
13070 7392e71f6cce Michael Hudson <mwh21@cam.ac.uk>: Fred Drake <fdrake@acm.org> parents: 12576 diff changeset	864 (wf.error==1)?"unmarshallable object"
7392e71f6cce Michael Hudson <mwh21@cam.ac.uk>: Fred Drake <fdrake@acm.org> parents: 12576 diff changeset	865 :"object too deeply nested to marshal");
3731 de1cb33219e3 Jeremy's patches for more robust handling of unmarshallable types. Guido van Rossum <guido@python.org> parents: 3620 diff changeset	866 return NULL;
de1cb33219e3 Jeremy's patches for more robust handling of unmarshallable types. Guido van Rossum <guido@python.org> parents: 3620 diff changeset	867 }
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	868 Py_INCREF(Py_None);
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	869 return Py_None;
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	870 }
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	871
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	872 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13447 diff changeset	873 marshal_load(PyObject self, PyObject args)
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	874 {
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	875 RFILE rf;
32422 3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	876 PyObject f, result;
12135 667878776933 Use modern PyArg_ParseTuple style, with function names. Guido van Rossum <guido@python.org> parents: 11976 diff changeset	877 if (!PyArg_ParseTuple(args, "O:load", &f))
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	878 return NULL;
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	879 if (!PyFile_Check(f)) {
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	880 PyErr_SetString(PyExc_TypeError,
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	881 "marshal.load() arg must be file");
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	882 return NULL;
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	883 }
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	884 rf.fp = PyFile_AsFile(f);
32422 3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	885 rf.strings = PyList_New(0);
3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	886 result = read_object(&rf);
3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	887 Py_DECREF(rf.strings);
3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	888 return result;
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	889 }
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	890
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	891 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13447 diff changeset	892 marshal_dumps(PyObject self, PyObject args)
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	893 {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	894 PyObject *x;
32422 3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	895 int version = Py_MARSHAL_VERSION;
3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	896 if (!PyArg_ParseTuple(args, "O\|i:dumps", &x, version))
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	897 return NULL;
32422 3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	898 return PyMarshal_WriteObjectToString(x, version);
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	899 }
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	900
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	901 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13447 diff changeset	902 marshal_loads(PyObject self, PyObject args)
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	903 {
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	904 RFILE rf;
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	905 char *s;
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	906 int n;
32422 3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	907 PyObject* result;
3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	908 if (!PyArg_ParseTuple(args, "s#\|i:loads", &s, &n))
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	909 return NULL;
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	910 rf.fp = NULL;
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	911 rf.ptr = s;
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	912 rf.end = s + n;
32422 3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	913 rf.strings = PyList_New(0);
3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	914 result = read_object(&rf);
3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	915 Py_DECREF(rf.strings);
3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	916 return result;
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	917 }
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	918
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	919 static PyMethodDef marshal_methods[] = {
22705 8703d2052339 Use symbolic METH_VARARGS instead of 1 for ml_flags Neal Norwitz <nnorwitz@gmail.com> parents: 20947 diff changeset	920 {"dump", marshal_dump, METH_VARARGS},
8703d2052339 Use symbolic METH_VARARGS instead of 1 for ml_flags Neal Norwitz <nnorwitz@gmail.com> parents: 20947 diff changeset	921 {"load", marshal_load, METH_VARARGS},
8703d2052339 Use symbolic METH_VARARGS instead of 1 for ml_flags Neal Norwitz <nnorwitz@gmail.com> parents: 20947 diff changeset	922 {"dumps", marshal_dumps, METH_VARARGS},
8703d2052339 Use symbolic METH_VARARGS instead of 1 for ml_flags Neal Norwitz <nnorwitz@gmail.com> parents: 20947 diff changeset	923 {"loads", marshal_loads, METH_VARARGS},
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	924 {NULL, NULL} /* sentinel */
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	925 };
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	926
30311 f003e48f562d Bug #794140: cygwin builds do not embed Jason Tishler <jason@tishler.net> parents: 24435 diff changeset	927 PyMODINIT_FUNC
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13447 diff changeset	928 PyMarshal_Init(void)
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	929 {
32422 3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	930 PyObject *mod = Py_InitModule("marshal", marshal_methods);
3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	931 PyModule_AddIntConstant(mod, "version", Py_MARSHAL_VERSION);
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	932 }

Mercurial > cpython-lru_cache-weakref

annotate Python/marshal.c @ 33579:8a5c87f685cd legacy-trunk