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

annotate Python/marshal.c @ 13255:916fb024ce94 legacy-trunk

Change copyright notice.

author	Guido van Rossum <guido@python.org>
date	Fri, 30 Jun 2000 23:50:40 +0000
parents	a6725acdf33b
children	87ee82e5c56d

rev	line source
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1 /***********************************************************
2062 d0d0a69b5ca3 Added 1995 to copyright message. Guido van Rossum <guido@python.org> parents: 2052 diff changeset	2 Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,
d0d0a69b5ca3 Added 1995 to copyright message. Guido van Rossum <guido@python.org> parents: 2052 diff changeset	3 The Netherlands.
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	5 All Rights Reserved
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	6
13255 916fb024ce94 Change copyright notice. Guido van Rossum <guido@python.org> parents: 13106 diff changeset	7 Copyright (c) 2000, BeOpen.com.
916fb024ce94 Change copyright notice. Guido van Rossum <guido@python.org> parents: 13106 diff changeset	8 Copyright (c) 1995-2000, Corporation for National Research Initiatives.
916fb024ce94 Change copyright notice. Guido van Rossum <guido@python.org> parents: 13106 diff changeset	9 Copyright (c) 1990-1995, Stichting Mathematisch Centrum.
916fb024ce94 Change copyright notice. Guido van Rossum <guido@python.org> parents: 13106 diff changeset	10 All rights reserved.
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	11
13255 916fb024ce94 Change copyright notice. Guido van Rossum <guido@python.org> parents: 13106 diff changeset	12 See the file "Misc/COPYRIGHT" for information on usage and
916fb024ce94 Change copyright notice. Guido van Rossum <guido@python.org> parents: 13106 diff changeset	13 redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES.
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	14
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	15 ******************************************************************/
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	16
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	17 /* Write Python objects to files and read them back.
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	18 This is intended for writing and reading compiled Python code only;
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	19 a true persistent storage facility would be much harder, since
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	20 it would have to take circular links and sharing into account. */
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	21
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	22 #include "Python.h"
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	23 #include "longintrepr.h"
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	24 #include "compile.h"
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	25 #include "marshal.h"
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	26
13070 7392e71f6cce Michael Hudson <mwh21@cam.ac.uk>: Fred Drake <fdrake@acm.org> parents: 12576 diff changeset	27 /* 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	28 * 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	29 * raise an exception instead of continuing.
7392e71f6cce Michael Hudson <mwh21@cam.ac.uk>: Fred Drake <fdrake@acm.org> parents: 12576 diff changeset	30 */
7392e71f6cce Michael Hudson <mwh21@cam.ac.uk>: Fred Drake <fdrake@acm.org> parents: 12576 diff changeset	31 #define MAX_MARSHAL_STACK_DEPTH 5000
7392e71f6cce Michael Hudson <mwh21@cam.ac.uk>: Fred Drake <fdrake@acm.org> parents: 12576 diff changeset	32
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	33 #define TYPE_NULL '0'
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	34 #define TYPE_NONE 'N'
4403 3b3f7c3f6da2 Ellipses -> Ellipsis rename (the dictionary really says that it should Guido van Rossum <guido@python.org> parents: 4039 diff changeset	35 #define TYPE_ELLIPSIS '.'
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	36 #define TYPE_INT 'i'
4592 3bf9e2beaf8c Tentative changes to make this work better on 64-bit machines. Guido van Rossum <guido@python.org> parents: 4503 diff changeset	37 #define TYPE_INT64 'I'
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	38 #define TYPE_FLOAT 'f'
3323 6098aaa8ae7f changes for complex numbers Guido van Rossum <guido@python.org> parents: 3234 diff changeset	39 #define TYPE_COMPLEX 'x'
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	40 #define TYPE_LONG 'l'
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	41 #define TYPE_STRING 's'
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	42 #define TYPE_TUPLE '('
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	43 #define TYPE_LIST '['
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	44 #define TYPE_DICT '{'
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2503 diff changeset	45 #define TYPE_CODE 'c'
11976 513354d87a85 Marc-Andre Lemburg: support marshalling Unicode objects (code 'u'). Guido van Rossum <guido@python.org> parents: 9300 diff changeset	46 #define TYPE_UNICODE 'u'
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	47 #define TYPE_UNKNOWN '?'
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	48
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	49 typedef struct {
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	50 FILE *fp;
3731 de1cb33219e3 Jeremy's patches for more robust handling of unmarshallable types. Guido van Rossum <guido@python.org> parents: 3620 diff changeset	51 int error;
13070 7392e71f6cce Michael Hudson <mwh21@cam.ac.uk>: Fred Drake <fdrake@acm.org> parents: 12576 diff changeset	52 int depth;
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	53 /* 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	54 PyObject *str;
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	55 char *ptr;
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	56 char *end;
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	57 } WFILE;
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	58
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	59 #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	60 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	61 else w_more(c, p)
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	62
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	63 static void
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	64 w_more(c, p)
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	65 char c;
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	66 WFILE *p;
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	67 {
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	68 int size, newsize;
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	69 if (p->str == NULL)
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	70 return; /* An error already occurred */
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	71 size = PyString_Size(p->str);
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	72 newsize = size + 1024;
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	73 if (_PyString_Resize(&p->str, newsize) != 0) {
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	74 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	75 }
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	76 else {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	77 p->ptr = PyString_AS_STRING((PyStringObject *)p->str) + size;
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	78 p->end =
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	79 PyString_AS_STRING((PyStringObject *)p->str) + newsize;
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	80 *p->ptr++ = c;
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	81 }
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	82 }
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	83
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	84 static void
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	85 w_string(s, n, p)
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	86 char *s;
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	87 int n;
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	88 WFILE *p;
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	89 {
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	90 if (p->fp != NULL) {
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	91 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	92 }
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	93 else {
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	94 while (--n >= 0) {
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	95 w_byte(*s, p);
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	96 s++;
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	97 }
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 static void
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	102 w_short(x, p)
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	103 int x;
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	104 WFILE *p;
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	105 {
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	106 w_byte( x & 0xff, p);
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	107 w_byte((x>> 8) & 0xff, p);
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
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	110 static void
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	111 w_long(x, p)
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	112 long x;
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	113 WFILE *p;
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	114 {
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	115 w_byte((int)( x & 0xff), p);
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	116 w_byte((int)((x>> 8) & 0xff), p);
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	117 w_byte((int)((x>>16) & 0xff), p);
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	118 w_byte((int)((x>>24) & 0xff), p);
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	119 }
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	120
4656 186c2ad4abf3 Better way to handle 64-bit ints, keeping gcc -Wall happy. Guido van Rossum <guido@python.org> parents: 4592 diff changeset	121 #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	122 static void
4592 3bf9e2beaf8c Tentative changes to make this work better on 64-bit machines. Guido van Rossum <guido@python.org> parents: 4503 diff changeset	123 w_long64(x, p)
3bf9e2beaf8c Tentative changes to make this work better on 64-bit machines. Guido van Rossum <guido@python.org> parents: 4503 diff changeset	124 long x;
3bf9e2beaf8c Tentative changes to make this work better on 64-bit machines. Guido van Rossum <guido@python.org> parents: 4503 diff changeset	125 WFILE *p;
3bf9e2beaf8c Tentative changes to make this work better on 64-bit machines. Guido van Rossum <guido@python.org> parents: 4503 diff changeset	126 {
3bf9e2beaf8c Tentative changes to make this work better on 64-bit machines. Guido van Rossum <guido@python.org> parents: 4503 diff changeset	127 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	128 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	129 }
4656 186c2ad4abf3 Better way to handle 64-bit ints, keeping gcc -Wall happy. Guido van Rossum <guido@python.org> parents: 4592 diff changeset	130 #endif
4592 3bf9e2beaf8c Tentative changes to make this work better on 64-bit machines. Guido van Rossum <guido@python.org> parents: 4503 diff changeset	131
3bf9e2beaf8c Tentative changes to make this work better on 64-bit machines. Guido van Rossum <guido@python.org> parents: 4503 diff changeset	132 static void
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	133 w_object(v, p)
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	134 PyObject *v;
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	135 WFILE *p;
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	136 {
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	137 int i, n;
9293 0a67db47e1d0 Changes to support other object types besides strings Guido van Rossum <guido@python.org> parents: 8465 diff changeset	138 PyBufferProcs *pb;
13070 7392e71f6cce Michael Hudson <mwh21@cam.ac.uk>: Fred Drake <fdrake@acm.org> parents: 12576 diff changeset	139
7392e71f6cce Michael Hudson <mwh21@cam.ac.uk>: Fred Drake <fdrake@acm.org> parents: 12576 diff changeset	140 p->depth++;
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	141
13070 7392e71f6cce Michael Hudson <mwh21@cam.ac.uk>: Fred Drake <fdrake@acm.org> parents: 12576 diff changeset	142 if (p->depth > MAX_MARSHAL_STACK_DEPTH) {
7392e71f6cce Michael Hudson <mwh21@cam.ac.uk>: Fred Drake <fdrake@acm.org> parents: 12576 diff changeset	143 p->error = 2;
7392e71f6cce Michael Hudson <mwh21@cam.ac.uk>: Fred Drake <fdrake@acm.org> parents: 12576 diff changeset	144 }
7392e71f6cce Michael Hudson <mwh21@cam.ac.uk>: Fred Drake <fdrake@acm.org> parents: 12576 diff changeset	145 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	146 w_byte(TYPE_NULL, p);
7982 a909a2869ac5 Make new gcc -Wall happy Guido van Rossum <guido@python.org> parents: 5905 diff changeset	147 }
a909a2869ac5 Make new gcc -Wall happy Guido van Rossum <guido@python.org> parents: 5905 diff changeset	148 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	149 w_byte(TYPE_NONE, p);
7982 a909a2869ac5 Make new gcc -Wall happy Guido van Rossum <guido@python.org> parents: 5905 diff changeset	150 }
a909a2869ac5 Make new gcc -Wall happy Guido van Rossum <guido@python.org> parents: 5905 diff changeset	151 else if (v == Py_Ellipsis) {
a909a2869ac5 Make new gcc -Wall happy Guido van Rossum <guido@python.org> parents: 5905 diff changeset	152 w_byte(TYPE_ELLIPSIS, p);
a909a2869ac5 Make new gcc -Wall happy Guido van Rossum <guido@python.org> parents: 5905 diff changeset	153 }
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	154 else if (PyInt_Check(v)) {
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	155 long x = PyInt_AS_LONG((PyIntObject *)v);
4656 186c2ad4abf3 Better way to handle 64-bit ints, keeping gcc -Wall happy. Guido van Rossum <guido@python.org> parents: 4592 diff changeset	156 #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	157 long y = x>>31;
3bf9e2beaf8c Tentative changes to make this work better on 64-bit machines. Guido van Rossum <guido@python.org> parents: 4503 diff changeset	158 if (y && y != -1) {
3bf9e2beaf8c Tentative changes to make this work better on 64-bit machines. Guido van Rossum <guido@python.org> parents: 4503 diff changeset	159 w_byte(TYPE_INT64, p);
3bf9e2beaf8c Tentative changes to make this work better on 64-bit machines. Guido van Rossum <guido@python.org> parents: 4503 diff changeset	160 w_long64(x, p);
3bf9e2beaf8c Tentative changes to make this work better on 64-bit machines. Guido van Rossum <guido@python.org> parents: 4503 diff changeset	161 }
4656 186c2ad4abf3 Better way to handle 64-bit ints, keeping gcc -Wall happy. Guido van Rossum <guido@python.org> parents: 4592 diff changeset	162 else
186c2ad4abf3 Better way to handle 64-bit ints, keeping gcc -Wall happy. Guido van Rossum <guido@python.org> parents: 4592 diff changeset	163 #endif
186c2ad4abf3 Better way to handle 64-bit ints, keeping gcc -Wall happy. Guido van Rossum <guido@python.org> parents: 4592 diff changeset	164 {
4592 3bf9e2beaf8c Tentative changes to make this work better on 64-bit machines. Guido van Rossum <guido@python.org> parents: 4503 diff changeset	165 w_byte(TYPE_INT, p);
3bf9e2beaf8c Tentative changes to make this work better on 64-bit machines. Guido van Rossum <guido@python.org> parents: 4503 diff changeset	166 w_long(x, p);
3bf9e2beaf8c Tentative changes to make this work better on 64-bit machines. Guido van Rossum <guido@python.org> parents: 4503 diff changeset	167 }
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	168 }
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	169 else if (PyLong_Check(v)) {
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	170 PyLongObject ob = (PyLongObject )v;
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	171 w_byte(TYPE_LONG, p);
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	172 n = ob->ob_size;
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	173 w_long((long)n, p);
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	174 if (n < 0)
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	175 n = -n;
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	176 for (i = 0; i < n; i++)
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	177 w_short(ob->ob_digit[i], p);
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	178 }
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	179 else if (PyFloat_Check(v)) {
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	180 extern void PyFloat_AsString
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	181 Py_PROTO((char , PyFloatObject ));
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	182 char buf[256]; /* Plenty to format any double */
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	183 PyFloat_AsString(buf, (PyFloatObject *)v);
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	184 n = strlen(buf);
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	185 w_byte(TYPE_FLOAT, p);
2368 663aa059e29f hope to fix DEC Alpha gcc problems by declaring ints instead of longs Guido van Rossum <guido@python.org> parents: 2062 diff changeset	186 w_byte(n, p);
663aa059e29f hope to fix DEC Alpha gcc problems by declaring ints instead of longs Guido van Rossum <guido@python.org> parents: 2062 diff changeset	187 w_string(buf, n, p);
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	188 }
3323 6098aaa8ae7f changes for complex numbers Guido van Rossum <guido@python.org> parents: 3234 diff changeset	189 #ifndef WITHOUT_COMPLEX
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	190 else if (PyComplex_Check(v)) {
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	191 extern void PyFloat_AsString
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	192 Py_PROTO((char , PyFloatObject ));
3323 6098aaa8ae7f changes for complex numbers Guido van Rossum <guido@python.org> parents: 3234 diff changeset	193 char buf[256]; /* Plenty to format any double */
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	194 PyFloatObject *temp;
3323 6098aaa8ae7f changes for complex numbers Guido van Rossum <guido@python.org> parents: 3234 diff changeset	195 w_byte(TYPE_COMPLEX, p);
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	196 temp = (PyFloatObject*)PyFloat_FromDouble(
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	197 PyComplex_RealAsDouble(v));
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	198 PyFloat_AsString(buf, temp);
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	199 Py_DECREF(temp);
3323 6098aaa8ae7f changes for complex numbers Guido van Rossum <guido@python.org> parents: 3234 diff changeset	200 n = strlen(buf);
6098aaa8ae7f changes for complex numbers Guido van Rossum <guido@python.org> parents: 3234 diff changeset	201 w_byte(n, p);
6098aaa8ae7f changes for complex numbers Guido van Rossum <guido@python.org> parents: 3234 diff changeset	202 w_string(buf, n, p);
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	203 temp = (PyFloatObject*)PyFloat_FromDouble(
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	204 PyComplex_ImagAsDouble(v));
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	205 PyFloat_AsString(buf, temp);
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	206 Py_DECREF(temp);
3323 6098aaa8ae7f changes for complex numbers Guido van Rossum <guido@python.org> parents: 3234 diff changeset	207 n = strlen(buf);
6098aaa8ae7f changes for complex numbers Guido van Rossum <guido@python.org> parents: 3234 diff changeset	208 w_byte(n, p);
6098aaa8ae7f changes for complex numbers Guido van Rossum <guido@python.org> parents: 3234 diff changeset	209 w_string(buf, n, p);
6098aaa8ae7f changes for complex numbers Guido van Rossum <guido@python.org> parents: 3234 diff changeset	210 }
6098aaa8ae7f changes for complex numbers Guido van Rossum <guido@python.org> parents: 3234 diff changeset	211 #endif
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	212 else if (PyString_Check(v)) {
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	213 w_byte(TYPE_STRING, p);
11976 513354d87a85 Marc-Andre Lemburg: support marshalling Unicode objects (code 'u'). Guido van Rossum <guido@python.org> parents: 9300 diff changeset	214 n = PyString_GET_SIZE(v);
2368 663aa059e29f hope to fix DEC Alpha gcc problems by declaring ints instead of longs Guido van Rossum <guido@python.org> parents: 2062 diff changeset	215 w_long((long)n, p);
11976 513354d87a85 Marc-Andre Lemburg: support marshalling Unicode objects (code 'u'). Guido van Rossum <guido@python.org> parents: 9300 diff changeset	216 w_string(PyString_AS_STRING(v), n, p);
513354d87a85 Marc-Andre Lemburg: support marshalling Unicode objects (code 'u'). Guido van Rossum <guido@python.org> parents: 9300 diff changeset	217 }
513354d87a85 Marc-Andre Lemburg: support marshalling Unicode objects (code 'u'). Guido van Rossum <guido@python.org> parents: 9300 diff changeset	218 else if (PyUnicode_Check(v)) {
513354d87a85 Marc-Andre Lemburg: support marshalling Unicode objects (code 'u'). Guido van Rossum <guido@python.org> parents: 9300 diff changeset	219 PyObject *utf8;
513354d87a85 Marc-Andre Lemburg: support marshalling Unicode objects (code 'u'). Guido van Rossum <guido@python.org> parents: 9300 diff changeset	220 utf8 = PyUnicode_AsUTF8String(v);
513354d87a85 Marc-Andre Lemburg: support marshalling Unicode objects (code 'u'). Guido van Rossum <guido@python.org> parents: 9300 diff changeset	221 if (utf8 == NULL) {
13106 a6725acdf33b Urmpf. Quality control on this patch lapsed a bit. :-( Guido van Rossum <guido@python.org> parents: 13070 diff changeset	222 p->depth--;
a6725acdf33b Urmpf. Quality control on this patch lapsed a bit. :-( Guido van Rossum <guido@python.org> parents: 13070 diff changeset	223 p->error = 1;
a6725acdf33b Urmpf. Quality control on this patch lapsed a bit. :-( Guido van Rossum <guido@python.org> parents: 13070 diff changeset	224 return;
11976 513354d87a85 Marc-Andre Lemburg: support marshalling Unicode objects (code 'u'). Guido van Rossum <guido@python.org> parents: 9300 diff changeset	225 }
513354d87a85 Marc-Andre Lemburg: support marshalling Unicode objects (code 'u'). Guido van Rossum <guido@python.org> parents: 9300 diff changeset	226 w_byte(TYPE_UNICODE, p);
513354d87a85 Marc-Andre Lemburg: support marshalling Unicode objects (code 'u'). Guido van Rossum <guido@python.org> parents: 9300 diff changeset	227 n = PyString_GET_SIZE(utf8);
513354d87a85 Marc-Andre Lemburg: support marshalling Unicode objects (code 'u'). Guido van Rossum <guido@python.org> parents: 9300 diff changeset	228 w_long((long)n, p);
513354d87a85 Marc-Andre Lemburg: support marshalling Unicode objects (code 'u'). Guido van Rossum <guido@python.org> parents: 9300 diff changeset	229 w_string(PyString_AS_STRING(utf8), n, p);
513354d87a85 Marc-Andre Lemburg: support marshalling Unicode objects (code 'u'). Guido van Rossum <guido@python.org> parents: 9300 diff changeset	230 Py_DECREF(utf8);
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	231 }
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	232 else if (PyTuple_Check(v)) {
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	233 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	234 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	235 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	236 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	237 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	238 }
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	239 }
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	240 else if (PyList_Check(v)) {
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	241 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	242 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	243 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	244 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	245 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	246 }
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	247 }
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	248 else if (PyDict_Check(v)) {
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1270 diff changeset	249 int pos;
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	250 PyObject key, value;
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	251 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	252 /* This one is NULL object terminated! */
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1270 diff changeset	253 pos = 0;
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	254 while (PyDict_Next(v, &pos, &key, &value)) {
1288 9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1270 diff changeset	255 w_object(key, p);
9fed5726a36d Several changes in one: Guido van Rossum <guido@python.org> parents: 1270 diff changeset	256 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	257 }
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	258 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	259 }
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	260 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	261 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	262 w_byte(TYPE_CODE, p);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2503 diff changeset	263 w_short(co->co_argcount, p);
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2503 diff changeset	264 w_short(co->co_nlocals, p);
4995 267ed480ec1b Marshal the new stacksize item in code objects. Guido van Rossum <guido@python.org> parents: 4656 diff changeset	265 w_short(co->co_stacksize, p);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2503 diff changeset	266 w_short(co->co_flags, p);
9293 0a67db47e1d0 Changes to support other object types besides strings Guido van Rossum <guido@python.org> parents: 8465 diff changeset	267 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	268 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	269 w_object(co->co_names, p);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2503 diff changeset	270 w_object(co->co_varnames, p);
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	271 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	272 w_object(co->co_name, p);
5042 9b7e0cf51990 Marshal the line number table of code objects. Guido van Rossum <guido@python.org> parents: 4995 diff changeset	273 w_short(co->co_firstlineno, p);
9b7e0cf51990 Marshal the line number table of code objects. Guido van Rossum <guido@python.org> parents: 4995 diff changeset	274 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	275 }
9293 0a67db47e1d0 Changes to support other object types besides strings Guido van Rossum <guido@python.org> parents: 8465 diff changeset	276 else if ((pb = v->ob_type->tp_as_buffer) != NULL &&
0a67db47e1d0 Changes to support other object types besides strings Guido van Rossum <guido@python.org> parents: 8465 diff changeset	277 pb->bf_getsegcount != NULL &&
0a67db47e1d0 Changes to support other object types besides strings Guido van Rossum <guido@python.org> parents: 8465 diff changeset	278 pb->bf_getreadbuffer != NULL &&
0a67db47e1d0 Changes to support other object types besides strings Guido van Rossum <guido@python.org> parents: 8465 diff changeset	279 (*pb->bf_getsegcount)(v, NULL) == 1)
0a67db47e1d0 Changes to support other object types besides strings Guido van Rossum <guido@python.org> parents: 8465 diff changeset	280 {
0a67db47e1d0 Changes to support other object types besides strings Guido van Rossum <guido@python.org> parents: 8465 diff changeset	281 /* 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	282 char *s;
0a67db47e1d0 Changes to support other object types besides strings Guido van Rossum <guido@python.org> parents: 8465 diff changeset	283 w_byte(TYPE_STRING, p);
0a67db47e1d0 Changes to support other object types besides strings Guido van Rossum <guido@python.org> parents: 8465 diff changeset	284 n = (pb->bf_getreadbuffer)(v, 0, (void *)&s);
0a67db47e1d0 Changes to support other object types besides strings Guido van Rossum <guido@python.org> parents: 8465 diff changeset	285 w_long((long)n, p);
0a67db47e1d0 Changes to support other object types besides strings Guido van Rossum <guido@python.org> parents: 8465 diff changeset	286 w_string(s, n, p);
0a67db47e1d0 Changes to support other object types besides strings Guido van Rossum <guido@python.org> parents: 8465 diff changeset	287 }
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	288 else {
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	289 w_byte(TYPE_UNKNOWN, p);
3731 de1cb33219e3 Jeremy's patches for more robust handling of unmarshallable types. Guido van Rossum <guido@python.org> parents: 3620 diff changeset	290 p->error = 1;
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	291 }
13106 a6725acdf33b Urmpf. Quality control on this patch lapsed a bit. :-( Guido van Rossum <guido@python.org> parents: 13070 diff changeset	292
a6725acdf33b Urmpf. Quality control on this patch lapsed a bit. :-( Guido van Rossum <guido@python.org> parents: 13070 diff changeset	293 p->depth--;
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	294 }
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	295
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	296 void
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	297 PyMarshal_WriteLongToFile(x, fp)
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	298 long x;
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	299 FILE *fp;
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	300 {
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	301 WFILE wf;
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	302 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	303 wf.error = 0;
13070 7392e71f6cce Michael Hudson <mwh21@cam.ac.uk>: Fred Drake <fdrake@acm.org> parents: 12576 diff changeset	304 wf.depth = 0;
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	305 w_long(x, &wf);
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	306 }
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	307
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	308 void
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	309 PyMarshal_WriteObjectToFile(x, fp)
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	310 PyObject *x;
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	311 FILE *fp;
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	312 {
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	313 WFILE wf;
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	314 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	315 wf.error = 0;
13106 a6725acdf33b Urmpf. Quality control on this patch lapsed a bit. :-( Guido van Rossum <guido@python.org> parents: 13070 diff changeset	316 wf.depth = 0;
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	317 w_object(x, &wf);
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	318 }
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	319
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	320 typedef WFILE RFILE; /* Same struct with different invariants */
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	321
2503 4dd1af0ddef0 various tuple related optimizations; remove unused b/w compat code from ceval.c Guido van Rossum <guido@python.org> parents: 2368 diff changeset	322 #define rs_byte(p) (((p)->ptr != (p)->end) ? (unsigned char)*(p)->ptr++ : EOF)
4dd1af0ddef0 various tuple related optimizations; remove unused b/w compat code from ceval.c Guido van Rossum <guido@python.org> parents: 2368 diff changeset	323
4dd1af0ddef0 various tuple related optimizations; remove unused b/w compat code from ceval.c Guido van Rossum <guido@python.org> parents: 2368 diff changeset	324 #define r_byte(p) ((p)->fp ? getc((p)->fp) : rs_byte(p))
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	325
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	326 static int
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	327 r_string(s, n, p)
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	328 char *s;
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	329 int n;
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	330 RFILE *p;
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	331 {
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	332 if (p->fp != NULL)
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	333 return fread(s, 1, n, p->fp);
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	334 if (p->end - p->ptr < n)
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	335 n = p->end - p->ptr;
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	336 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	337 p->ptr += n;
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	338 return n;
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	339 }
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	340
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	341 static int
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	342 r_short(p)
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	343 RFILE *p;
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	344 {
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	345 register short x;
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	346 x = r_byte(p);
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	347 x \|= r_byte(p) << 8;
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	348 /* XXX If your short is > 16 bits, add sign-extension here!!! */
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	349 return x;
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	350 }
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	351
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	352 static long
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	353 r_long(p)
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	354 RFILE *p;
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	355 {
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	356 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	357 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	358 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	359 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	360 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	361 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	362 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	363 }
4dd1af0ddef0 various tuple related optimizations; remove unused b/w compat code from ceval.c Guido van Rossum <guido@python.org> parents: 2368 diff changeset	364 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	365 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	366 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	367 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	368 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	369 }
4656 186c2ad4abf3 Better way to handle 64-bit ints, keeping gcc -Wall happy. Guido van Rossum <guido@python.org> parents: 4592 diff changeset	370 #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	371 /* Sign extension for 64-bit machines */
3bf9e2beaf8c Tentative changes to make this work better on 64-bit machines. Guido van Rossum <guido@python.org> parents: 4503 diff changeset	372 x <<= (8*sizeof(long) - 32);
3bf9e2beaf8c Tentative changes to make this work better on 64-bit machines. Guido van Rossum <guido@python.org> parents: 4503 diff changeset	373 x >>= (8*sizeof(long) - 32);
4656 186c2ad4abf3 Better way to handle 64-bit ints, keeping gcc -Wall happy. Guido van Rossum <guido@python.org> parents: 4592 diff changeset	374 #endif
4592 3bf9e2beaf8c Tentative changes to make this work better on 64-bit machines. Guido van Rossum <guido@python.org> parents: 4503 diff changeset	375 return x;
3bf9e2beaf8c Tentative changes to make this work better on 64-bit machines. Guido van Rossum <guido@python.org> parents: 4503 diff changeset	376 }
3bf9e2beaf8c Tentative changes to make this work better on 64-bit machines. Guido van Rossum <guido@python.org> parents: 4503 diff changeset	377
3bf9e2beaf8c Tentative changes to make this work better on 64-bit machines. Guido van Rossum <guido@python.org> parents: 4503 diff changeset	378 static long
3bf9e2beaf8c Tentative changes to make this work better on 64-bit machines. Guido van Rossum <guido@python.org> parents: 4503 diff changeset	379 r_long64(p)
3bf9e2beaf8c Tentative changes to make this work better on 64-bit machines. Guido van Rossum <guido@python.org> parents: 4503 diff changeset	380 RFILE *p;
3bf9e2beaf8c Tentative changes to make this work better on 64-bit machines. Guido van Rossum <guido@python.org> parents: 4503 diff changeset	381 {
3bf9e2beaf8c Tentative changes to make this work better on 64-bit machines. Guido van Rossum <guido@python.org> parents: 4503 diff changeset	382 register long x;
4656 186c2ad4abf3 Better way to handle 64-bit ints, keeping gcc -Wall happy. Guido van Rossum <guido@python.org> parents: 4592 diff changeset	383 x = r_long(p);
186c2ad4abf3 Better way to handle 64-bit ints, keeping gcc -Wall happy. Guido van Rossum <guido@python.org> parents: 4592 diff changeset	384 #if SIZEOF_LONG > 4
186c2ad4abf3 Better way to handle 64-bit ints, keeping gcc -Wall happy. Guido van Rossum <guido@python.org> parents: 4592 diff changeset	385 x = (x & 0xFFFFFFFF) \| (r_long(p) << 32);
186c2ad4abf3 Better way to handle 64-bit ints, keeping gcc -Wall happy. Guido van Rossum <guido@python.org> parents: 4592 diff changeset	386 #else
186c2ad4abf3 Better way to handle 64-bit ints, keeping gcc -Wall happy. Guido van Rossum <guido@python.org> parents: 4592 diff changeset	387 if (r_long(p) != 0) {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	388 PyObject *f = PySys_GetObject("stderr");
4656 186c2ad4abf3 Better way to handle 64-bit ints, keeping gcc -Wall happy. Guido van Rossum <guido@python.org> parents: 4592 diff changeset	389 if (f != NULL)
5608 79e49cbce2ef PyFile_WriteString now returns an error indicator instead of calling Guido van Rossum <guido@python.org> parents: 5373 diff changeset	390 (void) PyFile_WriteString(
4656 186c2ad4abf3 Better way to handle 64-bit ints, keeping gcc -Wall happy. Guido van Rossum <guido@python.org> parents: 4592 diff changeset	391 "Warning: un-marshal 64-bit int in 32-bit mode\n",
186c2ad4abf3 Better way to handle 64-bit ints, keeping gcc -Wall happy. Guido van Rossum <guido@python.org> parents: 4592 diff changeset	392 f);
4592 3bf9e2beaf8c Tentative changes to make this work better on 64-bit machines. Guido van Rossum <guido@python.org> parents: 4503 diff changeset	393 }
4656 186c2ad4abf3 Better way to handle 64-bit ints, keeping gcc -Wall happy. Guido van Rossum <guido@python.org> parents: 4592 diff changeset	394 #endif
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	395 return x;
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	396 }
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	397
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	398 static PyObject *
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	399 r_object(p)
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	400 RFILE *p;
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	401 {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	402 PyObject v, v2;
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	403 long i, n;
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	404 int type = r_byte(p);
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	405
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	406 switch (type) {
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	407
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	408 case EOF:
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	409 PyErr_SetString(PyExc_EOFError,
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	410 "EOF read where object expected");
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	411 return NULL;
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	412
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	413 case TYPE_NULL:
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	414 return NULL;
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	415
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	416 case TYPE_NONE:
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	417 Py_INCREF(Py_None);
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	418 return Py_None;
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	419
4403 3b3f7c3f6da2 Ellipses -> Ellipsis rename (the dictionary really says that it should Guido van Rossum <guido@python.org> parents: 4039 diff changeset	420 case TYPE_ELLIPSIS:
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	421 Py_INCREF(Py_Ellipsis);
4403 3b3f7c3f6da2 Ellipses -> Ellipsis rename (the dictionary really says that it should Guido van Rossum <guido@python.org> parents: 4039 diff changeset	422 return Py_Ellipsis;
3839 22e29b1747e1 Changes for slice and ellipses Guido van Rossum <guido@python.org> parents: 3766 diff changeset	423
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	424 case TYPE_INT:
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	425 return PyInt_FromLong(r_long(p));
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	426
4592 3bf9e2beaf8c Tentative changes to make this work better on 64-bit machines. Guido van Rossum <guido@python.org> parents: 4503 diff changeset	427 case TYPE_INT64:
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	428 return PyInt_FromLong(r_long64(p));
4592 3bf9e2beaf8c Tentative changes to make this work better on 64-bit machines. Guido van Rossum <guido@python.org> parents: 4503 diff changeset	429
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	430 case TYPE_LONG:
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	431 {
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	432 int size;
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	433 PyLongObject *ob;
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	434 n = r_long(p);
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	435 size = n<0 ? -n : n;
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	436 ob = _PyLong_New(size);
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	437 if (ob == NULL)
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	438 return NULL;
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	439 ob->ob_size = n;
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	440 for (i = 0; i < size; i++)
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	441 ob->ob_digit[i] = r_short(p);
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	442 return (PyObject *)ob;
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	443 }
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	444
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	445 case TYPE_FLOAT:
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	446 {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	447 extern double atof Py_PROTO((const char *));
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	448 char buf[256];
5119 bda01a374762 Changes for Lee Busby's SIGFPE patch set. Guido van Rossum <guido@python.org> parents: 5115 diff changeset	449 double dx;
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	450 n = r_byte(p);
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	451 if (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	452 PyErr_SetString(PyExc_EOFError,
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	453 "EOF read where object expected");
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	454 return NULL;
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	455 }
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	456 buf[n] = '\0';
5119 bda01a374762 Changes for Lee Busby's SIGFPE patch set. Guido van Rossum <guido@python.org> parents: 5115 diff changeset	457 PyFPE_START_PROTECT("atof", return 0)
bda01a374762 Changes for Lee Busby's SIGFPE patch set. Guido van Rossum <guido@python.org> parents: 5115 diff changeset	458 dx = atof(buf);
5197 74c12704a0bd New form of PyFPE_END_PROTECT macro. Guido van Rossum <guido@python.org> parents: 5119 diff changeset	459 PyFPE_END_PROTECT(dx)
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	460 return PyFloat_FromDouble(dx);
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	461 }
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	462
3323 6098aaa8ae7f changes for complex numbers Guido van Rossum <guido@python.org> parents: 3234 diff changeset	463 #ifndef WITHOUT_COMPLEX
6098aaa8ae7f changes for complex numbers Guido van Rossum <guido@python.org> parents: 3234 diff changeset	464 case TYPE_COMPLEX:
6098aaa8ae7f changes for complex numbers Guido van Rossum <guido@python.org> parents: 3234 diff changeset	465 {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	466 extern double atof Py_PROTO((const char *));
3323 6098aaa8ae7f changes for complex numbers Guido van Rossum <guido@python.org> parents: 3234 diff changeset	467 char buf[256];
3766 516490c8192c Py_complex; and WITHOUT_COMPLEX added to getargs.c Guido van Rossum <guido@python.org> parents: 3731 diff changeset	468 Py_complex c;
3323 6098aaa8ae7f changes for complex numbers Guido van Rossum <guido@python.org> parents: 3234 diff changeset	469 n = r_byte(p);
6098aaa8ae7f changes for complex numbers Guido van Rossum <guido@python.org> parents: 3234 diff changeset	470 if (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	471 PyErr_SetString(PyExc_EOFError,
3323 6098aaa8ae7f changes for complex numbers Guido van Rossum <guido@python.org> parents: 3234 diff changeset	472 "EOF read where object expected");
6098aaa8ae7f changes for complex numbers Guido van Rossum <guido@python.org> parents: 3234 diff changeset	473 return NULL;
6098aaa8ae7f changes for complex numbers Guido van Rossum <guido@python.org> parents: 3234 diff changeset	474 }
6098aaa8ae7f changes for complex numbers Guido van Rossum <guido@python.org> parents: 3234 diff changeset	475 buf[n] = '\0';
5119 bda01a374762 Changes for Lee Busby's SIGFPE patch set. Guido van Rossum <guido@python.org> parents: 5115 diff changeset	476 PyFPE_START_PROTECT("atof", return 0)
3323 6098aaa8ae7f changes for complex numbers Guido van Rossum <guido@python.org> parents: 3234 diff changeset	477 c.real = atof(buf);
5197 74c12704a0bd New form of PyFPE_END_PROTECT macro. Guido van Rossum <guido@python.org> parents: 5119 diff changeset	478 PyFPE_END_PROTECT(c)
3323 6098aaa8ae7f changes for complex numbers Guido van Rossum <guido@python.org> parents: 3234 diff changeset	479 n = r_byte(p);
6098aaa8ae7f changes for complex numbers Guido van Rossum <guido@python.org> parents: 3234 diff changeset	480 if (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	481 PyErr_SetString(PyExc_EOFError,
3323 6098aaa8ae7f changes for complex numbers Guido van Rossum <guido@python.org> parents: 3234 diff changeset	482 "EOF read where object expected");
6098aaa8ae7f changes for complex numbers Guido van Rossum <guido@python.org> parents: 3234 diff changeset	483 return NULL;
6098aaa8ae7f changes for complex numbers Guido van Rossum <guido@python.org> parents: 3234 diff changeset	484 }
6098aaa8ae7f changes for complex numbers Guido van Rossum <guido@python.org> parents: 3234 diff changeset	485 buf[n] = '\0';
5119 bda01a374762 Changes for Lee Busby's SIGFPE patch set. Guido van Rossum <guido@python.org> parents: 5115 diff changeset	486 PyFPE_START_PROTECT("atof", return 0)
3323 6098aaa8ae7f changes for complex numbers Guido van Rossum <guido@python.org> parents: 3234 diff changeset	487 c.imag = atof(buf);
5197 74c12704a0bd New form of PyFPE_END_PROTECT macro. Guido van Rossum <guido@python.org> parents: 5119 diff changeset	488 PyFPE_END_PROTECT(c)
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	489 return PyComplex_FromCComplex(c);
3323 6098aaa8ae7f changes for complex numbers Guido van Rossum <guido@python.org> parents: 3234 diff changeset	490 }
6098aaa8ae7f changes for complex numbers Guido van Rossum <guido@python.org> parents: 3234 diff changeset	491 #endif
6098aaa8ae7f changes for complex numbers Guido van Rossum <guido@python.org> parents: 3234 diff changeset	492
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	493 case TYPE_STRING:
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	494 n = r_long(p);
8465 0e6fbbe3b63c When unmarshalling, add test for negative lengths on strings, tuples Guido van Rossum <guido@python.org> parents: 8329 diff changeset	495 if (n < 0) {
0e6fbbe3b63c When unmarshalling, add test for negative lengths on strings, tuples Guido van Rossum <guido@python.org> parents: 8329 diff changeset	496 PyErr_SetString(PyExc_ValueError, "bad marshal data");
0e6fbbe3b63c When unmarshalling, add test for negative lengths on strings, tuples Guido van Rossum <guido@python.org> parents: 8329 diff changeset	497 return NULL;
0e6fbbe3b63c When unmarshalling, add test for negative lengths on strings, tuples Guido van Rossum <guido@python.org> parents: 8329 diff changeset	498 }
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	499 v = PyString_FromStringAndSize((char *)NULL, n);
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	500 if (v != NULL) {
11976 513354d87a85 Marc-Andre Lemburg: support marshalling Unicode objects (code 'u'). Guido van Rossum <guido@python.org> parents: 9300 diff changeset	501 if (r_string(PyString_AS_STRING(v), (int)n, p) != n) {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	502 Py_DECREF(v);
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	503 v = NULL;
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	504 PyErr_SetString(PyExc_EOFError,
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	505 "EOF read where object expected");
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	506 }
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	507 }
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	508 return v;
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	509
11976 513354d87a85 Marc-Andre Lemburg: support marshalling Unicode objects (code 'u'). Guido van Rossum <guido@python.org> parents: 9300 diff changeset	510 case TYPE_UNICODE:
513354d87a85 Marc-Andre Lemburg: support marshalling Unicode objects (code 'u'). Guido van Rossum <guido@python.org> parents: 9300 diff changeset	511 {
513354d87a85 Marc-Andre Lemburg: support marshalling Unicode objects (code 'u'). Guido van Rossum <guido@python.org> parents: 9300 diff changeset	512 char *buffer;
513354d87a85 Marc-Andre Lemburg: support marshalling Unicode objects (code 'u'). Guido van Rossum <guido@python.org> parents: 9300 diff changeset	513
513354d87a85 Marc-Andre Lemburg: support marshalling Unicode objects (code 'u'). Guido van Rossum <guido@python.org> parents: 9300 diff changeset	514 n = r_long(p);
513354d87a85 Marc-Andre Lemburg: support marshalling Unicode objects (code 'u'). Guido van Rossum <guido@python.org> parents: 9300 diff changeset	515 if (n < 0) {
513354d87a85 Marc-Andre Lemburg: support marshalling Unicode objects (code 'u'). Guido van Rossum <guido@python.org> parents: 9300 diff changeset	516 PyErr_SetString(PyExc_ValueError, "bad marshal data");
513354d87a85 Marc-Andre Lemburg: support marshalling Unicode objects (code 'u'). Guido van Rossum <guido@python.org> parents: 9300 diff changeset	517 return NULL;
513354d87a85 Marc-Andre Lemburg: support marshalling Unicode objects (code 'u'). Guido van Rossum <guido@python.org> parents: 9300 diff changeset	518 }
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12135 diff changeset	519 buffer = PyMem_NEW(char, n);
11976 513354d87a85 Marc-Andre Lemburg: support marshalling Unicode objects (code 'u'). Guido van Rossum <guido@python.org> parents: 9300 diff changeset	520 if (buffer == NULL)
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12135 diff changeset	521 return PyErr_NoMemory();
11976 513354d87a85 Marc-Andre Lemburg: support marshalling Unicode objects (code 'u'). Guido van Rossum <guido@python.org> parents: 9300 diff changeset	522 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	523 PyMem_DEL(buffer);
11976 513354d87a85 Marc-Andre Lemburg: support marshalling Unicode objects (code 'u'). Guido van Rossum <guido@python.org> parents: 9300 diff changeset	524 PyErr_SetString(PyExc_EOFError,
513354d87a85 Marc-Andre Lemburg: support marshalling Unicode objects (code 'u'). Guido van Rossum <guido@python.org> parents: 9300 diff changeset	525 "EOF read where object expected");
513354d87a85 Marc-Andre Lemburg: support marshalling Unicode objects (code 'u'). Guido van Rossum <guido@python.org> parents: 9300 diff changeset	526 return NULL;
513354d87a85 Marc-Andre Lemburg: support marshalling Unicode objects (code 'u'). Guido van Rossum <guido@python.org> parents: 9300 diff changeset	527 }
513354d87a85 Marc-Andre Lemburg: support marshalling Unicode objects (code 'u'). Guido van Rossum <guido@python.org> parents: 9300 diff changeset	528 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	529 PyMem_DEL(buffer);
11976 513354d87a85 Marc-Andre Lemburg: support marshalling Unicode objects (code 'u'). Guido van Rossum <guido@python.org> parents: 9300 diff changeset	530 return v;
513354d87a85 Marc-Andre Lemburg: support marshalling Unicode objects (code 'u'). Guido van Rossum <guido@python.org> parents: 9300 diff changeset	531 }
513354d87a85 Marc-Andre Lemburg: support marshalling Unicode objects (code 'u'). Guido van Rossum <guido@python.org> parents: 9300 diff changeset	532
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	533 case TYPE_TUPLE:
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	534 n = r_long(p);
8465 0e6fbbe3b63c When unmarshalling, add test for negative lengths on strings, tuples Guido van Rossum <guido@python.org> parents: 8329 diff changeset	535 if (n < 0) {
0e6fbbe3b63c When unmarshalling, add test for negative lengths on strings, tuples Guido van Rossum <guido@python.org> parents: 8329 diff changeset	536 PyErr_SetString(PyExc_ValueError, "bad marshal data");
0e6fbbe3b63c When unmarshalling, add test for negative lengths on strings, tuples Guido van Rossum <guido@python.org> parents: 8329 diff changeset	537 return NULL;
0e6fbbe3b63c When unmarshalling, add test for negative lengths on strings, tuples Guido van Rossum <guido@python.org> parents: 8329 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 v = PyTuple_New((int)n);
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	540 if (v == NULL)
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	541 return v;
3234 aafe7d634985 Made a bit more robust against out-of-memory situations Jack Jansen <jack.jansen@cwi.nl> parents: 3012 diff changeset	542 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	543 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	544 if ( v2 == NULL ) {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	545 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	546 v = NULL;
aafe7d634985 Made a bit more robust against out-of-memory situations Jack Jansen <jack.jansen@cwi.nl> parents: 3012 diff changeset	547 break;
aafe7d634985 Made a bit more robust against out-of-memory situations Jack Jansen <jack.jansen@cwi.nl> parents: 3012 diff changeset	548 }
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	549 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	550 }
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	551 return v;
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	552
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	553 case TYPE_LIST:
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	554 n = r_long(p);
8465 0e6fbbe3b63c When unmarshalling, add test for negative lengths on strings, tuples Guido van Rossum <guido@python.org> parents: 8329 diff changeset	555 if (n < 0) {
0e6fbbe3b63c When unmarshalling, add test for negative lengths on strings, tuples Guido van Rossum <guido@python.org> parents: 8329 diff changeset	556 PyErr_SetString(PyExc_ValueError, "bad marshal data");
0e6fbbe3b63c When unmarshalling, add test for negative lengths on strings, tuples Guido van Rossum <guido@python.org> parents: 8329 diff changeset	557 return NULL;
0e6fbbe3b63c When unmarshalling, add test for negative lengths on strings, tuples Guido van Rossum <guido@python.org> parents: 8329 diff changeset	558 }
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	559 v = PyList_New((int)n);
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	560 if (v == NULL)
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	561 return v;
3234 aafe7d634985 Made a bit more robust against out-of-memory situations Jack Jansen <jack.jansen@cwi.nl> parents: 3012 diff changeset	562 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	563 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	564 if ( v2 == NULL ) {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	565 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	566 v = NULL;
aafe7d634985 Made a bit more robust against out-of-memory situations Jack Jansen <jack.jansen@cwi.nl> parents: 3012 diff changeset	567 break;
aafe7d634985 Made a bit more robust against out-of-memory situations Jack Jansen <jack.jansen@cwi.nl> parents: 3012 diff changeset	568 }
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	569 PyList_SetItem(v, (int)i, v2);
3234 aafe7d634985 Made a bit more robust against out-of-memory situations Jack Jansen <jack.jansen@cwi.nl> parents: 3012 diff changeset	570 }
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	571 return v;
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	572
279 9c924f9c3b16 Add marshalling for dictionaries. Guido van Rossum <guido@python.org> parents: 272 diff changeset	573 case TYPE_DICT:
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	574 v = PyDict_New();
279 9c924f9c3b16 Add marshalling for dictionaries. Guido van Rossum <guido@python.org> parents: 272 diff changeset	575 if (v == NULL)
9c924f9c3b16 Add marshalling for dictionaries. Guido van Rossum <guido@python.org> parents: 272 diff changeset	576 return NULL;
9c924f9c3b16 Add marshalling for dictionaries. Guido van Rossum <guido@python.org> parents: 272 diff changeset	577 for (;;) {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	578 PyObject key, val;
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	579 key = r_object(p);
279 9c924f9c3b16 Add marshalling for dictionaries. Guido van Rossum <guido@python.org> parents: 272 diff changeset	580 if (key == NULL)
3731 de1cb33219e3 Jeremy's patches for more robust handling of unmarshallable types. Guido van Rossum <guido@python.org> parents: 3620 diff changeset	581 break; /* XXX Assume TYPE_NULL, not an error */
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	582 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	583 if (val != NULL)
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	584 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	585 Py_DECREF(key);
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	586 Py_XDECREF(val);
279 9c924f9c3b16 Add marshalling for dictionaries. Guido van Rossum <guido@python.org> parents: 272 diff changeset	587 }
9c924f9c3b16 Add marshalling for dictionaries. Guido van Rossum <guido@python.org> parents: 272 diff changeset	588 return v;
9c924f9c3b16 Add marshalling for dictionaries. Guido van Rossum <guido@python.org> parents: 272 diff changeset	589
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	590 case TYPE_CODE:
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	591 {
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2503 diff changeset	592 int argcount = r_short(p);
0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2503 diff changeset	593 int nlocals = r_short(p);
4995 267ed480ec1b Marshal the new stacksize item in code objects. Guido van Rossum <guido@python.org> parents: 4656 diff changeset	594 int stacksize = r_short(p);
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2503 diff changeset	595 int flags = r_short(p);
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	596 PyObject *code = NULL;
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	597 PyObject *consts = NULL;
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	598 PyObject *names = NULL;
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	599 PyObject *varnames = NULL;
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	600 PyObject *filename = NULL;
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	601 PyObject *name = NULL;
5115 e3ab48988c77 Keep gcc -Wall happy. Guido van Rossum <guido@python.org> parents: 5042 diff changeset	602 int firstlineno = 0;
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	603 PyObject *lnotab = NULL;
3234 aafe7d634985 Made a bit more robust against out-of-memory situations Jack Jansen <jack.jansen@cwi.nl> parents: 3012 diff changeset	604
aafe7d634985 Made a bit more robust against out-of-memory situations Jack Jansen <jack.jansen@cwi.nl> parents: 3012 diff changeset	605 code = r_object(p);
aafe7d634985 Made a bit more robust against out-of-memory situations Jack Jansen <jack.jansen@cwi.nl> parents: 3012 diff changeset	606 if (code) consts = r_object(p);
aafe7d634985 Made a bit more robust against out-of-memory situations Jack Jansen <jack.jansen@cwi.nl> parents: 3012 diff changeset	607 if (consts) names = r_object(p);
aafe7d634985 Made a bit more robust against out-of-memory situations Jack Jansen <jack.jansen@cwi.nl> parents: 3012 diff changeset	608 if (names) varnames = r_object(p);
aafe7d634985 Made a bit more robust against out-of-memory situations Jack Jansen <jack.jansen@cwi.nl> parents: 3012 diff changeset	609 if (varnames) filename = r_object(p);
aafe7d634985 Made a bit more robust against out-of-memory situations Jack Jansen <jack.jansen@cwi.nl> parents: 3012 diff changeset	610 if (filename) name = r_object(p);
5042 9b7e0cf51990 Marshal the line number table of code objects. Guido van Rossum <guido@python.org> parents: 4995 diff changeset	611 if (name) {
9b7e0cf51990 Marshal the line number table of code objects. Guido van Rossum <guido@python.org> parents: 4995 diff changeset	612 firstlineno = r_short(p);
9b7e0cf51990 Marshal the line number table of code objects. Guido van Rossum <guido@python.org> parents: 4995 diff changeset	613 lnotab = r_object(p);
9b7e0cf51990 Marshal the line number table of code objects. Guido van Rossum <guido@python.org> parents: 4995 diff changeset	614 }
3234 aafe7d634985 Made a bit more robust against out-of-memory situations Jack Jansen <jack.jansen@cwi.nl> parents: 3012 diff changeset	615
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	616 if (!PyErr_Occurred()) {
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	617 v = (PyObject *) PyCode_New(
4995 267ed480ec1b Marshal the new stacksize item in code objects. Guido van Rossum <guido@python.org> parents: 4656 diff changeset	618 argcount, nlocals, stacksize, flags,
2844 0261bf5b3819 keyword arguments and faster calls Guido van Rossum <guido@python.org> parents: 2503 diff changeset	619 code, consts, names, varnames,
5042 9b7e0cf51990 Marshal the line number table of code objects. Guido van Rossum <guido@python.org> parents: 4995 diff changeset	620 filename, name, firstlineno, lnotab);
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	621 }
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	622 else
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	623 v = NULL;
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	624 Py_XDECREF(code);
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	625 Py_XDECREF(consts);
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	626 Py_XDECREF(names);
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	627 Py_XDECREF(varnames);
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	628 Py_XDECREF(filename);
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	629 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	630 Py_XDECREF(lnotab);
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	631
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	632 }
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	633 return v;
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	634
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	635 default:
3731 de1cb33219e3 Jeremy's patches for more robust handling of unmarshallable types. Guido van Rossum <guido@python.org> parents: 3620 diff changeset	636 /* 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	637 This will let you keep working and recover. */
8465 0e6fbbe3b63c When unmarshalling, add test for negative lengths on strings, tuples Guido van Rossum <guido@python.org> parents: 8329 diff changeset	638 PyErr_SetString(PyExc_ValueError, "bad marshal data");
0e6fbbe3b63c When unmarshalling, add test for negative lengths on strings, tuples Guido van Rossum <guido@python.org> parents: 8329 diff changeset	639 return NULL;
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	640
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	641 }
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	642 }
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	643
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	644 long
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	645 PyMarshal_ReadLongFromFile(fp)
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	646 FILE *fp;
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	647 {
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	648 RFILE rf;
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	649 rf.fp = fp;
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	650 return r_long(&rf);
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	651 }
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	652
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	653 PyObject *
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	654 PyMarshal_ReadObjectFromFile(fp)
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	655 FILE *fp;
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	656 {
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	657 RFILE rf;
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	658 if (PyErr_Occurred()) {
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1929 diff changeset	659 fprintf(stderr, "XXX rd_object called with exception set\n");
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1929 diff changeset	660 return NULL;
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1929 diff changeset	661 }
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	662 rf.fp = fp;
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	663 return r_object(&rf);
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	664 }
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	665
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	666 PyObject *
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	667 PyMarshal_ReadObjectFromString(str, len)
1270 14369a5e6167 Support for frozen scripts; added -i option. Guido van Rossum <guido@python.org> parents: 1257 diff changeset	668 char *str;
14369a5e6167 Support for frozen scripts; added -i option. Guido van Rossum <guido@python.org> parents: 1257 diff changeset	669 int len;
14369a5e6167 Support for frozen scripts; added -i option. Guido van Rossum <guido@python.org> parents: 1257 diff changeset	670 {
14369a5e6167 Support for frozen scripts; added -i option. Guido van Rossum <guido@python.org> parents: 1257 diff changeset	671 RFILE rf;
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	672 if (PyErr_Occurred()) {
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1929 diff changeset	673 fprintf(stderr, "XXX rds_object called with exception set\n");
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1929 diff changeset	674 return NULL;
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1929 diff changeset	675 }
1270 14369a5e6167 Support for frozen scripts; added -i option. Guido van Rossum <guido@python.org> parents: 1257 diff changeset	676 rf.fp = NULL;
14369a5e6167 Support for frozen scripts; added -i option. Guido van Rossum <guido@python.org> parents: 1257 diff changeset	677 rf.str = NULL;
14369a5e6167 Support for frozen scripts; added -i option. Guido van Rossum <guido@python.org> parents: 1257 diff changeset	678 rf.ptr = str;
14369a5e6167 Support for frozen scripts; added -i option. Guido van Rossum <guido@python.org> parents: 1257 diff changeset	679 rf.end = str + len;
14369a5e6167 Support for frozen scripts; added -i option. Guido van Rossum <guido@python.org> parents: 1257 diff changeset	680 return r_object(&rf);
14369a5e6167 Support for frozen scripts; added -i option. Guido van Rossum <guido@python.org> parents: 1257 diff changeset	681 }
14369a5e6167 Support for frozen scripts; added -i option. Guido van Rossum <guido@python.org> parents: 1257 diff changeset	682
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	683 PyObject *
4039 23f280ab5409 Added PyMarshal_WriteObjectToString() (moved the relevant code there Guido van Rossum <guido@python.org>* parents: 3839 diff changeset	684 PyMarshal_WriteObjectToString(x) /* wrs_object() */
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	685 PyObject *x;
4039 23f280ab5409 Added PyMarshal_WriteObjectToString() (moved the relevant code there Guido van Rossum <guido@python.org>* parents: 3839 diff changeset	686 {
23f280ab5409 Added PyMarshal_WriteObjectToString() (moved the relevant code there Guido van Rossum <guido@python.org>* parents: 3839 diff changeset	687 WFILE wf;
23f280ab5409 Added PyMarshal_WriteObjectToString() (moved the relevant code there Guido van Rossum <guido@python.org>* parents: 3839 diff changeset	688 wf.fp = NULL;
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	689 wf.str = PyString_FromStringAndSize((char *)NULL, 50);
4039 23f280ab5409 Added PyMarshal_WriteObjectToString() (moved the relevant code there Guido van Rossum <guido@python.org>* parents: 3839 diff changeset	690 if (wf.str == NULL)
23f280ab5409 Added PyMarshal_WriteObjectToString() (moved the relevant code there Guido van Rossum <guido@python.org>* parents: 3839 diff changeset	691 return NULL;
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	692 wf.ptr = PyString_AS_STRING((PyStringObject *)wf.str);
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	693 wf.end = wf.ptr + PyString_Size(wf.str);
4039 23f280ab5409 Added PyMarshal_WriteObjectToString() (moved the relevant code there Guido van Rossum <guido@python.org>* parents: 3839 diff changeset	694 wf.error = 0;
13070 7392e71f6cce Michael Hudson <mwh21@cam.ac.uk>: Fred Drake <fdrake@acm.org> parents: 12576 diff changeset	695 wf.depth = 0;
4039 23f280ab5409 Added PyMarshal_WriteObjectToString() (moved the relevant code there Guido van Rossum <guido@python.org>* parents: 3839 diff changeset	696 w_object(x, &wf);
23f280ab5409 Added PyMarshal_WriteObjectToString() (moved the relevant code there Guido van Rossum <guido@python.org>* parents: 3839 diff changeset	697 if (wf.str != NULL)
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	698 _PyString_Resize(&wf.str,
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	699 (int) (wf.ptr -
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	700 PyString_AS_STRING((PyStringObject *)wf.str)));
4039 23f280ab5409 Added PyMarshal_WriteObjectToString() (moved the relevant code there Guido van Rossum <guido@python.org>* parents: 3839 diff changeset	701 if (wf.error) {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	702 Py_XDECREF(wf.str);
13070 7392e71f6cce Michael Hudson <mwh21@cam.ac.uk>: Fred Drake <fdrake@acm.org> parents: 12576 diff changeset	703 PyErr_SetString(PyExc_ValueError,
7392e71f6cce Michael Hudson <mwh21@cam.ac.uk>: Fred Drake <fdrake@acm.org> parents: 12576 diff changeset	704 (wf.error==1)?"unmarshallable object"
7392e71f6cce Michael Hudson <mwh21@cam.ac.uk>: Fred Drake <fdrake@acm.org> parents: 12576 diff changeset	705 :"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	706 return NULL;
23f280ab5409 Added PyMarshal_WriteObjectToString() (moved the relevant code there Guido van Rossum <guido@python.org>* parents: 3839 diff changeset	707 }
23f280ab5409 Added PyMarshal_WriteObjectToString() (moved the relevant code there Guido van Rossum <guido@python.org>* parents: 3839 diff changeset	708 return wf.str;
23f280ab5409 Added PyMarshal_WriteObjectToString() (moved the relevant code there Guido van Rossum <guido@python.org>* parents: 3839 diff changeset	709 }
23f280ab5409 Added PyMarshal_WriteObjectToString() (moved the relevant code there Guido van Rossum <guido@python.org>* parents: 3839 diff changeset	710
279 9c924f9c3b16 Add marshalling for dictionaries. Guido van Rossum <guido@python.org> parents: 272 diff changeset	711 /* And an interface for Python programs... */
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	712
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	713 static PyObject *
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	714 marshal_dump(self, args)
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	715 PyObject *self;
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	716 PyObject *args;
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	717 {
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	718 WFILE wf;
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	719 PyObject *x;
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	720 PyObject *f;
12135 667878776933 Use modern PyArg_ParseTuple style, with function names. Guido van Rossum <guido@python.org> parents: 11976 diff changeset	721 if (!PyArg_ParseTuple(args, "OO:dump", &x, &f))
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	722 return NULL;
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	723 if (!PyFile_Check(f)) {
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	724 PyErr_SetString(PyExc_TypeError,
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	725 "marshal.dump() 2nd arg must be file");
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	726 return NULL;
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	727 }
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	728 wf.fp = PyFile_AsFile(f);
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	729 wf.str = NULL;
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	730 wf.ptr = wf.end = NULL;
3731 de1cb33219e3 Jeremy's patches for more robust handling of unmarshallable types. Guido van Rossum <guido@python.org> parents: 3620 diff changeset	731 wf.error = 0;
13070 7392e71f6cce Michael Hudson <mwh21@cam.ac.uk>: Fred Drake <fdrake@acm.org> parents: 12576 diff changeset	732 wf.depth = 0;
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	733 w_object(x, &wf);
3731 de1cb33219e3 Jeremy's patches for more robust handling of unmarshallable types. Guido van Rossum <guido@python.org> parents: 3620 diff changeset	734 if (wf.error) {
13070 7392e71f6cce Michael Hudson <mwh21@cam.ac.uk>: Fred Drake <fdrake@acm.org> parents: 12576 diff changeset	735 PyErr_SetString(PyExc_ValueError,
7392e71f6cce Michael Hudson <mwh21@cam.ac.uk>: Fred Drake <fdrake@acm.org> parents: 12576 diff changeset	736 (wf.error==1)?"unmarshallable object"
7392e71f6cce Michael Hudson <mwh21@cam.ac.uk>: Fred Drake <fdrake@acm.org> parents: 12576 diff changeset	737 :"object too deeply nested to marshal");
3731 de1cb33219e3 Jeremy's patches for more robust handling of unmarshallable types. Guido van Rossum <guido@python.org> parents: 3620 diff changeset	738 return NULL;
de1cb33219e3 Jeremy's patches for more robust handling of unmarshallable types. Guido van Rossum <guido@python.org> parents: 3620 diff changeset	739 }
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	740 Py_INCREF(Py_None);
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	741 return Py_None;
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	742 }
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	743
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	744 static PyObject *
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	745 marshal_load(self, args)
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	746 PyObject *self;
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	747 PyObject *args;
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	748 {
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	749 RFILE rf;
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	750 PyObject *f;
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	751 PyObject *v;
12135 667878776933 Use modern PyArg_ParseTuple style, with function names. Guido van Rossum <guido@python.org> parents: 11976 diff changeset	752 if (!PyArg_ParseTuple(args, "O:load", &f))
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	753 return NULL;
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	754 if (!PyFile_Check(f)) {
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	755 PyErr_SetString(PyExc_TypeError,
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	756 "marshal.load() arg must be file");
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	757 return NULL;
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	758 }
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	759 rf.fp = PyFile_AsFile(f);
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	760 rf.str = NULL;
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	761 rf.ptr = rf.end = NULL;
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	762 PyErr_Clear();
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	763 v = r_object(&rf);
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	764 if (PyErr_Occurred()) {
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	765 Py_XDECREF(v);
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	766 v = NULL;
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	767 }
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	768 return v;
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	769 }
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	770
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	771 static PyObject *
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	772 marshal_dumps(self, args)
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	773 PyObject *self;
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	774 PyObject *args;
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	775 {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	776 PyObject *x;
12135 667878776933 Use modern PyArg_ParseTuple style, with function names. Guido van Rossum <guido@python.org> parents: 11976 diff changeset	777 if (!PyArg_ParseTuple(args, "O:dumps", &x))
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	778 return NULL;
4039 23f280ab5409 Added PyMarshal_WriteObjectToString() (moved the relevant code there Guido van Rossum <guido@python.org>* parents: 3839 diff changeset	779 return PyMarshal_WriteObjectToString(x);
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	780 }
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	781
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	782 static PyObject *
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	783 marshal_loads(self, args)
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	784 PyObject *self;
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	785 PyObject *args;
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	786 {
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	787 RFILE rf;
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	788 PyObject *v;
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	789 char *s;
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	790 int n;
12135 667878776933 Use modern PyArg_ParseTuple style, with function names. Guido van Rossum <guido@python.org> parents: 11976 diff changeset	791 if (!PyArg_ParseTuple(args, "s#:loads", &s, &n))
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	792 return NULL;
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	793 rf.fp = NULL;
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	794 rf.str = args;
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	795 rf.ptr = s;
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	796 rf.end = s + n;
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	797 PyErr_Clear();
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	798 v = r_object(&rf);
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	799 if (PyErr_Occurred()) {
5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	800 Py_XDECREF(v);
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	801 v = NULL;
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	802 }
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	803 return v;
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	804 }
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	805
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	806 static PyMethodDef marshal_methods[] = {
12135 667878776933 Use modern PyArg_ParseTuple style, with function names. Guido van Rossum <guido@python.org> parents: 11976 diff changeset	807 {"dump", marshal_dump, 1},
667878776933 Use modern PyArg_ParseTuple style, with function names. Guido van Rossum <guido@python.org> parents: 11976 diff changeset	808 {"load", marshal_load, 1},
667878776933 Use modern PyArg_ParseTuple style, with function names. Guido van Rossum <guido@python.org> parents: 11976 diff changeset	809 {"dumps", marshal_dumps, 1},
667878776933 Use modern PyArg_ParseTuple style, with function names. Guido van Rossum <guido@python.org> parents: 11976 diff changeset	810 {"loads", marshal_loads, 1},
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	811 {NULL, NULL} /* sentinel */
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	812 };
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	813
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	814 void
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	815 PyMarshal_Init()
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	816 {
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	817 (void) Py_InitModule("marshal", marshal_methods);
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	818 }

Mercurial > cpython-lru_cache-weakref

annotate Python/marshal.c @ 13255:916fb024ce94 legacy-trunk