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

annotate Python/marshal.c @ 53207:fe99a562b708

Silence compiler warnings on VS8.0

author	Mark Dickinson <dickinsm@gmail.com>
date	Fri, 17 Apr 2009 19:29:46 +0000
parents	973f4d7aa87c
children	ed3f51f2abfb

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
36792 688795873ff1 Make Py_ssize_t clean. Thomas Wouters <thomas@python.org> parents: 36784 diff changeset	7 #define PY_SSIZE_T_CLEAN
688795873ff1 Make Py_ssize_t clean. Thomas Wouters <thomas@python.org> parents: 36784 diff changeset	8
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	9 #include "Python.h"
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	10 #include "longintrepr.h"
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35346 diff changeset	11 #include "code.h"
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	12 #include "marshal.h"
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	13
52215 bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	14 #define ABS(x) ((x) < 0 ? -(x) : (x))
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	15
13070 7392e71f6cce Michael Hudson <mwh21@cam.ac.uk>: Fred Drake <fdrake@acm.org> parents: 12576 diff changeset	16 /* 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	17 * 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	18 * raise an exception instead of continuing.
43007 5fde5d6964d7 [Oops, I forgot half of the patch.] Guido van Rossum <guido@python.org> parents: 42665 diff changeset	19 * On Windows debug builds, reduce this value.
13070 7392e71f6cce Michael Hudson <mwh21@cam.ac.uk>: Fred Drake <fdrake@acm.org> parents: 12576 diff changeset	20 */
43007 5fde5d6964d7 [Oops, I forgot half of the patch.] Guido van Rossum <guido@python.org> parents: 42665 diff changeset	21 #if defined(MS_WINDOWS) && defined(_DEBUG)
5fde5d6964d7 [Oops, I forgot half of the patch.] Guido van Rossum <guido@python.org> parents: 42665 diff changeset	22 #define MAX_MARSHAL_STACK_DEPTH 1500
5fde5d6964d7 [Oops, I forgot half of the patch.] Guido van Rossum <guido@python.org> parents: 42665 diff changeset	23 #else
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	24 #define MAX_MARSHAL_STACK_DEPTH 2000
43007 5fde5d6964d7 [Oops, I forgot half of the patch.] Guido van Rossum <guido@python.org> parents: 42665 diff changeset	25 #endif
13070 7392e71f6cce Michael Hudson <mwh21@cam.ac.uk>: Fred Drake <fdrake@acm.org> parents: 12576 diff changeset	26
35008 44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	27 #define TYPE_NULL '0'
44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	28 #define TYPE_NONE 'N'
44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	29 #define TYPE_FALSE 'F'
44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	30 #define TYPE_TRUE 'T'
44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	31 #define TYPE_STOPITER 'S'
44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	32 #define TYPE_ELLIPSIS '.'
44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	33 #define TYPE_INT 'i'
44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	34 #define TYPE_INT64 'I'
44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	35 #define TYPE_FLOAT 'f'
44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	36 #define TYPE_BINARY_FLOAT 'g'
44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	37 #define TYPE_COMPLEX 'x'
44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	38 #define TYPE_BINARY_COMPLEX 'y'
44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	39 #define TYPE_LONG 'l'
44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	40 #define TYPE_STRING 's'
44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	41 #define TYPE_TUPLE '('
44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	42 #define TYPE_LIST '['
44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	43 #define TYPE_DICT '{'
44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	44 #define TYPE_CODE 'c'
44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	45 #define TYPE_UNICODE 'u'
44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	46 #define TYPE_UNKNOWN '?'
44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	47 #define TYPE_SET '<'
44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	48 #define TYPE_FROZENSET '>'
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	49
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	50 typedef struct {
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	51 FILE *fp;
3731 de1cb33219e3 Jeremy's patches for more robust handling of unmarshallable types. Guido van Rossum <guido@python.org> parents: 3620 diff changeset	52 int error;
13070 7392e71f6cce Michael Hudson <mwh21@cam.ac.uk>: Fred Drake <fdrake@acm.org> parents: 12576 diff changeset	53 int depth;
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	54 /* 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	55 PyObject *str;
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	56 char *ptr;
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	57 char *end;
32422 3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	58 PyObject strings; / dict on marshal, list on unmarshal */
35008 44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	59 int version;
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	60 } WFILE;
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	61
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	62 #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	63 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	64 else w_more(c, p)
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	65
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	66 static void
13672 bfc5b2a8c11f -- changed w_more to take an integer instead of a char Fredrik Lundh <fredrik@pythonware.com> parents: 13658 diff changeset	67 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	68 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	69 Py_ssize_t size, newsize;
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	70 if (p->str == NULL)
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	71 return; /* An error already occurred */
47301 23ab586c427a Renamed PyString to PyBytes Christian Heimes <christian@cheimes.de> parents: 47300 diff changeset	72 size = PyBytes_Size(p->str);
47067 960ade856078 Merged revisions 62998-63003,63005-63006,63009-63012,63014-63017,63019-63020,63022-63024,63026-63029,63031-63041,63043-63045,63047-63054,63056-63062 via svnmerge from Alexandre Vassalotti <alexandre@peadrop.com> parents: 45082 diff changeset	73 newsize = size + size + 1024;
960ade856078 Merged revisions 62998-63003,63005-63006,63009-63012,63014-63017,63019-63020,63022-63024,63026-63029,63031-63041,63043-63045,63047-63054,63056-63062 via svnmerge from Alexandre Vassalotti <alexandre@peadrop.com> parents: 45082 diff changeset	74 if (newsize > 3210241024) {
48321 f6726f32ef70 Merged revisions 64119,64147,64150,64165,64219-64221,64229-64230,64233,64235,64253,64278,64280,64301,64303,64320,64328,64338-64339 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47580 diff changeset	75 newsize = size + (size >> 3); /* 12.5% overallocation */
47067 960ade856078 Merged revisions 62998-63003,63005-63006,63009-63012,63014-63017,63019-63020,63022-63024,63026-63029,63031-63041,63043-63045,63047-63054,63056-63062 via svnmerge from Alexandre Vassalotti <alexandre@peadrop.com> parents: 45082 diff changeset	76 }
47301 23ab586c427a Renamed PyString to PyBytes Christian Heimes <christian@cheimes.de> parents: 47300 diff changeset	77 if (_PyBytes_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	78 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	79 }
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	80 else {
47301 23ab586c427a Renamed PyString to PyBytes Christian Heimes <christian@cheimes.de> parents: 47300 diff changeset	81 p->ptr = PyBytes_AS_STRING((PyBytesObject *)p->str) + size;
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	82 p->end =
47301 23ab586c427a Renamed PyString to PyBytes Christian Heimes <christian@cheimes.de> parents: 47300 diff changeset	83 PyBytes_AS_STRING((PyBytesObject *)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	84 *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	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
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	88 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13447 diff changeset	89 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	90 {
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	91 if (p->fp != NULL) {
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	92 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	93 }
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	94 else {
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	95 while (--n >= 0) {
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	96 w_byte(*s, p);
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	97 s++;
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	98 }
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	99 }
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	100 }
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 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13447 diff changeset	103 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	104 {
24434 9ef82377669d Fix SF 588452: debug build crashes on marshal.dumps([128] * 1000). Thomas Heller <theller@ctypes.org> parents: 23851 diff changeset	105 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	106 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	107 }
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	108
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	109 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13447 diff changeset	110 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	111 {
24435 7dc3f4077e59 Whitespace normalization. Thomas Heller <theller@ctypes.org> parents: 24434 diff changeset	112 w_byte((char)( x & 0xff), p);
7dc3f4077e59 Whitespace normalization. Thomas Heller <theller@ctypes.org> parents: 24434 diff changeset	113 w_byte((char)((x>> 8) & 0xff), p);
7dc3f4077e59 Whitespace normalization. Thomas Heller <theller@ctypes.org> parents: 24434 diff changeset	114 w_byte((char)((x>>16) & 0xff), p);
7dc3f4077e59 Whitespace normalization. Thomas Heller <theller@ctypes.org> parents: 24434 diff changeset	115 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	116 }
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	117
4656 186c2ad4abf3 Better way to handle 64-bit ints, keeping gcc -Wall happy. Guido van Rossum <guido@python.org> parents: 4592 diff changeset	118 #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	119 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13447 diff changeset	120 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	121 {
3bf9e2beaf8c Tentative changes to make this work better on 64-bit machines. Guido van Rossum <guido@python.org> parents: 4503 diff changeset	122 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	123 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	124 }
4656 186c2ad4abf3 Better way to handle 64-bit ints, keeping gcc -Wall happy. Guido van Rossum <guido@python.org> parents: 4592 diff changeset	125 #endif
4592 3bf9e2beaf8c Tentative changes to make this work better on 64-bit machines. Guido van Rossum <guido@python.org> parents: 4503 diff changeset	126
52215 bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	127 /* We assume that Python longs are stored internally in base some power of
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	128 2**15; for the sake of portability we'll always read and write them in base
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	129 exactly 2*15. /
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	130
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	131 #define PyLong_MARSHAL_SHIFT 15
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	132 #define PyLong_MARSHAL_BASE ((short)1 << PyLong_MARSHAL_SHIFT)
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	133 #define PyLong_MARSHAL_MASK (PyLong_MARSHAL_BASE - 1)
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	134 #if PyLong_SHIFT % PyLong_MARSHAL_SHIFT != 0
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	135 #error "PyLong_SHIFT must be a multiple of PyLong_MARSHAL_SHIFT"
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	136 #endif
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	137 #define PyLong_MARSHAL_RATIO (PyLong_SHIFT / PyLong_MARSHAL_SHIFT)
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	138
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	139 static void
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	140 w_PyLong(const PyLongObject ob, WFILE p)
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	141 {
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	142 Py_ssize_t i, j, n, l;
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	143 digit d;
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	144
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	145 w_byte(TYPE_LONG, p);
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	146 if (Py_SIZE(ob) == 0) {
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	147 w_long((long)0, p);
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	148 return;
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	149 }
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	150
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	151 /* set l to number of base PyLong_MARSHAL_BASE digits */
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	152 n = ABS(Py_SIZE(ob));
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	153 l = (n-1) * PyLong_MARSHAL_RATIO;
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	154 d = ob->ob_digit[n-1];
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	155 assert(d != 0); /* a PyLong is always normalized */
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	156 do {
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	157 d >>= PyLong_MARSHAL_SHIFT;
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	158 l++;
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	159 } while (d != 0);
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	160 w_long((long)(Py_SIZE(ob) > 0 ? l : -l), p);
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	161
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	162 for (i=0; i < n-1; i++) {
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	163 d = ob->ob_digit[i];
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	164 for (j=0; j < PyLong_MARSHAL_RATIO; j++) {
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	165 w_short(d & PyLong_MARSHAL_MASK, p);
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	166 d >>= PyLong_MARSHAL_SHIFT;
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	167 }
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	168 assert (d == 0);
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	169 }
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	170 d = ob->ob_digit[n-1];
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	171 do {
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	172 w_short(d & PyLong_MARSHAL_MASK, p);
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	173 d >>= PyLong_MARSHAL_SHIFT;
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	174 } while (d != 0);
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	175 }
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	176
4592 3bf9e2beaf8c Tentative changes to make this work better on 64-bit machines. Guido van Rossum <guido@python.org> parents: 4503 diff changeset	177 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13447 diff changeset	178 w_object(PyObject v, WFILE p)
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	179 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	180 Py_ssize_t i, n;
13070 7392e71f6cce Michael Hudson <mwh21@cam.ac.uk>: Fred Drake <fdrake@acm.org> parents: 12576 diff changeset	181
7392e71f6cce Michael Hudson <mwh21@cam.ac.uk>: Fred Drake <fdrake@acm.org> parents: 12576 diff changeset	182 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	183
13070 7392e71f6cce Michael Hudson <mwh21@cam.ac.uk>: Fred Drake <fdrake@acm.org> parents: 12576 diff changeset	184 if (p->depth > MAX_MARSHAL_STACK_DEPTH) {
7392e71f6cce Michael Hudson <mwh21@cam.ac.uk>: Fred Drake <fdrake@acm.org> parents: 12576 diff changeset	185 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	186 }
13070 7392e71f6cce Michael Hudson <mwh21@cam.ac.uk>: Fred Drake <fdrake@acm.org> parents: 12576 diff changeset	187 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	188 w_byte(TYPE_NULL, p);
7982 a909a2869ac5 Make new gcc -Wall happy Guido van Rossum <guido@python.org> parents: 5905 diff changeset	189 }
a909a2869ac5 Make new gcc -Wall happy Guido van Rossum <guido@python.org> parents: 5905 diff changeset	190 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	191 w_byte(TYPE_NONE, p);
7982 a909a2869ac5 Make new gcc -Wall happy Guido van Rossum <guido@python.org> parents: 5905 diff changeset	192 }
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	193 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	194 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	195 }
7982 a909a2869ac5 Make new gcc -Wall happy Guido van Rossum <guido@python.org> parents: 5905 diff changeset	196 else if (v == Py_Ellipsis) {
a909a2869ac5 Make new gcc -Wall happy Guido van Rossum <guido@python.org> parents: 5905 diff changeset	197 w_byte(TYPE_ELLIPSIS, p);
a909a2869ac5 Make new gcc -Wall happy Guido van Rossum <guido@python.org> parents: 5905 diff changeset	198 }
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	199 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	200 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	201 }
aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22705 diff changeset	202 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	203 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	204 }
43815 85cf334b32c3 Merged revisions 58886-58929 via svnmerge from Guido van Rossum <guido@python.org> parents: 43777 diff changeset	205 else if (PyLong_CheckExact(v)) {
40626 4aee3f672f77 Merged the int/long unification branch, by very crude means (sorry Thomas!). Guido van Rossum <guido@python.org> parents: 40527 diff changeset	206 long x = PyLong_AsLong(v);
4aee3f672f77 Merged the int/long unification branch, by very crude means (sorry Thomas!). Guido van Rossum <guido@python.org> parents: 40527 diff changeset	207 if ((x == -1) && PyErr_Occurred()) {
4aee3f672f77 Merged the int/long unification branch, by very crude means (sorry Thomas!). Guido van Rossum <guido@python.org> parents: 40527 diff changeset	208 PyLongObject ob = (PyLongObject )v;
4aee3f672f77 Merged the int/long unification branch, by very crude means (sorry Thomas!). Guido van Rossum <guido@python.org> parents: 40527 diff changeset	209 PyErr_Clear();
52215 bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	210 w_PyLong(ob, p);
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	211 }
40626 4aee3f672f77 Merged the int/long unification branch, by very crude means (sorry Thomas!). Guido van Rossum <guido@python.org> parents: 40527 diff changeset	212 else {
4656 186c2ad4abf3 Better way to handle 64-bit ints, keeping gcc -Wall happy. Guido van Rossum <guido@python.org> parents: 4592 diff changeset	213 #if SIZEOF_LONG > 4
40626 4aee3f672f77 Merged the int/long unification branch, by very crude means (sorry Thomas!). Guido van Rossum <guido@python.org> parents: 40527 diff changeset	214 long y = Py_ARITHMETIC_RIGHT_SHIFT(long, x, 31);
4aee3f672f77 Merged the int/long unification branch, by very crude means (sorry Thomas!). Guido van Rossum <guido@python.org> parents: 40527 diff changeset	215 if (y && y != -1) {
4aee3f672f77 Merged the int/long unification branch, by very crude means (sorry Thomas!). Guido van Rossum <guido@python.org> parents: 40527 diff changeset	216 w_byte(TYPE_INT64, p);
4aee3f672f77 Merged the int/long unification branch, by very crude means (sorry Thomas!). Guido van Rossum <guido@python.org> parents: 40527 diff changeset	217 w_long64(x, p);
4aee3f672f77 Merged the int/long unification branch, by very crude means (sorry Thomas!). Guido van Rossum <guido@python.org> parents: 40527 diff changeset	218 }
4aee3f672f77 Merged the int/long unification branch, by very crude means (sorry Thomas!). Guido van Rossum <guido@python.org> parents: 40527 diff changeset	219 else
4656 186c2ad4abf3 Better way to handle 64-bit ints, keeping gcc -Wall happy. Guido van Rossum <guido@python.org> parents: 4592 diff changeset	220 #endif
186c2ad4abf3 Better way to handle 64-bit ints, keeping gcc -Wall happy. Guido van Rossum <guido@python.org> parents: 4592 diff changeset	221 {
40626 4aee3f672f77 Merged the int/long unification branch, by very crude means (sorry Thomas!). Guido van Rossum <guido@python.org> parents: 40527 diff changeset	222 w_byte(TYPE_INT, p);
4aee3f672f77 Merged the int/long unification branch, by very crude means (sorry Thomas!). Guido van Rossum <guido@python.org> parents: 40527 diff changeset	223 w_long(x, p);
4aee3f672f77 Merged the int/long unification branch, by very crude means (sorry Thomas!). Guido van Rossum <guido@python.org> parents: 40527 diff changeset	224 }
4592 3bf9e2beaf8c Tentative changes to make this work better on 64-bit machines. Guido van Rossum <guido@python.org> parents: 4503 diff changeset	225 }
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	226 }
43815 85cf334b32c3 Merged revisions 58886-58929 via svnmerge from Guido van Rossum <guido@python.org> parents: 43777 diff changeset	227 else if (PyFloat_CheckExact(v)) {
35008 44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	228 if (p->version > 1) {
35126 70681267a74a Fix signedness of various char variables to stop causing a warning under gcc 4. Brett Cannon <bcannon@gmail.com> parents: 35071 diff changeset	229 unsigned char buf[8];
35008 44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	230 if (_PyFloat_Pack8(PyFloat_AsDouble(v),
44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	231 buf, 1) < 0) {
44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	232 p->error = 1;
44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	233 return;
44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	234 }
44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	235 w_byte(TYPE_BINARY_FLOAT, p);
35126 70681267a74a Fix signedness of various char variables to stop causing a warning under gcc 4. Brett Cannon <bcannon@gmail.com> parents: 35071 diff changeset	236 w_string((char*)buf, 8, p);
35008 44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	237 }
44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	238 else {
53187 b653eab13b73 The other half of Issue #1580: use short float repr where possible. Eric Smith <eric@trueblade.com> parents: 52215 diff changeset	239 char *buf = PyOS_double_to_string(PyFloat_AS_DOUBLE(v),
53192 973f4d7aa87c Make sure that marshal and pickle continue to output 17 Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	240 'g', 17, 0, NULL);
53187 b653eab13b73 The other half of Issue #1580: use short float repr where possible. Eric Smith <eric@trueblade.com> parents: 52215 diff changeset	241 if (!buf)
b653eab13b73 The other half of Issue #1580: use short float repr where possible. Eric Smith <eric@trueblade.com> parents: 52215 diff changeset	242 return;
b653eab13b73 The other half of Issue #1580: use short float repr where possible. Eric Smith <eric@trueblade.com> parents: 52215 diff changeset	243 n = strlen(buf);
35008 44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	244 w_byte(TYPE_FLOAT, p);
36522 2791676b3825 Move cast to suppress warning. Martin v. Löwis <martin@v.loewis.de> parents: 36501 diff changeset	245 w_byte((int)n, p);
36866 9eb24f92a784 Change int to Py_ssize_t in several places. Martin v. Löwis <martin@v.loewis.de> parents: 36792 diff changeset	246 w_string(buf, (int)n, p);
53187 b653eab13b73 The other half of Issue #1580: use short float repr where possible. Eric Smith <eric@trueblade.com> parents: 52215 diff changeset	247 PyMem_Free(buf);
35008 44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	248 }
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	249 }
3323 6098aaa8ae7f changes for complex numbers Guido van Rossum <guido@python.org> parents: 3234 diff changeset	250 #ifndef WITHOUT_COMPLEX
43815 85cf334b32c3 Merged revisions 58886-58929 via svnmerge from Guido van Rossum <guido@python.org> parents: 43777 diff changeset	251 else if (PyComplex_CheckExact(v)) {
35008 44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	252 if (p->version > 1) {
35126 70681267a74a Fix signedness of various char variables to stop causing a warning under gcc 4. Brett Cannon <bcannon@gmail.com> parents: 35071 diff changeset	253 unsigned char buf[8];
35008 44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	254 if (_PyFloat_Pack8(PyComplex_RealAsDouble(v),
44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	255 buf, 1) < 0) {
44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	256 p->error = 1;
44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	257 return;
44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	258 }
44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	259 w_byte(TYPE_BINARY_COMPLEX, p);
35126 70681267a74a Fix signedness of various char variables to stop causing a warning under gcc 4. Brett Cannon <bcannon@gmail.com> parents: 35071 diff changeset	260 w_string((char*)buf, 8, p);
35008 44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	261 if (_PyFloat_Pack8(PyComplex_ImagAsDouble(v),
44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	262 buf, 1) < 0) {
44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	263 p->error = 1;
44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	264 return;
44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	265 }
35126 70681267a74a Fix signedness of various char variables to stop causing a warning under gcc 4. Brett Cannon <bcannon@gmail.com> parents: 35071 diff changeset	266 w_string((char*)buf, 8, p);
35008 44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	267 }
44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	268 else {
53187 b653eab13b73 The other half of Issue #1580: use short float repr where possible. Eric Smith <eric@trueblade.com> parents: 52215 diff changeset	269 char *buf;
35008 44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	270 w_byte(TYPE_COMPLEX, p);
53187 b653eab13b73 The other half of Issue #1580: use short float repr where possible. Eric Smith <eric@trueblade.com> parents: 52215 diff changeset	271 buf = PyOS_double_to_string(PyComplex_RealAsDouble(v),
53192 973f4d7aa87c Make sure that marshal and pickle continue to output 17 Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	272 'g', 17, 0, NULL);
53187 b653eab13b73 The other half of Issue #1580: use short float repr where possible. Eric Smith <eric@trueblade.com> parents: 52215 diff changeset	273 if (!buf)
b653eab13b73 The other half of Issue #1580: use short float repr where possible. Eric Smith <eric@trueblade.com> parents: 52215 diff changeset	274 return;
36866 9eb24f92a784 Change int to Py_ssize_t in several places. Martin v. Löwis <martin@v.loewis.de> parents: 36792 diff changeset	275 n = strlen(buf);
9eb24f92a784 Change int to Py_ssize_t in several places. Martin v. Löwis <martin@v.loewis.de> parents: 36792 diff changeset	276 w_byte((int)n, p);
9eb24f92a784 Change int to Py_ssize_t in several places. Martin v. Löwis <martin@v.loewis.de> parents: 36792 diff changeset	277 w_string(buf, (int)n, p);
53187 b653eab13b73 The other half of Issue #1580: use short float repr where possible. Eric Smith <eric@trueblade.com> parents: 52215 diff changeset	278 PyMem_Free(buf);
b653eab13b73 The other half of Issue #1580: use short float repr where possible. Eric Smith <eric@trueblade.com> parents: 52215 diff changeset	279 buf = PyOS_double_to_string(PyComplex_ImagAsDouble(v),
53192 973f4d7aa87c Make sure that marshal and pickle continue to output 17 Mark Dickinson <dickinsm@gmail.com> parents: 53187 diff changeset	280 'g', 17, 0, NULL);
53187 b653eab13b73 The other half of Issue #1580: use short float repr where possible. Eric Smith <eric@trueblade.com> parents: 52215 diff changeset	281 if (!buf)
b653eab13b73 The other half of Issue #1580: use short float repr where possible. Eric Smith <eric@trueblade.com> parents: 52215 diff changeset	282 return;
b653eab13b73 The other half of Issue #1580: use short float repr where possible. Eric Smith <eric@trueblade.com> parents: 52215 diff changeset	283 n = strlen(buf);
36866 9eb24f92a784 Change int to Py_ssize_t in several places. Martin v. Löwis <martin@v.loewis.de> parents: 36792 diff changeset	284 w_byte((int)n, p);
9eb24f92a784 Change int to Py_ssize_t in several places. Martin v. Löwis <martin@v.loewis.de> parents: 36792 diff changeset	285 w_string(buf, (int)n, p);
53187 b653eab13b73 The other half of Issue #1580: use short float repr where possible. Eric Smith <eric@trueblade.com> parents: 52215 diff changeset	286 PyMem_Free(buf);
35008 44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	287 }
3323 6098aaa8ae7f changes for complex numbers Guido van Rossum <guido@python.org> parents: 3234 diff changeset	288 }
6098aaa8ae7f changes for complex numbers Guido van Rossum <guido@python.org> parents: 3234 diff changeset	289 #endif
47301 23ab586c427a Renamed PyString to PyBytes Christian Heimes <christian@cheimes.de> parents: 47300 diff changeset	290 else if (PyBytes_CheckExact(v)) {
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 43734 diff changeset	291 w_byte(TYPE_STRING, p);
47301 23ab586c427a Renamed PyString to PyBytes Christian Heimes <christian@cheimes.de> parents: 47300 diff changeset	292 n = PyBytes_GET_SIZE(v);
36866 9eb24f92a784 Change int to Py_ssize_t in several places. Martin v. Löwis <martin@v.loewis.de> parents: 36792 diff changeset	293 if (n > INT_MAX) {
9eb24f92a784 Change int to Py_ssize_t in several places. Martin v. Löwis <martin@v.loewis.de> parents: 36792 diff changeset	294 /* huge strings are not supported */
9eb24f92a784 Change int to Py_ssize_t in several places. Martin v. Löwis <martin@v.loewis.de> parents: 36792 diff changeset	295 p->depth--;
9eb24f92a784 Change int to Py_ssize_t in several places. Martin v. Löwis <martin@v.loewis.de> parents: 36792 diff changeset	296 p->error = 1;
9eb24f92a784 Change int to Py_ssize_t in several places. Martin v. Löwis <martin@v.loewis.de> parents: 36792 diff changeset	297 return;
9eb24f92a784 Change int to Py_ssize_t in several places. Martin v. Löwis <martin@v.loewis.de> parents: 36792 diff changeset	298 }
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	299 w_long((long)n, p);
47301 23ab586c427a Renamed PyString to PyBytes Christian Heimes <christian@cheimes.de> parents: 47300 diff changeset	300 w_string(PyBytes_AS_STRING(v), (int)n, p);
11976 513354d87a85 Marc-Andre Lemburg: support marshalling Unicode objects (code 'u'). Guido van Rossum <guido@python.org> parents: 9300 diff changeset	301 }
43815 85cf334b32c3 Merged revisions 58886-58929 via svnmerge from Guido van Rossum <guido@python.org> parents: 43777 diff changeset	302 else if (PyUnicode_CheckExact(v)) {
11976 513354d87a85 Marc-Andre Lemburg: support marshalling Unicode objects (code 'u'). Guido van Rossum <guido@python.org> parents: 9300 diff changeset	303 PyObject *utf8;
513354d87a85 Marc-Andre Lemburg: support marshalling Unicode objects (code 'u'). Guido van Rossum <guido@python.org> parents: 9300 diff changeset	304 utf8 = PyUnicode_AsUTF8String(v);
513354d87a85 Marc-Andre Lemburg: support marshalling Unicode objects (code 'u'). Guido van Rossum <guido@python.org> parents: 9300 diff changeset	305 if (utf8 == NULL) {
13106 a6725acdf33b Urmpf. Quality control on this patch lapsed a bit. :-( Guido van Rossum <guido@python.org> parents: 13070 diff changeset	306 p->depth--;
a6725acdf33b Urmpf. Quality control on this patch lapsed a bit. :-( Guido van Rossum <guido@python.org> parents: 13070 diff changeset	307 p->error = 1;
a6725acdf33b Urmpf. Quality control on this patch lapsed a bit. :-( Guido van Rossum <guido@python.org> parents: 13070 diff changeset	308 return;
11976 513354d87a85 Marc-Andre Lemburg: support marshalling Unicode objects (code 'u'). Guido van Rossum <guido@python.org> parents: 9300 diff changeset	309 }
513354d87a85 Marc-Andre Lemburg: support marshalling Unicode objects (code 'u'). Guido van Rossum <guido@python.org> parents: 9300 diff changeset	310 w_byte(TYPE_UNICODE, p);
47301 23ab586c427a Renamed PyString to PyBytes Christian Heimes <christian@cheimes.de> parents: 47300 diff changeset	311 n = PyBytes_GET_SIZE(utf8);
36866 9eb24f92a784 Change int to Py_ssize_t in several places. Martin v. Löwis <martin@v.loewis.de> parents: 36792 diff changeset	312 if (n > INT_MAX) {
9eb24f92a784 Change int to Py_ssize_t in several places. Martin v. Löwis <martin@v.loewis.de> parents: 36792 diff changeset	313 p->depth--;
9eb24f92a784 Change int to Py_ssize_t in several places. Martin v. Löwis <martin@v.loewis.de> parents: 36792 diff changeset	314 p->error = 1;
9eb24f92a784 Change int to Py_ssize_t in several places. Martin v. Löwis <martin@v.loewis.de> parents: 36792 diff changeset	315 return;
9eb24f92a784 Change int to Py_ssize_t in several places. Martin v. Löwis <martin@v.loewis.de> parents: 36792 diff changeset	316 }
11976 513354d87a85 Marc-Andre Lemburg: support marshalling Unicode objects (code 'u'). Guido van Rossum <guido@python.org> parents: 9300 diff changeset	317 w_long((long)n, p);
47301 23ab586c427a Renamed PyString to PyBytes Christian Heimes <christian@cheimes.de> parents: 47300 diff changeset	318 w_string(PyBytes_AS_STRING(utf8), (int)n, p);
11976 513354d87a85 Marc-Andre Lemburg: support marshalling Unicode objects (code 'u'). Guido van Rossum <guido@python.org> parents: 9300 diff changeset	319 Py_DECREF(utf8);
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	320 }
43815 85cf334b32c3 Merged revisions 58886-58929 via svnmerge from Guido van Rossum <guido@python.org> parents: 43777 diff changeset	321 else if (PyTuple_CheckExact(v)) {
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	322 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	323 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	324 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	325 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	326 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	327 }
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	328 }
43815 85cf334b32c3 Merged revisions 58886-58929 via svnmerge from Guido van Rossum <guido@python.org> parents: 43777 diff changeset	329 else if (PyList_CheckExact(v)) {
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	330 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	331 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	332 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	333 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	334 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	335 }
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	336 }
43815 85cf334b32c3 Merged revisions 58886-58929 via svnmerge from Guido van Rossum <guido@python.org> parents: 43777 diff changeset	337 else if (PyDict_CheckExact(v)) {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	338 Py_ssize_t pos;
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	339 PyObject key, value;
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	340 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	341 /* This one is NULL object terminated! */
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1270 diff changeset	342 pos = 0;
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	343 while (PyDict_Next(v, &pos, &key, &value)) {
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1270 diff changeset	344 w_object(key, p);
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1270 diff changeset	345 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	346 }
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	347 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	348 }
43815 85cf334b32c3 Merged revisions 58886-58929 via svnmerge from Guido van Rossum <guido@python.org> parents: 43777 diff changeset	349 else if (PyAnySet_CheckExact(v)) {
34394 b480abaf1f6f SF 1098985: set objects cannot be marshalled Raymond Hettinger <python@rcn.com> parents: 34205 diff changeset	350 PyObject value, it;
b480abaf1f6f SF 1098985: set objects cannot be marshalled Raymond Hettinger <python@rcn.com> parents: 34205 diff changeset	351
b480abaf1f6f SF 1098985: set objects cannot be marshalled Raymond Hettinger <python@rcn.com> parents: 34205 diff changeset	352 if (PyObject_TypeCheck(v, &PySet_Type))
b480abaf1f6f SF 1098985: set objects cannot be marshalled Raymond Hettinger <python@rcn.com> parents: 34205 diff changeset	353 w_byte(TYPE_SET, p);
b480abaf1f6f SF 1098985: set objects cannot be marshalled Raymond Hettinger <python@rcn.com> parents: 34205 diff changeset	354 else
b480abaf1f6f SF 1098985: set objects cannot be marshalled Raymond Hettinger <python@rcn.com> parents: 34205 diff changeset	355 w_byte(TYPE_FROZENSET, p);
b480abaf1f6f SF 1098985: set objects cannot be marshalled Raymond Hettinger <python@rcn.com> parents: 34205 diff changeset	356 n = PyObject_Size(v);
b480abaf1f6f SF 1098985: set objects cannot be marshalled Raymond Hettinger <python@rcn.com> parents: 34205 diff changeset	357 if (n == -1) {
b480abaf1f6f SF 1098985: set objects cannot be marshalled Raymond Hettinger <python@rcn.com> parents: 34205 diff changeset	358 p->depth--;
b480abaf1f6f SF 1098985: set objects cannot be marshalled Raymond Hettinger <python@rcn.com> parents: 34205 diff changeset	359 p->error = 1;
b480abaf1f6f SF 1098985: set objects cannot be marshalled Raymond Hettinger <python@rcn.com> parents: 34205 diff changeset	360 return;
b480abaf1f6f SF 1098985: set objects cannot be marshalled Raymond Hettinger <python@rcn.com> parents: 34205 diff changeset	361 }
b480abaf1f6f SF 1098985: set objects cannot be marshalled Raymond Hettinger <python@rcn.com> parents: 34205 diff changeset	362 w_long((long)n, p);
b480abaf1f6f SF 1098985: set objects cannot be marshalled Raymond Hettinger <python@rcn.com> parents: 34205 diff changeset	363 it = PyObject_GetIter(v);
b480abaf1f6f SF 1098985: set objects cannot be marshalled Raymond Hettinger <python@rcn.com> parents: 34205 diff changeset	364 if (it == NULL) {
b480abaf1f6f SF 1098985: set objects cannot be marshalled Raymond Hettinger <python@rcn.com> parents: 34205 diff changeset	365 p->depth--;
b480abaf1f6f SF 1098985: set objects cannot be marshalled Raymond Hettinger <python@rcn.com> parents: 34205 diff changeset	366 p->error = 1;
b480abaf1f6f SF 1098985: set objects cannot be marshalled Raymond Hettinger <python@rcn.com> parents: 34205 diff changeset	367 return;
b480abaf1f6f SF 1098985: set objects cannot be marshalled Raymond Hettinger <python@rcn.com> parents: 34205 diff changeset	368 }
b480abaf1f6f SF 1098985: set objects cannot be marshalled Raymond Hettinger <python@rcn.com> parents: 34205 diff changeset	369 while ((value = PyIter_Next(it)) != NULL) {
b480abaf1f6f SF 1098985: set objects cannot be marshalled Raymond Hettinger <python@rcn.com> parents: 34205 diff changeset	370 w_object(value, p);
b480abaf1f6f SF 1098985: set objects cannot be marshalled Raymond Hettinger <python@rcn.com> parents: 34205 diff changeset	371 Py_DECREF(value);
b480abaf1f6f SF 1098985: set objects cannot be marshalled Raymond Hettinger <python@rcn.com> parents: 34205 diff changeset	372 }
b480abaf1f6f SF 1098985: set objects cannot be marshalled Raymond Hettinger <python@rcn.com> parents: 34205 diff changeset	373 Py_DECREF(it);
b480abaf1f6f SF 1098985: set objects cannot be marshalled Raymond Hettinger <python@rcn.com> parents: 34205 diff changeset	374 if (PyErr_Occurred()) {
b480abaf1f6f SF 1098985: set objects cannot be marshalled Raymond Hettinger <python@rcn.com> parents: 34205 diff changeset	375 p->depth--;
b480abaf1f6f SF 1098985: set objects cannot be marshalled Raymond Hettinger <python@rcn.com> parents: 34205 diff changeset	376 p->error = 1;
b480abaf1f6f SF 1098985: set objects cannot be marshalled Raymond Hettinger <python@rcn.com> parents: 34205 diff changeset	377 return;
b480abaf1f6f SF 1098985: set objects cannot be marshalled Raymond Hettinger <python@rcn.com> parents: 34205 diff changeset	378 }
b480abaf1f6f SF 1098985: set objects cannot be marshalled Raymond Hettinger <python@rcn.com> parents: 34205 diff changeset	379 }
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	380 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	381 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	382 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	383 w_long(co->co_argcount, p);
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39610 diff changeset	384 w_long(co->co_kwonlyargcount, p);
23851 d6ae544acd24 Fix SF bug # 561858 Assertion with very long lists Neal Norwitz <nnorwitz@gmail.com> parents: 22785 diff changeset	385 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	386 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	387 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	388 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	389 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	390 w_object(co->co_names, p);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2503 diff changeset	391 w_object(co->co_varnames, p);
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 15979 diff changeset	392 w_object(co->co_freevars, p);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 15979 diff changeset	393 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	394 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	395 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	396 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	397 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	398 }
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42404 diff changeset	399 else if (PyObject_CheckBuffer(v)) {
9293 0a67db47e1d0 Changes to support other object types besides strings Guido van Rossum <guido@python.org> parents: 8465 diff changeset	400 /* 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	401 char *s;
20947 c555f1e7c4be Use PyObject_CheckReadBuffer(). Jeremy Hylton <jeremy@alum.mit.edu> parents: 20552 diff changeset	402 PyBufferProcs *pb = v->ob_type->tp_as_buffer;
43423 0476a2cc5658 Change PyBuffer to Py_buffer to be consistent with other non-object structures like Py_complex. Add some more functionality to the memoryview object. Travis E. Oliphant <oliphant@enthought.com> parents: 43007 diff changeset	403 Py_buffer view;
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42404 diff changeset	404 if ((*pb->bf_getbuffer)(v, &view, PyBUF_SIMPLE) != 0) {
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42404 diff changeset	405 w_byte(TYPE_UNKNOWN, p);
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42404 diff changeset	406 p->error = 1;
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42404 diff changeset	407 }
9293 0a67db47e1d0 Changes to support other object types besides strings Guido van Rossum <guido@python.org> parents: 8465 diff changeset	408 w_byte(TYPE_STRING, p);
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42404 diff changeset	409 n = view.len;
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42404 diff changeset	410 s = view.buf;
36866 9eb24f92a784 Change int to Py_ssize_t in several places. Martin v. Löwis <martin@v.loewis.de> parents: 36792 diff changeset	411 if (n > INT_MAX) {
9eb24f92a784 Change int to Py_ssize_t in several places. Martin v. Löwis <martin@v.loewis.de> parents: 36792 diff changeset	412 p->depth--;
9eb24f92a784 Change int to Py_ssize_t in several places. Martin v. Löwis <martin@v.loewis.de> parents: 36792 diff changeset	413 p->error = 1;
9eb24f92a784 Change int to Py_ssize_t in several places. Martin v. Löwis <martin@v.loewis.de> parents: 36792 diff changeset	414 return;
9eb24f92a784 Change int to Py_ssize_t in several places. Martin v. Löwis <martin@v.loewis.de> parents: 36792 diff changeset	415 }
9293 0a67db47e1d0 Changes to support other object types besides strings Guido van Rossum <guido@python.org> parents: 8465 diff changeset	416 w_long((long)n, p);
36866 9eb24f92a784 Change int to Py_ssize_t in several places. Martin v. Löwis <martin@v.loewis.de> parents: 36792 diff changeset	417 w_string(s, (int)n, p);
42665 85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42404 diff changeset	418 if (pb->bf_releasebuffer != NULL)
85c22b4d4455 Merged in py3k-buffer branch to main line. All objects now use the buffer protocol in PEP 3118. Travis E. Oliphant <oliphant@enthought.com> parents: 42404 diff changeset	419 (*pb->bf_releasebuffer)(v, &view);
9293 0a67db47e1d0 Changes to support other object types besides strings Guido van Rossum <guido@python.org> parents: 8465 diff changeset	420 }
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	421 else {
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	422 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	423 p->error = 1;
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	424 }
13106 a6725acdf33b Urmpf. Quality control on this patch lapsed a bit. :-( Guido van Rossum <guido@python.org> parents: 13070 diff changeset	425 p->depth--;
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	426 }
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	427
32422 3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	428 /* version currently has no effect for writing longs. */
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	429 void
32422 3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	430 PyMarshal_WriteLongToFile(long x, FILE *fp, int version)
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	431 {
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	432 WFILE wf;
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	433 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	434 wf.error = 0;
13070 7392e71f6cce Michael Hudson <mwh21@cam.ac.uk>: Fred Drake <fdrake@acm.org> parents: 12576 diff changeset	435 wf.depth = 0;
32422 3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	436 wf.strings = NULL;
35008 44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	437 wf.version = version;
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	438 w_long(x, &wf);
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	439 }
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	440
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	441 void
32422 3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	442 PyMarshal_WriteObjectToFile(PyObject x, FILE fp, int version)
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	443 {
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	444 WFILE wf;
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	445 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	446 wf.error = 0;
13106 a6725acdf33b Urmpf. Quality control on this patch lapsed a bit. :-( Guido van Rossum <guido@python.org> parents: 13070 diff changeset	447 wf.depth = 0;
32422 3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	448 wf.strings = (version > 0) ? PyDict_New() : NULL;
35008 44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	449 wf.version = version;
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	450 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	451 Py_XDECREF(wf.strings);
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	452 }
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	453
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	454 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	455
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	456 #define rs_byte(p) (((p)->ptr < (p)->end) ? (unsigned char)*(p)->ptr++ : EOF)
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	457
4dd1af0ddef0 various tuple related optimizations; remove unused b/w compat code from ceval.c Guido van Rossum <guido@python.org> parents: 2368 diff changeset	458 #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	459
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	460 static int
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13447 diff changeset	461 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	462 {
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	463 if (p->fp != NULL)
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	464 /* The result fits into int because it must be <=n. */
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	465 return (int)fread(s, 1, n, p->fp);
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	466 if (p->end - p->ptr < n)
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	467 n = (int)(p->end - p->ptr);
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	468 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	469 p->ptr += n;
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	470 return n;
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	471 }
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	472
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	473 static int
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13447 diff changeset	474 r_short(RFILE *p)
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	475 {
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	476 register short x;
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	477 x = r_byte(p);
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	478 x \|= r_byte(p) << 8;
14678 94ca87a3e5ee Obscure marshal fixes: Tim Peters <tim.peters@gmail.com> parents: 14375 diff changeset	479 /* Sign-extension, in case short greater than 16 bits */
94ca87a3e5ee Obscure marshal fixes: Tim Peters <tim.peters@gmail.com> parents: 14375 diff changeset	480 x \|= -(x & 0x8000);
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	481 return x;
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	482 }
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	483
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	484 static long
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13447 diff changeset	485 r_long(RFILE *p)
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	486 {
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	487 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	488 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	489 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	490 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	491 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	492 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	493 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	494 }
4dd1af0ddef0 various tuple related optimizations; remove unused b/w compat code from ceval.c Guido van Rossum <guido@python.org> parents: 2368 diff changeset	495 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	496 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	497 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	498 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	499 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	500 }
4656 186c2ad4abf3 Better way to handle 64-bit ints, keeping gcc -Wall happy. Guido van Rossum <guido@python.org> parents: 4592 diff changeset	501 #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	502 /* Sign extension for 64-bit machines */
14678 94ca87a3e5ee Obscure marshal fixes: Tim Peters <tim.peters@gmail.com> parents: 14375 diff changeset	503 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	504 #endif
4592 3bf9e2beaf8c Tentative changes to make this work better on 64-bit machines. Guido van Rossum <guido@python.org> parents: 4503 diff changeset	505 return x;
3bf9e2beaf8c Tentative changes to make this work better on 64-bit machines. Guido van Rossum <guido@python.org> parents: 4503 diff changeset	506 }
3bf9e2beaf8c Tentative changes to make this work better on 64-bit machines. Guido van Rossum <guido@python.org> parents: 4503 diff changeset	507
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	508 /* 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	509 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	510 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	511 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	512 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	513 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	514 */
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	515 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13447 diff changeset	516 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	517 {
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	518 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	519 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	520 #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	521 long x = (hi4 << 32) \| (lo4 & 0xFFFFFFFFL);
44099 f324631462a2 Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h Christian Heimes <christian@cheimes.de> parents: 43815 diff changeset	522 return PyLong_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	523 #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	524 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	525 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	526 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	527 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	528 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	529 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	530 }
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	531 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	532 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	533 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	534 }
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	535 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	536 #endif
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	537 }
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	538
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	539 static PyObject *
52215 bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	540 r_PyLong(RFILE *p)
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	541 {
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	542 PyLongObject *ob;
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	543 int size, i, j, md;
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	544 long n;
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	545 digit d;
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	546
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	547 n = r_long(p);
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	548 if (n == 0)
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	549 return (PyObject *)_PyLong_New(0);
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	550 if (n < -INT_MAX \|\| n > INT_MAX) {
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	551 PyErr_SetString(PyExc_ValueError,
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	552 "bad marshal data (long size out of range)");
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	553 return NULL;
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	554 }
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	555
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	556 size = 1 + (ABS(n)-1) / PyLong_MARSHAL_RATIO;
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	557 ob = _PyLong_New(size);
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	558 if (ob == NULL)
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	559 return NULL;
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	560 Py_SIZE(ob) = n > 0 ? size : -size;
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	561
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	562 for (i = 0; i < size-1; i++) {
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	563 d = 0;
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	564 for (j=0; j < PyLong_MARSHAL_RATIO; j++) {
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	565 md = r_short(p);
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	566 if (md < 0 \|\| md > PyLong_MARSHAL_BASE)
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	567 goto bad_digit;
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	568 d += (digit)md << j*PyLong_MARSHAL_SHIFT;
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	569 }
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	570 ob->ob_digit[i] = d;
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	571 }
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	572 d = 0;
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	573 for (j=0; j < (ABS(n)-1)%PyLong_MARSHAL_RATIO + 1; j++) {
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	574 md = r_short(p);
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	575 if (md < 0 \|\| md > PyLong_MARSHAL_BASE)
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	576 goto bad_digit;
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	577 d += (digit)md << j*PyLong_MARSHAL_SHIFT;
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	578 }
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	579 ob->ob_digit[size-1] = d;
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	580 return (PyObject *)ob;
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	581 bad_digit:
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	582 Py_DECREF(ob);
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	583 PyErr_SetString(PyExc_ValueError,
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	584 "bad marshal data (digit out of range in long)");
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	585 return NULL;
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	586 }
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	587
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	588
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	589 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13447 diff changeset	590 r_object(RFILE *p)
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	591 {
31824 331de8b9d1ed Marshal clean-up (SF patch #873224) Armin Rigo <arigo@tunes.org> parents: 30311 diff changeset	592 /* 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	593 an exception is set. */
45071 f380d991390e Merged revisions 60441-60474 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45044 diff changeset	594 PyObject v, v2;
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	595 long i, n;
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	596 int type = r_byte(p);
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	597 PyObject *retval;
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	598
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	599 p->depth++;
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	600
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	601 if (p->depth > MAX_MARSHAL_STACK_DEPTH) {
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	602 p->depth--;
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	603 PyErr_SetString(PyExc_ValueError, "recursion limit exceeded");
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	604 return NULL;
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	605 }
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	606
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	607 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	608
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	609 case EOF:
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	610 PyErr_SetString(PyExc_EOFError,
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	611 "EOF read where object expected");
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	612 retval = NULL;
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	613 break;
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	614
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	615 case TYPE_NULL:
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	616 retval = NULL;
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	617 break;
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	618
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	619 case TYPE_NONE:
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	620 Py_INCREF(Py_None);
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	621 retval = Py_None;
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	622 break;
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	623
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	624 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	625 Py_INCREF(PyExc_StopIteration);
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	626 retval = PyExc_StopIteration;
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	627 break;
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	628
4403 3b3f7c3f6da2 Ellipses -> Ellipsis rename (the dictionary really says that it should Guido van Rossum <guido@python.org> parents: 4039 diff changeset	629 case TYPE_ELLIPSIS:
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	630 Py_INCREF(Py_Ellipsis);
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	631 retval = Py_Ellipsis;
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	632 break;
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	633
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	634 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	635 Py_INCREF(Py_False);
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	636 retval = Py_False;
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	637 break;
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	638
aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22705 diff changeset	639 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	640 Py_INCREF(Py_True);
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	641 retval = Py_True;
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	642 break;
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	643
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	644 case TYPE_INT:
44099 f324631462a2 Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h Christian Heimes <christian@cheimes.de> parents: 43815 diff changeset	645 retval = PyLong_FromLong(r_long(p));
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	646 break;
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	647
4592 3bf9e2beaf8c Tentative changes to make this work better on 64-bit machines. Guido van Rossum <guido@python.org> parents: 4503 diff changeset	648 case TYPE_INT64:
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	649 retval = r_long64(p);
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	650 break;
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	651
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	652 case TYPE_LONG:
52215 bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	653 retval = r_PyLong(p);
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	654 break;
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	655
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	656 case TYPE_FLOAT:
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	657 {
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	658 char buf[256];
5119 bda01a374762 Changes for Lee Busby's SIGFPE patch set. Guido van Rossum <guido@python.org> parents: 5115 diff changeset	659 double dx;
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	660 n = r_byte(p);
31824 331de8b9d1ed Marshal clean-up (SF patch #873224) Armin Rigo <arigo@tunes.org> parents: 30311 diff changeset	661 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	662 PyErr_SetString(PyExc_EOFError,
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	663 "EOF read where object expected");
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	664 retval = NULL;
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	665 break;
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	666 }
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	667 buf[n] = '\0';
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	668 retval = NULL;
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	669 PyFPE_START_PROTECT("atof", break)
32305 13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: 31824 diff changeset	670 dx = PyOS_ascii_atof(buf);
5197 74c12704a0bd New form of PyFPE_END_PROTECT macro. Guido van Rossum <guido@python.org> parents: 5119 diff changeset	671 PyFPE_END_PROTECT(dx)
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	672 retval = PyFloat_FromDouble(dx);
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	673 break;
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	674 }
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	675
35008 44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	676 case TYPE_BINARY_FLOAT:
44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	677 {
35126 70681267a74a Fix signedness of various char variables to stop causing a warning under gcc 4. Brett Cannon <bcannon@gmail.com> parents: 35071 diff changeset	678 unsigned char buf[8];
35008 44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	679 double x;
35126 70681267a74a Fix signedness of various char variables to stop causing a warning under gcc 4. Brett Cannon <bcannon@gmail.com> parents: 35071 diff changeset	680 if (r_string((char*)buf, 8, p) != 8) {
35008 44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	681 PyErr_SetString(PyExc_EOFError,
44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	682 "EOF read where object expected");
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	683 retval = NULL;
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	684 break;
35008 44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	685 }
44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	686 x = _PyFloat_Unpack8(buf, 1);
44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	687 if (x == -1.0 && PyErr_Occurred()) {
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	688 retval = NULL;
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	689 break;
35008 44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	690 }
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	691 retval = PyFloat_FromDouble(x);
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	692 break;
35008 44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	693 }
44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	694
3323 6098aaa8ae7f changes for complex numbers Guido van Rossum <guido@python.org> parents: 3234 diff changeset	695 #ifndef WITHOUT_COMPLEX
6098aaa8ae7f changes for complex numbers Guido van Rossum <guido@python.org> parents: 3234 diff changeset	696 case TYPE_COMPLEX:
6098aaa8ae7f changes for complex numbers Guido van Rossum <guido@python.org> parents: 3234 diff changeset	697 {
6098aaa8ae7f changes for complex numbers Guido van Rossum <guido@python.org> parents: 3234 diff changeset	698 char buf[256];
3766 516490c8192c Py_complex; and WITHOUT_COMPLEX added to getargs.c Guido van Rossum <guido@python.org> parents: 3731 diff changeset	699 Py_complex c;
3323 6098aaa8ae7f changes for complex numbers Guido van Rossum <guido@python.org> parents: 3234 diff changeset	700 n = r_byte(p);
31824 331de8b9d1ed Marshal clean-up (SF patch #873224) Armin Rigo <arigo@tunes.org> parents: 30311 diff changeset	701 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	702 PyErr_SetString(PyExc_EOFError,
3323 6098aaa8ae7f changes for complex numbers Guido van Rossum <guido@python.org> parents: 3234 diff changeset	703 "EOF read where object expected");
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	704 retval = NULL;
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	705 break;
3323 6098aaa8ae7f changes for complex numbers Guido van Rossum <guido@python.org> parents: 3234 diff changeset	706 }
6098aaa8ae7f changes for complex numbers Guido van Rossum <guido@python.org> parents: 3234 diff changeset	707 buf[n] = '\0';
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	708 retval = NULL;
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	709 PyFPE_START_PROTECT("atof", break;)
32305 13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: 31824 diff changeset	710 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	711 PyFPE_END_PROTECT(c)
3323 6098aaa8ae7f changes for complex numbers Guido van Rossum <guido@python.org> parents: 3234 diff changeset	712 n = r_byte(p);
31824 331de8b9d1ed Marshal clean-up (SF patch #873224) Armin Rigo <arigo@tunes.org> parents: 30311 diff changeset	713 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	714 PyErr_SetString(PyExc_EOFError,
3323 6098aaa8ae7f changes for complex numbers Guido van Rossum <guido@python.org> parents: 3234 diff changeset	715 "EOF read where object expected");
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	716 retval = NULL;
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	717 break;
3323 6098aaa8ae7f changes for complex numbers Guido van Rossum <guido@python.org> parents: 3234 diff changeset	718 }
6098aaa8ae7f changes for complex numbers Guido van Rossum <guido@python.org> parents: 3234 diff changeset	719 buf[n] = '\0';
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	720 PyFPE_START_PROTECT("atof", break)
32305 13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: 31824 diff changeset	721 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	722 PyFPE_END_PROTECT(c)
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	723 retval = PyComplex_FromCComplex(c);
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	724 break;
3323 6098aaa8ae7f changes for complex numbers Guido van Rossum <guido@python.org> parents: 3234 diff changeset	725 }
35008 44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	726
44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	727 case TYPE_BINARY_COMPLEX:
44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	728 {
35126 70681267a74a Fix signedness of various char variables to stop causing a warning under gcc 4. Brett Cannon <bcannon@gmail.com> parents: 35071 diff changeset	729 unsigned char buf[8];
35008 44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	730 Py_complex c;
35126 70681267a74a Fix signedness of various char variables to stop causing a warning under gcc 4. Brett Cannon <bcannon@gmail.com> parents: 35071 diff changeset	731 if (r_string((char*)buf, 8, p) != 8) {
35008 44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	732 PyErr_SetString(PyExc_EOFError,
44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	733 "EOF read where object expected");
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	734 retval = NULL;
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	735 break;
35008 44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	736 }
44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	737 c.real = _PyFloat_Unpack8(buf, 1);
44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	738 if (c.real == -1.0 && PyErr_Occurred()) {
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	739 retval = NULL;
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	740 break;
35008 44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	741 }
35126 70681267a74a Fix signedness of various char variables to stop causing a warning under gcc 4. Brett Cannon <bcannon@gmail.com> parents: 35071 diff changeset	742 if (r_string((char*)buf, 8, p) != 8) {
35008 44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	743 PyErr_SetString(PyExc_EOFError,
44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	744 "EOF read where object expected");
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	745 retval = NULL;
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	746 break;
35008 44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	747 }
44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	748 c.imag = _PyFloat_Unpack8(buf, 1);
44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	749 if (c.imag == -1.0 && PyErr_Occurred()) {
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	750 retval = NULL;
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	751 break;
35008 44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	752 }
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	753 retval = PyComplex_FromCComplex(c);
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	754 break;
35008 44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	755 }
3323 6098aaa8ae7f changes for complex numbers Guido van Rossum <guido@python.org> parents: 3234 diff changeset	756 #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	757
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	758 case TYPE_STRING:
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	759 n = r_long(p);
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	760 if (n < 0 \|\| n > INT_MAX) {
52171 4e927faf30ea Merged revisions 70378 via svnmerge from Nick Coghlan <ncoghlan@gmail.com> parents: 49057 diff changeset	761 PyErr_SetString(PyExc_ValueError, "bad marshal data (string size out of range)");
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	762 retval = NULL;
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	763 break;
8465 0e6fbbe3b63c When unmarshalling, add test for negative lengths on strings, tuples Guido van Rossum <guido@python.org> parents: 8329 diff changeset	764 }
47301 23ab586c427a Renamed PyString to PyBytes Christian Heimes <christian@cheimes.de> parents: 47300 diff changeset	765 v = PyBytes_FromStringAndSize((char *)NULL, n);
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	766 if (v == NULL) {
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	767 retval = NULL;
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	768 break;
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	769 }
47301 23ab586c427a Renamed PyString to PyBytes Christian Heimes <christian@cheimes.de> parents: 47300 diff changeset	770 if (r_string(PyBytes_AS_STRING(v), (int)n, p) != n) {
35010 8e9682fd57f8 Fix a couple of crashing-on-malformed data marshal bugs. Michael W. Hudson <mwh@python.net> parents: 35008 diff changeset	771 Py_DECREF(v);
8e9682fd57f8 Fix a couple of crashing-on-malformed data marshal bugs. Michael W. Hudson <mwh@python.net> parents: 35008 diff changeset	772 PyErr_SetString(PyExc_EOFError,
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	773 "EOF read where object expected");
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	774 retval = NULL;
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	775 break;
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	776 }
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	777 retval = v;
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	778 break;
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	779
11976 513354d87a85 Marc-Andre Lemburg: support marshalling Unicode objects (code 'u'). Guido van Rossum <guido@python.org> parents: 9300 diff changeset	780 case TYPE_UNICODE:
513354d87a85 Marc-Andre Lemburg: support marshalling Unicode objects (code 'u'). Guido van Rossum <guido@python.org> parents: 9300 diff changeset	781 {
513354d87a85 Marc-Andre Lemburg: support marshalling Unicode objects (code 'u'). Guido van Rossum <guido@python.org> parents: 9300 diff changeset	782 char *buffer;
513354d87a85 Marc-Andre Lemburg: support marshalling Unicode objects (code 'u'). Guido van Rossum <guido@python.org> parents: 9300 diff changeset	783
513354d87a85 Marc-Andre Lemburg: support marshalling Unicode objects (code 'u'). Guido van Rossum <guido@python.org> parents: 9300 diff changeset	784 n = r_long(p);
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	785 if (n < 0 \|\| n > INT_MAX) {
52171 4e927faf30ea Merged revisions 70378 via svnmerge from Nick Coghlan <ncoghlan@gmail.com> parents: 49057 diff changeset	786 PyErr_SetString(PyExc_ValueError, "bad marshal data (unicode size out of range)");
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	787 retval = NULL;
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	788 break;
11976 513354d87a85 Marc-Andre Lemburg: support marshalling Unicode objects (code 'u'). Guido van Rossum <guido@python.org> parents: 9300 diff changeset	789 }
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12135 diff changeset	790 buffer = PyMem_NEW(char, n);
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	791 if (buffer == NULL) {
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	792 retval = PyErr_NoMemory();
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	793 break;
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	794 }
11976 513354d87a85 Marc-Andre Lemburg: support marshalling Unicode objects (code 'u'). Guido van Rossum <guido@python.org> parents: 9300 diff changeset	795 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	796 PyMem_DEL(buffer);
11976 513354d87a85 Marc-Andre Lemburg: support marshalling Unicode objects (code 'u'). Guido van Rossum <guido@python.org> parents: 9300 diff changeset	797 PyErr_SetString(PyExc_EOFError,
513354d87a85 Marc-Andre Lemburg: support marshalling Unicode objects (code 'u'). Guido van Rossum <guido@python.org> parents: 9300 diff changeset	798 "EOF read where object expected");
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	799 retval = NULL;
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	800 break;
11976 513354d87a85 Marc-Andre Lemburg: support marshalling Unicode objects (code 'u'). Guido van Rossum <guido@python.org> parents: 9300 diff changeset	801 }
513354d87a85 Marc-Andre Lemburg: support marshalling Unicode objects (code 'u'). Guido van Rossum <guido@python.org> parents: 9300 diff changeset	802 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	803 PyMem_DEL(buffer);
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	804 retval = v;
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	805 break;
11976 513354d87a85 Marc-Andre Lemburg: support marshalling Unicode objects (code 'u'). Guido van Rossum <guido@python.org> parents: 9300 diff changeset	806 }
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	807
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	808 case TYPE_TUPLE:
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	809 n = r_long(p);
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	810 if (n < 0 \|\| n > INT_MAX) {
52171 4e927faf30ea Merged revisions 70378 via svnmerge from Nick Coghlan <ncoghlan@gmail.com> parents: 49057 diff changeset	811 PyErr_SetString(PyExc_ValueError, "bad marshal data (tuple size out of range)");
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	812 retval = NULL;
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	813 break;
8465 0e6fbbe3b63c When unmarshalling, add test for negative lengths on strings, tuples Guido van Rossum <guido@python.org> parents: 8329 diff changeset	814 }
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	815 v = PyTuple_New((int)n);
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	816 if (v == NULL) {
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	817 retval = NULL;
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	818 break;
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	819 }
3234 aafe7d634985 Made a bit more robust against out-of-memory situations Jack Jansen <jack.jansen@cwi.nl> parents: 3012 diff changeset	820 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	821 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	822 if ( v2 == NULL ) {
31824 331de8b9d1ed Marshal clean-up (SF patch #873224) Armin Rigo <arigo@tunes.org> parents: 30311 diff changeset	823 if (!PyErr_Occurred())
331de8b9d1ed Marshal clean-up (SF patch #873224) Armin Rigo <arigo@tunes.org> parents: 30311 diff changeset	824 PyErr_SetString(PyExc_TypeError,
52171 4e927faf30ea Merged revisions 70378 via svnmerge from Nick Coghlan <ncoghlan@gmail.com> parents: 49057 diff changeset	825 "NULL object in marshal data for tuple");
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	826 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	827 v = NULL;
aafe7d634985 Made a bit more robust against out-of-memory situations Jack Jansen <jack.jansen@cwi.nl> parents: 3012 diff changeset	828 break;
aafe7d634985 Made a bit more robust against out-of-memory situations Jack Jansen <jack.jansen@cwi.nl> parents: 3012 diff changeset	829 }
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	830 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	831 }
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	832 retval = v;
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	833 break;
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	834
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	835 case TYPE_LIST:
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	836 n = r_long(p);
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	837 if (n < 0 \|\| n > INT_MAX) {
52171 4e927faf30ea Merged revisions 70378 via svnmerge from Nick Coghlan <ncoghlan@gmail.com> parents: 49057 diff changeset	838 PyErr_SetString(PyExc_ValueError, "bad marshal data (list size out of range)");
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	839 retval = NULL;
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	840 break;
8465 0e6fbbe3b63c When unmarshalling, add test for negative lengths on strings, tuples Guido van Rossum <guido@python.org> parents: 8329 diff changeset	841 }
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	842 v = PyList_New((int)n);
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	843 if (v == NULL) {
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	844 retval = NULL;
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	845 break;
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	846 }
3234 aafe7d634985 Made a bit more robust against out-of-memory situations Jack Jansen <jack.jansen@cwi.nl> parents: 3012 diff changeset	847 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	848 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	849 if ( v2 == NULL ) {
31824 331de8b9d1ed Marshal clean-up (SF patch #873224) Armin Rigo <arigo@tunes.org> parents: 30311 diff changeset	850 if (!PyErr_Occurred())
331de8b9d1ed Marshal clean-up (SF patch #873224) Armin Rigo <arigo@tunes.org> parents: 30311 diff changeset	851 PyErr_SetString(PyExc_TypeError,
52171 4e927faf30ea Merged revisions 70378 via svnmerge from Nick Coghlan <ncoghlan@gmail.com> parents: 49057 diff changeset	852 "NULL object in marshal data for list");
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	853 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	854 v = NULL;
aafe7d634985 Made a bit more robust against out-of-memory situations Jack Jansen <jack.jansen@cwi.nl> parents: 3012 diff changeset	855 break;
aafe7d634985 Made a bit more robust against out-of-memory situations Jack Jansen <jack.jansen@cwi.nl> parents: 3012 diff changeset	856 }
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	857 PyList_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	858 }
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	859 retval = v;
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	860 break;
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	861
279 9c924f9c3b16 Add marshalling for dictionaries. Guido van Rossum <guido@python.org> parents: 272 diff changeset	862 case TYPE_DICT:
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	863 v = PyDict_New();
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	864 if (v == NULL) {
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	865 retval = NULL;
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	866 break;
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	867 }
279 9c924f9c3b16 Add marshalling for dictionaries. Guido van Rossum <guido@python.org> parents: 272 diff changeset	868 for (;;) {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	869 PyObject key, val;
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	870 key = r_object(p);
279 9c924f9c3b16 Add marshalling for dictionaries. Guido van Rossum <guido@python.org> parents: 272 diff changeset	871 if (key == NULL)
31824 331de8b9d1ed Marshal clean-up (SF patch #873224) Armin Rigo <arigo@tunes.org> parents: 30311 diff changeset	872 break;
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	873 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	874 if (val != NULL)
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	875 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	876 Py_DECREF(key);
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	877 Py_XDECREF(val);
279 9c924f9c3b16 Add marshalling for dictionaries. Guido van Rossum <guido@python.org> parents: 272 diff changeset	878 }
31824 331de8b9d1ed Marshal clean-up (SF patch #873224) Armin Rigo <arigo@tunes.org> parents: 30311 diff changeset	879 if (PyErr_Occurred()) {
331de8b9d1ed Marshal clean-up (SF patch #873224) Armin Rigo <arigo@tunes.org> parents: 30311 diff changeset	880 Py_DECREF(v);
331de8b9d1ed Marshal clean-up (SF patch #873224) Armin Rigo <arigo@tunes.org> parents: 30311 diff changeset	881 v = NULL;
331de8b9d1ed Marshal clean-up (SF patch #873224) Armin Rigo <arigo@tunes.org> parents: 30311 diff changeset	882 }
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	883 retval = v;
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	884 break;
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	885
34394 b480abaf1f6f SF 1098985: set objects cannot be marshalled Raymond Hettinger <python@rcn.com> parents: 34205 diff changeset	886 case TYPE_SET:
b480abaf1f6f SF 1098985: set objects cannot be marshalled Raymond Hettinger <python@rcn.com> parents: 34205 diff changeset	887 case TYPE_FROZENSET:
b480abaf1f6f SF 1098985: set objects cannot be marshalled Raymond Hettinger <python@rcn.com> parents: 34205 diff changeset	888 n = r_long(p);
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	889 if (n < 0 \|\| n > INT_MAX) {
52171 4e927faf30ea Merged revisions 70378 via svnmerge from Nick Coghlan <ncoghlan@gmail.com> parents: 49057 diff changeset	890 PyErr_SetString(PyExc_ValueError, "bad marshal data (set size out of range)");
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	891 retval = NULL;
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	892 break;
34394 b480abaf1f6f SF 1098985: set objects cannot be marshalled Raymond Hettinger <python@rcn.com> parents: 34205 diff changeset	893 }
45044 c3b38a85989f Merged revisions 60383-60407 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	894 v = (type == TYPE_SET) ? PySet_New(NULL) : PyFrozenSet_New(NULL);
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	895 if (v == NULL) {
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	896 retval = NULL;
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	897 break;
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	898 }
34394 b480abaf1f6f SF 1098985: set objects cannot be marshalled Raymond Hettinger <python@rcn.com> parents: 34205 diff changeset	899 for (i = 0; i < n; i++) {
b480abaf1f6f SF 1098985: set objects cannot be marshalled Raymond Hettinger <python@rcn.com> parents: 34205 diff changeset	900 v2 = r_object(p);
b480abaf1f6f SF 1098985: set objects cannot be marshalled Raymond Hettinger <python@rcn.com> parents: 34205 diff changeset	901 if ( v2 == NULL ) {
b480abaf1f6f SF 1098985: set objects cannot be marshalled Raymond Hettinger <python@rcn.com> parents: 34205 diff changeset	902 if (!PyErr_Occurred())
b480abaf1f6f SF 1098985: set objects cannot be marshalled Raymond Hettinger <python@rcn.com> parents: 34205 diff changeset	903 PyErr_SetString(PyExc_TypeError,
52171 4e927faf30ea Merged revisions 70378 via svnmerge from Nick Coghlan <ncoghlan@gmail.com> parents: 49057 diff changeset	904 "NULL object in marshal data for set");
34394 b480abaf1f6f SF 1098985: set objects cannot be marshalled Raymond Hettinger <python@rcn.com> parents: 34205 diff changeset	905 Py_DECREF(v);
b480abaf1f6f SF 1098985: set objects cannot be marshalled Raymond Hettinger <python@rcn.com> parents: 34205 diff changeset	906 v = NULL;
b480abaf1f6f SF 1098985: set objects cannot be marshalled Raymond Hettinger <python@rcn.com> parents: 34205 diff changeset	907 break;
b480abaf1f6f SF 1098985: set objects cannot be marshalled Raymond Hettinger <python@rcn.com> parents: 34205 diff changeset	908 }
45044 c3b38a85989f Merged revisions 60383-60407 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	909 if (PySet_Add(v, v2) == -1) {
c3b38a85989f Merged revisions 60383-60407 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	910 Py_DECREF(v);
c3b38a85989f Merged revisions 60383-60407 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	911 Py_DECREF(v2);
c3b38a85989f Merged revisions 60383-60407 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	912 v = NULL;
c3b38a85989f Merged revisions 60383-60407 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	913 break;
c3b38a85989f Merged revisions 60383-60407 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	914 }
45082 d7540031b959 Merged revisions 60475-60479,60481-60488 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45071 diff changeset	915 Py_DECREF(v2);
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	916 }
45044 c3b38a85989f Merged revisions 60383-60407 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	917 retval = v;
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	918 break;
34394 b480abaf1f6f SF 1098985: set objects cannot be marshalled Raymond Hettinger <python@rcn.com> parents: 34205 diff changeset	919
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	920 case TYPE_CODE:
41715 f60c877d52c8 Merged revisions 55270-55324 via svnmerge from Guido van Rossum <guido@python.org> parents: 41653 diff changeset	921 {
35008 44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	922 int argcount;
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39610 diff changeset	923 int kwonlyargcount;
35008 44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	924 int nlocals;
44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	925 int stacksize;
44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	926 int flags;
44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	927 PyObject *code = NULL;
44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	928 PyObject *consts = NULL;
44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	929 PyObject *names = NULL;
44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	930 PyObject *varnames = NULL;
44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	931 PyObject *freevars = NULL;
44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	932 PyObject *cellvars = NULL;
44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	933 PyObject *filename = NULL;
44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	934 PyObject *name = NULL;
44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	935 int firstlineno;
44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	936 PyObject *lnotab = NULL;
44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	937
44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	938 v = 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	939
41715 f60c877d52c8 Merged revisions 55270-55324 via svnmerge from Guido van Rossum <guido@python.org> parents: 41653 diff changeset	940 /* XXX ignore long->int overflows for now */
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	941 argcount = (int)r_long(p);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	942 kwonlyargcount = (int)r_long(p);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	943 nlocals = (int)r_long(p);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	944 stacksize = (int)r_long(p);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	945 flags = (int)r_long(p);
35008 44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	946 code = r_object(p);
44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	947 if (code == NULL)
44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	948 goto code_error;
44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	949 consts = r_object(p);
44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	950 if (consts == NULL)
44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	951 goto code_error;
44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	952 names = r_object(p);
44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	953 if (names == NULL)
44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	954 goto code_error;
44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	955 varnames = r_object(p);
44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	956 if (varnames == NULL)
44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	957 goto code_error;
44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	958 freevars = r_object(p);
44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	959 if (freevars == NULL)
44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	960 goto code_error;
44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	961 cellvars = r_object(p);
44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	962 if (cellvars == NULL)
44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	963 goto code_error;
44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	964 filename = r_object(p);
44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	965 if (filename == NULL)
44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	966 goto code_error;
44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	967 name = r_object(p);
44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	968 if (name == NULL)
44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	969 goto code_error;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	970 firstlineno = (int)r_long(p);
35008 44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	971 lnotab = r_object(p);
44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	972 if (lnotab == NULL)
44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	973 goto code_error;
44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	974
44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	975 v = (PyObject *) PyCode_New(
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39610 diff changeset	976 argcount, kwonlyargcount,
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39610 diff changeset	977 nlocals, stacksize, flags,
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2503 diff changeset	978 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	979 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	980 firstlineno, lnotab);
35008 44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	981
44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	982 code_error:
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	983 Py_XDECREF(code);
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	984 Py_XDECREF(consts);
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	985 Py_XDECREF(names);
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	986 Py_XDECREF(varnames);
16257 fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 15979 diff changeset	987 Py_XDECREF(freevars);
fd8c7203251f PEP 227 implementation Jeremy Hylton <jeremy@alum.mit.edu> parents: 15979 diff changeset	988 Py_XDECREF(cellvars);
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	989 Py_XDECREF(filename);
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	990 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	991 Py_XDECREF(lnotab);
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	992 }
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	993 retval = v;
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	994 break;
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	995
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	996 default:
3731 de1cb33219e3 Jeremy's patches for more robust handling of unmarshallable types. Guido van Rossum <guido@python.org> parents: 3620 diff changeset	997 /* 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	998 This will let you keep working and recover. */
52171 4e927faf30ea Merged revisions 70378 via svnmerge from Nick Coghlan <ncoghlan@gmail.com> parents: 49057 diff changeset	999 PyErr_SetString(PyExc_ValueError, "bad marshal data (unknown type code)");
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	1000 retval = NULL;
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	1001 break;
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	1002
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1003 }
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	1004 p->depth--;
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	1005 return retval;
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1006 }
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1007
32343 54b257e55f99 Make private function static Neal Norwitz <nnorwitz@gmail.com> parents: 32305 diff changeset	1008 static PyObject *
31824 331de8b9d1ed Marshal clean-up (SF patch #873224) Armin Rigo <arigo@tunes.org> parents: 30311 diff changeset	1009 read_object(RFILE *p)
331de8b9d1ed Marshal clean-up (SF patch #873224) Armin Rigo <arigo@tunes.org> parents: 30311 diff changeset	1010 {
331de8b9d1ed Marshal clean-up (SF patch #873224) Armin Rigo <arigo@tunes.org> parents: 30311 diff changeset	1011 PyObject *v;
331de8b9d1ed Marshal clean-up (SF patch #873224) Armin Rigo <arigo@tunes.org> parents: 30311 diff changeset	1012 if (PyErr_Occurred()) {
331de8b9d1ed Marshal clean-up (SF patch #873224) Armin Rigo <arigo@tunes.org> parents: 30311 diff changeset	1013 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	1014 return NULL;
331de8b9d1ed Marshal clean-up (SF patch #873224) Armin Rigo <arigo@tunes.org> parents: 30311 diff changeset	1015 }
331de8b9d1ed Marshal clean-up (SF patch #873224) Armin Rigo <arigo@tunes.org> parents: 30311 diff changeset	1016 v = r_object(p);
331de8b9d1ed Marshal clean-up (SF patch #873224) Armin Rigo <arigo@tunes.org> parents: 30311 diff changeset	1017 if (v == NULL && !PyErr_Occurred())
52171 4e927faf30ea Merged revisions 70378 via svnmerge from Nick Coghlan <ncoghlan@gmail.com> parents: 49057 diff changeset	1018 PyErr_SetString(PyExc_TypeError, "NULL object in marshal data for object");
31824 331de8b9d1ed Marshal clean-up (SF patch #873224) Armin Rigo <arigo@tunes.org> parents: 30311 diff changeset	1019 return v;
331de8b9d1ed Marshal clean-up (SF patch #873224) Armin Rigo <arigo@tunes.org> parents: 30311 diff changeset	1020 }
331de8b9d1ed Marshal clean-up (SF patch #873224) Armin Rigo <arigo@tunes.org> parents: 30311 diff changeset	1021
20552 65dd6157f999 SF patch #470393 (Jim Ahlstrom): Add missing marshal function Guido van Rossum <guido@python.org> parents: 19605 diff changeset	1022 int
65dd6157f999 SF patch #470393 (Jim Ahlstrom): Add missing marshal function Guido van Rossum <guido@python.org> parents: 19605 diff changeset	1023 PyMarshal_ReadShortFromFile(FILE *fp)
65dd6157f999 SF patch #470393 (Jim Ahlstrom): Add missing marshal function Guido van Rossum <guido@python.org> parents: 19605 diff changeset	1024 {
65dd6157f999 SF patch #470393 (Jim Ahlstrom): Add missing marshal function Guido van Rossum <guido@python.org> parents: 19605 diff changeset	1025 RFILE rf;
36783 965bb4a54096 Fix gcc (4.0.x) warning about use of uninitialized variables. Thomas Wouters <thomas@python.org> parents: 36522 diff changeset	1026 assert(fp);
20552 65dd6157f999 SF patch #470393 (Jim Ahlstrom): Add missing marshal function Guido van Rossum <guido@python.org> parents: 19605 diff changeset	1027 rf.fp = fp;
36784 d853bc06847e Fix incompatible assignment warning from previous checkin. Thomas Wouters <thomas@python.org> parents: 36783 diff changeset	1028 rf.strings = NULL;
d853bc06847e Fix incompatible assignment warning from previous checkin. Thomas Wouters <thomas@python.org> parents: 36783 diff changeset	1029 rf.end = rf.ptr = NULL;
20552 65dd6157f999 SF patch #470393 (Jim Ahlstrom): Add missing marshal function Guido van Rossum <guido@python.org> parents: 19605 diff changeset	1030 return r_short(&rf);
65dd6157f999 SF patch #470393 (Jim Ahlstrom): Add missing marshal function Guido van Rossum <guido@python.org> parents: 19605 diff changeset	1031 }
65dd6157f999 SF patch #470393 (Jim Ahlstrom): Add missing marshal function Guido van Rossum <guido@python.org> parents: 19605 diff changeset	1032
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	1033 long
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13447 diff changeset	1034 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	1035 {
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	1036 RFILE rf;
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	1037 rf.fp = fp;
32422 3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	1038 rf.strings = NULL;
43734 3e5edf19d5f0 Merged revisions 58221-58741 via svnmerge from Guido van Rossum <guido@python.org> parents: 43423 diff changeset	1039 rf.ptr = rf.end = NULL;
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	1040 return r_long(&rf);
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	1041 }
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	1042
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	1043 #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	1044 /* 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	1045 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	1046 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	1047 {
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	1048 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	1049 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	1050 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	1051 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	1052 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	1053 }
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	1054 #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	1055
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	1056 /* 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	1057 * 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	1058 * 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	1059 * 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	1060 * 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	1061 */
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	1062 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	1063 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	1064 {
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	1065 /* 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	1066 * 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	1067 */
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	1068 #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	1069 #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	1070 #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	1071 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	1072 #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	1073 #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	1074 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	1075 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	1076 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	1077 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	1078 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	1079 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	1080 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	1081 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	1082 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	1083 PyObject* v;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	1084 size_t n;
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	1085 /* filesize must fit into an int, because it
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	1086 is smaller than REASONABLE_FILE_LIMIT */
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	1087 n = fread(pBuf, 1, (int)filesize, fp);
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	1088 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	1089 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	1090 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	1091 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	1092 }
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	1093
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	1094 }
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	1095 #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	1096 /* 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	1097 * 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	1098 */
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	1099 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	1100
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	1101 #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	1102 #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	1103 }
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	1104
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	1105 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	1106 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	1107 {
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	1108 RFILE rf;
32422 3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	1109 PyObject *result;
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	1110 rf.fp = fp;
32422 3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	1111 rf.strings = PyList_New(0);
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	1112 rf.depth = 0;
43734 3e5edf19d5f0 Merged revisions 58221-58741 via svnmerge from Guido van Rossum <guido@python.org> parents: 43423 diff changeset	1113 rf.ptr = rf.end = NULL;
32422 3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	1114 result = r_object(&rf);
3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	1115 Py_DECREF(rf.strings);
3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	1116 return result;
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	1117 }
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	1118
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	1119 PyObject *
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	1120 PyMarshal_ReadObjectFromString(char *str, Py_ssize_t len)
1270 14369a5e6167 Support for frozen scripts; added -i option. Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1121 {
14369a5e6167 Support for frozen scripts; added -i option. Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1122 RFILE rf;
32422 3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	1123 PyObject *result;
1270 14369a5e6167 Support for frozen scripts; added -i option. Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1124 rf.fp = NULL;
14369a5e6167 Support for frozen scripts; added -i option. Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1125 rf.ptr = str;
14369a5e6167 Support for frozen scripts; added -i option. Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1126 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	1127 rf.strings = PyList_New(0);
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	1128 rf.depth = 0;
32422 3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	1129 result = r_object(&rf);
3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	1130 Py_DECREF(rf.strings);
3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	1131 return result;
1270 14369a5e6167 Support for frozen scripts; added -i option. Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1132 }
14369a5e6167 Support for frozen scripts; added -i option. Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1133
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	1134 PyObject *
32422 3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	1135 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	1136 {
23f280ab5409 Added PyMarshal_WriteObjectToString() (moved the relevant code there Guido van Rossum <guido@python.org>* parents: 3839 diff changeset	1137 WFILE wf;
41653 52533370f1ad Make test_marshal pass. Not my best work. :-( Guido van Rossum <guido@python.org> parents: 41595 diff changeset	1138 PyObject *res = NULL;
52533370f1ad Make test_marshal pass. Not my best work. :-( Guido van Rossum <guido@python.org> parents: 41595 diff changeset	1139
4039 23f280ab5409 Added PyMarshal_WriteObjectToString() (moved the relevant code there Guido van Rossum <guido@python.org>* parents: 3839 diff changeset	1140 wf.fp = NULL;
47301 23ab586c427a Renamed PyString to PyBytes Christian Heimes <christian@cheimes.de> parents: 47300 diff changeset	1141 wf.str = PyBytes_FromStringAndSize((char *)NULL, 50);
4039 23f280ab5409 Added PyMarshal_WriteObjectToString() (moved the relevant code there Guido van Rossum <guido@python.org>* parents: 3839 diff changeset	1142 if (wf.str == NULL)
23f280ab5409 Added PyMarshal_WriteObjectToString() (moved the relevant code there Guido van Rossum <guido@python.org>* parents: 3839 diff changeset	1143 return NULL;
47301 23ab586c427a Renamed PyString to PyBytes Christian Heimes <christian@cheimes.de> parents: 47300 diff changeset	1144 wf.ptr = PyBytes_AS_STRING((PyBytesObject *)wf.str);
23ab586c427a Renamed PyString to PyBytes Christian Heimes <christian@cheimes.de> parents: 47300 diff changeset	1145 wf.end = wf.ptr + PyBytes_Size(wf.str);
4039 23f280ab5409 Added PyMarshal_WriteObjectToString() (moved the relevant code there Guido van Rossum <guido@python.org>* parents: 3839 diff changeset	1146 wf.error = 0;
13070 7392e71f6cce Michael Hudson <mwh21@cam.ac.uk>: Fred Drake <fdrake@acm.org> parents: 12576 diff changeset	1147 wf.depth = 0;
35008 44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	1148 wf.version = version;
32422 3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	1149 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	1150 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	1151 Py_XDECREF(wf.strings);
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1152 if (wf.str != NULL) {
47301 23ab586c427a Renamed PyString to PyBytes Christian Heimes <christian@cheimes.de> parents: 47300 diff changeset	1153 char base = PyBytes_AS_STRING((PyBytesObject )wf.str);
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1154 if (wf.ptr - base > PY_SSIZE_T_MAX) {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1155 Py_DECREF(wf.str);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1156 PyErr_SetString(PyExc_OverflowError,
41595 2c54763c4504 More coding by random modification. Guido van Rossum <guido@python.org> parents: 41587 diff changeset	1157 "too much marshal data for a string");
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1158 return NULL;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1159 }
47301 23ab586c427a Renamed PyString to PyBytes Christian Heimes <christian@cheimes.de> parents: 47300 diff changeset	1160 if (_PyBytes_Resize(&wf.str, (Py_ssize_t)(wf.ptr - base)) < 0)
41653 52533370f1ad Make test_marshal pass. Not my best work. :-( Guido van Rossum <guido@python.org> parents: 41595 diff changeset	1161 return NULL;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1162 }
4039 23f280ab5409 Added PyMarshal_WriteObjectToString() (moved the relevant code there Guido van Rossum <guido@python.org>* parents: 3839 diff changeset	1163 if (wf.error) {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	1164 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	1165 PyErr_SetString(PyExc_ValueError,
13070 7392e71f6cce Michael Hudson <mwh21@cam.ac.uk>: Fred Drake <fdrake@acm.org> parents: 12576 diff changeset	1166 (wf.error==1)?"unmarshallable object"
7392e71f6cce Michael Hudson <mwh21@cam.ac.uk>: Fred Drake <fdrake@acm.org> parents: 12576 diff changeset	1167 :"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	1168 return NULL;
23f280ab5409 Added PyMarshal_WriteObjectToString() (moved the relevant code there Guido van Rossum <guido@python.org>* parents: 3839 diff changeset	1169 }
41653 52533370f1ad Make test_marshal pass. Not my best work. :-( Guido van Rossum <guido@python.org> parents: 41595 diff changeset	1170 if (wf.str != NULL) {
52533370f1ad Make test_marshal pass. Not my best work. :-( Guido van Rossum <guido@python.org> parents: 41595 diff changeset	1171 /* XXX Quick hack -- need to do this differently */
49057 8ffec372040e fixes deferred/release blocker issue #3797: Fixed the dbm, marshal, mmap, Gregory P. Smith <greg@mad-scientist.com> parents: 48683 diff changeset	1172 res = PyBytes_FromObject(wf.str);
41653 52533370f1ad Make test_marshal pass. Not my best work. :-( Guido van Rossum <guido@python.org> parents: 41595 diff changeset	1173 Py_DECREF(wf.str);
52533370f1ad Make test_marshal pass. Not my best work. :-( Guido van Rossum <guido@python.org> parents: 41595 diff changeset	1174 }
52533370f1ad Make test_marshal pass. Not my best work. :-( Guido van Rossum <guido@python.org> parents: 41595 diff changeset	1175 return res;
4039 23f280ab5409 Added PyMarshal_WriteObjectToString() (moved the relevant code there Guido van Rossum <guido@python.org>* parents: 3839 diff changeset	1176 }
23f280ab5409 Added PyMarshal_WriteObjectToString() (moved the relevant code there Guido van Rossum <guido@python.org>* parents: 3839 diff changeset	1177
279 9c924f9c3b16 Add marshalling for dictionaries. Guido van Rossum <guido@python.org> parents: 272 diff changeset	1178 /* And an interface for Python programs... */
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1179
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	1180 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13447 diff changeset	1181 marshal_dump(PyObject self, PyObject args)
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1182 {
42071 825041fc8e2c Rip out the file object's implementation. Guido van Rossum <guido@python.org> parents: 41824 diff changeset	1183 /* XXX Quick hack -- need to do this differently */
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	1184 PyObject *x;
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	1185 PyObject *f;
32422 3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	1186 int version = Py_MARSHAL_VERSION;
42071 825041fc8e2c Rip out the file object's implementation. Guido van Rossum <guido@python.org> parents: 41824 diff changeset	1187 PyObject *s;
825041fc8e2c Rip out the file object's implementation. Guido van Rossum <guido@python.org> parents: 41824 diff changeset	1188 PyObject *res;
32422 3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	1189 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	1190 return NULL;
42071 825041fc8e2c Rip out the file object's implementation. Guido van Rossum <guido@python.org> parents: 41824 diff changeset	1191 s = PyMarshal_WriteObjectToString(x, version);
825041fc8e2c Rip out the file object's implementation. Guido van Rossum <guido@python.org> parents: 41824 diff changeset	1192 if (s == NULL)
3731 de1cb33219e3 Jeremy's patches for more robust handling of unmarshallable types. Guido van Rossum <guido@python.org> parents: 3620 diff changeset	1193 return NULL;
42071 825041fc8e2c Rip out the file object's implementation. Guido van Rossum <guido@python.org> parents: 41824 diff changeset	1194 res = PyObject_CallMethod(f, "write", "O", s);
825041fc8e2c Rip out the file object's implementation. Guido van Rossum <guido@python.org> parents: 41824 diff changeset	1195 Py_DECREF(s);
825041fc8e2c Rip out the file object's implementation. Guido van Rossum <guido@python.org> parents: 41824 diff changeset	1196 return res;
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1197 }
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1198
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	1199 static PyObject *
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 36866 diff changeset	1200 marshal_load(PyObject self, PyObject f)
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1201 {
42071 825041fc8e2c Rip out the file object's implementation. Guido van Rossum <guido@python.org> parents: 41824 diff changeset	1202 /* XXX Quick hack -- need to do this differently */
825041fc8e2c Rip out the file object's implementation. Guido van Rossum <guido@python.org> parents: 41824 diff changeset	1203 PyObject data, result;
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	1204 RFILE rf;
42071 825041fc8e2c Rip out the file object's implementation. Guido van Rossum <guido@python.org> parents: 41824 diff changeset	1205 data = PyObject_CallMethod(f, "read", "");
825041fc8e2c Rip out the file object's implementation. Guido van Rossum <guido@python.org> parents: 41824 diff changeset	1206 if (data == NULL)
825041fc8e2c Rip out the file object's implementation. Guido van Rossum <guido@python.org> parents: 41824 diff changeset	1207 return NULL;
825041fc8e2c Rip out the file object's implementation. Guido van Rossum <guido@python.org> parents: 41824 diff changeset	1208 rf.fp = NULL;
47301 23ab586c427a Renamed PyString to PyBytes Christian Heimes <christian@cheimes.de> parents: 47300 diff changeset	1209 if (PyBytes_Check(data)) {
23ab586c427a Renamed PyString to PyBytes Christian Heimes <christian@cheimes.de> parents: 47300 diff changeset	1210 rf.ptr = PyBytes_AS_STRING(data);
23ab586c427a Renamed PyString to PyBytes Christian Heimes <christian@cheimes.de> parents: 47300 diff changeset	1211 rf.end = rf.ptr + PyBytes_GET_SIZE(data);
42071 825041fc8e2c Rip out the file object's implementation. Guido van Rossum <guido@python.org> parents: 41824 diff changeset	1212 }
49057 8ffec372040e fixes deferred/release blocker issue #3797: Fixed the dbm, marshal, mmap, Gregory P. Smith <greg@mad-scientist.com> parents: 48683 diff changeset	1213 else if (PyBytes_Check(data)) {
8ffec372040e fixes deferred/release blocker issue #3797: Fixed the dbm, marshal, mmap, Gregory P. Smith <greg@mad-scientist.com> parents: 48683 diff changeset	1214 rf.ptr = PyBytes_AS_STRING(data);
8ffec372040e fixes deferred/release blocker issue #3797: Fixed the dbm, marshal, mmap, Gregory P. Smith <greg@mad-scientist.com> parents: 48683 diff changeset	1215 rf.end = rf.ptr + PyBytes_GET_SIZE(data);
42071 825041fc8e2c Rip out the file object's implementation. Guido van Rossum <guido@python.org> parents: 41824 diff changeset	1216 }
825041fc8e2c Rip out the file object's implementation. Guido van Rossum <guido@python.org> parents: 41824 diff changeset	1217 else {
825041fc8e2c Rip out the file object's implementation. Guido van Rossum <guido@python.org> parents: 41824 diff changeset	1218 PyErr_Format(PyExc_TypeError,
825041fc8e2c Rip out the file object's implementation. Guido van Rossum <guido@python.org> parents: 41824 diff changeset	1219 "f.read() returned neither string "
825041fc8e2c Rip out the file object's implementation. Guido van Rossum <guido@python.org> parents: 41824 diff changeset	1220 "nor bytes but %.100s",
825041fc8e2c Rip out the file object's implementation. Guido van Rossum <guido@python.org> parents: 41824 diff changeset	1221 data->ob_type->tp_name);
41653 52533370f1ad Make test_marshal pass. Not my best work. :-( Guido van Rossum <guido@python.org> parents: 41595 diff changeset	1222 Py_DECREF(data);
42071 825041fc8e2c Rip out the file object's implementation. Guido van Rossum <guido@python.org> parents: 41824 diff changeset	1223 return NULL;
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1224 }
32422 3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	1225 rf.strings = PyList_New(0);
42404 0c300b29200c Add a missing "rf.depth = 0;" to marshal_load(). Guido van Rossum <guido@python.org> parents: 42334 diff changeset	1226 rf.depth = 0;
32422 3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	1227 result = read_object(&rf);
3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	1228 Py_DECREF(rf.strings);
42071 825041fc8e2c Rip out the file object's implementation. Guido van Rossum <guido@python.org> parents: 41824 diff changeset	1229 Py_DECREF(data);
32422 3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	1230 return result;
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	1231 }
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	1232
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	1233 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13447 diff changeset	1234 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	1235 {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	1236 PyObject *x;
32422 3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	1237 int version = Py_MARSHAL_VERSION;
34205 ea340006c1f3 Back-ported: marshal.dumps() with the new optional argument 'version' just Armin Rigo <arigo@tunes.org> parents: 32422 diff changeset	1238 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	1239 return NULL;
32422 3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	1240 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	1241 }
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	1242
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	1243 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13447 diff changeset	1244 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	1245 {
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	1246 RFILE rf;
48683 cd3b0b7fd8e1 Merged revisions 65654 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 48370 diff changeset	1247 Py_buffer p;
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	1248 char *s;
36792 688795873ff1 Make Py_ssize_t clean. Thomas Wouters <thomas@python.org> parents: 36784 diff changeset	1249 Py_ssize_t n;
32422 3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	1250 PyObject* result;
48683 cd3b0b7fd8e1 Merged revisions 65654 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 48370 diff changeset	1251 if (!PyArg_ParseTuple(args, "s*:loads", &p))
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	1252 return NULL;
48683 cd3b0b7fd8e1 Merged revisions 65654 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 48370 diff changeset	1253 s = p.buf;
cd3b0b7fd8e1 Merged revisions 65654 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 48370 diff changeset	1254 n = p.len;
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	1255 rf.fp = NULL;
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	1256 rf.ptr = s;
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	1257 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	1258 rf.strings = PyList_New(0);
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	1259 rf.depth = 0;
32422 3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	1260 result = read_object(&rf);
3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	1261 Py_DECREF(rf.strings);
48683 cd3b0b7fd8e1 Merged revisions 65654 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 48370 diff changeset	1262 PyBuffer_Release(&p);
32422 3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	1263 return result;
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1264 }
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1265
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	1266 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	1267 {"dump", marshal_dump, METH_VARARGS},
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 36866 diff changeset	1268 {"load", marshal_load, METH_O},
22705 8703d2052339 Use symbolic METH_VARARGS instead of 1 for ml_flags Neal Norwitz <nnorwitz@gmail.com> parents: 20947 diff changeset	1269 {"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	1270 {"loads", marshal_loads, METH_VARARGS},
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1271 {NULL, NULL} /* sentinel */
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1272 };
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1273
48370 bfaf14295794 Rename a variable to be more in line with the name of the module. Brett Cannon <bcannon@gmail.com> parents: 48321 diff changeset	1274 static struct PyModuleDef marshalmodule = {
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47343 diff changeset	1275 PyModuleDef_HEAD_INIT,
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47343 diff changeset	1276 "marshal",
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47343 diff changeset	1277 NULL,
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47343 diff changeset	1278 0,
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47343 diff changeset	1279 marshal_methods,
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47343 diff changeset	1280 NULL,
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47343 diff changeset	1281 NULL,
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47343 diff changeset	1282 NULL,
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47343 diff changeset	1283 NULL
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47343 diff changeset	1284 };
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47343 diff changeset	1285
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47343 diff changeset	1286
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47343 diff changeset	1287
30311 f003e48f562d Bug #794140: cygwin builds do not embed Jason Tishler <jason@tishler.net> parents: 24435 diff changeset	1288 PyMODINIT_FUNC
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13447 diff changeset	1289 PyMarshal_Init(void)
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1290 {
48370 bfaf14295794 Rename a variable to be more in line with the name of the module. Brett Cannon <bcannon@gmail.com> parents: 48321 diff changeset	1291 PyObject *mod = PyModule_Create(&marshalmodule);
36324 1af7f719ed28 Check return result from Py_InitModule(). This API can fail. Neal Norwitz <nnorwitz@gmail.com>* parents: 35877 diff changeset	1292 if (mod == NULL)
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47343 diff changeset	1293 return NULL;
32422 3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	1294 PyModule_AddIntConstant(mod, "version", Py_MARSHAL_VERSION);
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47343 diff changeset	1295 return mod;
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1296 }

Mercurial > cpython-lru_cache-weakref

annotate Python/marshal.c @ 53207:fe99a562b708