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

annotate Python/modsupport.c @ 4503:65d2d8e67da3 legacy-trunk

New permission notice, includes CNRI.

author	Guido van Rossum <guido@python.org>
date	Fri, 25 Oct 1996 14:44:06 +0000
parents	faa21ce1ff01
children	5880384d7c71

rev	line source
145 853b736a6a9e Added copyright notice. Guido van Rossum <guido@python.org> parents: 86 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.
145 853b736a6a9e Added copyright notice. Guido van Rossum <guido@python.org> parents: 86 diff changeset	4
853b736a6a9e Added copyright notice. Guido van Rossum <guido@python.org> parents: 86 diff changeset	5 All Rights Reserved
853b736a6a9e Added copyright notice. Guido van Rossum <guido@python.org> parents: 86 diff changeset	6
4503 65d2d8e67da3 New permission notice, includes CNRI. Guido van Rossum <guido@python.org> parents: 3347 diff changeset	7 Permission to use, copy, modify, and distribute this software and its
65d2d8e67da3 New permission notice, includes CNRI. Guido van Rossum <guido@python.org> parents: 3347 diff changeset	8 documentation for any purpose and without fee is hereby granted,
145 853b736a6a9e Added copyright notice. Guido van Rossum <guido@python.org> parents: 86 diff changeset	9 provided that the above copyright notice appear in all copies and that
4503 65d2d8e67da3 New permission notice, includes CNRI. Guido van Rossum <guido@python.org> parents: 3347 diff changeset	10 both that copyright notice and this permission notice appear in
145 853b736a6a9e Added copyright notice. Guido van Rossum <guido@python.org> parents: 86 diff changeset	11 supporting documentation, and that the names of Stichting Mathematisch
4503 65d2d8e67da3 New permission notice, includes CNRI. Guido van Rossum <guido@python.org> parents: 3347 diff changeset	12 Centrum or CWI or Corporation for National Research Initiatives or
65d2d8e67da3 New permission notice, includes CNRI. Guido van Rossum <guido@python.org> parents: 3347 diff changeset	13 CNRI not be used in advertising or publicity pertaining to
65d2d8e67da3 New permission notice, includes CNRI. Guido van Rossum <guido@python.org> parents: 3347 diff changeset	14 distribution of the software without specific, written prior
65d2d8e67da3 New permission notice, includes CNRI. Guido van Rossum <guido@python.org> parents: 3347 diff changeset	15 permission.
145 853b736a6a9e Added copyright notice. Guido van Rossum <guido@python.org> parents: 86 diff changeset	16
4503 65d2d8e67da3 New permission notice, includes CNRI. Guido van Rossum <guido@python.org> parents: 3347 diff changeset	17 While CWI is the initial source for this software, a modified version
65d2d8e67da3 New permission notice, includes CNRI. Guido van Rossum <guido@python.org> parents: 3347 diff changeset	18 is made available by the Corporation for National Research Initiatives
65d2d8e67da3 New permission notice, includes CNRI. Guido van Rossum <guido@python.org> parents: 3347 diff changeset	19 (CNRI) at the Internet address ftp://ftp.python.org.
65d2d8e67da3 New permission notice, includes CNRI. Guido van Rossum <guido@python.org> parents: 3347 diff changeset	20
65d2d8e67da3 New permission notice, includes CNRI. Guido van Rossum <guido@python.org> parents: 3347 diff changeset	21 STICHTING MATHEMATISCH CENTRUM AND CNRI DISCLAIM ALL WARRANTIES WITH
65d2d8e67da3 New permission notice, includes CNRI. Guido van Rossum <guido@python.org> parents: 3347 diff changeset	22 REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF
65d2d8e67da3 New permission notice, includes CNRI. Guido van Rossum <guido@python.org> parents: 3347 diff changeset	23 MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH
65d2d8e67da3 New permission notice, includes CNRI. Guido van Rossum <guido@python.org> parents: 3347 diff changeset	24 CENTRUM OR CNRI BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
65d2d8e67da3 New permission notice, includes CNRI. Guido van Rossum <guido@python.org> parents: 3347 diff changeset	25 DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
65d2d8e67da3 New permission notice, includes CNRI. Guido van Rossum <guido@python.org> parents: 3347 diff changeset	26 PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
65d2d8e67da3 New permission notice, includes CNRI. Guido van Rossum <guido@python.org> parents: 3347 diff changeset	27 TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
65d2d8e67da3 New permission notice, includes CNRI. Guido van Rossum <guido@python.org> parents: 3347 diff changeset	28 PERFORMANCE OF THIS SOFTWARE.
145 853b736a6a9e Added copyright notice. Guido van Rossum <guido@python.org> parents: 86 diff changeset	29
853b736a6a9e Added copyright notice. Guido van Rossum <guido@python.org> parents: 86 diff changeset	30 ******************************************************************/
853b736a6a9e Added copyright notice. Guido van Rossum <guido@python.org> parents: 86 diff changeset	31
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	32 /* Module support implementation */
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	33
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 12 diff changeset	34 #include "allobjects.h"
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	35 #include "import.h"
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	36
1848 b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1319 diff changeset	37 #ifdef MPW /* MPW pushes 'extended' for float and double types with varargs */
b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1319 diff changeset	38 typedef extended va_double;
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	39 #else
1848 b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1319 diff changeset	40 typedef double va_double;
b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1319 diff changeset	41 #endif
b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1319 diff changeset	42
2095 0d7e4aa595f7 api version checking Guido van Rossum <guido@python.org> parents: 2090 diff changeset	43 /* initmodule4() parameters:
0d7e4aa595f7 api version checking Guido van Rossum <guido@python.org> parents: 2090 diff changeset	44 - name is the module name
0d7e4aa595f7 api version checking Guido van Rossum <guido@python.org> parents: 2090 diff changeset	45 - methods is the list of top-level functions
0d7e4aa595f7 api version checking Guido van Rossum <guido@python.org> parents: 2090 diff changeset	46 - doc is the documentation string
0d7e4aa595f7 api version checking Guido van Rossum <guido@python.org> parents: 2090 diff changeset	47 - passthrough is passed as self to functions defined in the module
0d7e4aa595f7 api version checking Guido van Rossum <guido@python.org> parents: 2090 diff changeset	48 - api_version is the value of PYTHON_API_VERSION at the time the
0d7e4aa595f7 api version checking Guido van Rossum <guido@python.org> parents: 2090 diff changeset	49 module was compiled
2090 f78b387b54e0 New newmethodobject() interface takes struct methodlist pointer Guido van Rossum <guido@python.org> parents: 2062 diff changeset	50 */
1848 b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1319 diff changeset	51
2095 0d7e4aa595f7 api version checking Guido van Rossum <guido@python.org> parents: 2090 diff changeset	52 static char api_version_warning[] =
0d7e4aa595f7 api version checking Guido van Rossum <guido@python.org> parents: 2090 diff changeset	53 "WARNING: Python C API version mismatch for module %s:\n\
3347 faa21ce1ff01 Corrected format string in api_version_warning. Sjoerd Mullender <sjoerd@acm.org> parents: 2501 diff changeset	54 This Python has API version %d, module %s has version %d.\n";
2095 0d7e4aa595f7 api version checking Guido van Rossum <guido@python.org> parents: 2090 diff changeset	55
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	56 object *
2095 0d7e4aa595f7 api version checking Guido van Rossum <guido@python.org> parents: 2090 diff changeset	57 initmodule4(name, methods, doc, passthrough, module_api_version)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	58 char *name;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	59 struct methodlist *methods;
2090 f78b387b54e0 New newmethodobject() interface takes struct methodlist pointer Guido van Rossum <guido@python.org> parents: 2062 diff changeset	60 char *doc;
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	61 object *passthrough;
2095 0d7e4aa595f7 api version checking Guido van Rossum <guido@python.org> parents: 2090 diff changeset	62 int module_api_version;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	63 {
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	64 object m, d, *v;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	65 struct methodlist *ml;
2095 0d7e4aa595f7 api version checking Guido van Rossum <guido@python.org> parents: 2090 diff changeset	66 if (module_api_version != PYTHON_API_VERSION)
0d7e4aa595f7 api version checking Guido van Rossum <guido@python.org> parents: 2090 diff changeset	67 fprintf(stderr, api_version_warning,
0d7e4aa595f7 api version checking Guido van Rossum <guido@python.org> parents: 2090 diff changeset	68 name, PYTHON_API_VERSION, name, module_api_version);
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 12 diff changeset	69 if ((m = add_module(name)) == NULL) {
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	70 fprintf(stderr, "initializing module: %s\n", name);
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	71 fatal("can't create a module");
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	72 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	73 d = getmoduledict(m);
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	74 for (ml = methods; ml->ml_name != NULL; ml++) {
2090 f78b387b54e0 New newmethodobject() interface takes struct methodlist pointer Guido van Rossum <guido@python.org> parents: 2062 diff changeset	75 v = newmethodobject(ml, passthrough);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	76 if (v == NULL \|\| dictinsert(d, ml->ml_name, v) != 0) {
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	77 fprintf(stderr, "initializing module: %s\n", name);
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	78 fatal("can't initialize module");
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	79 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	80 DECREF(v);
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	81 }
2090 f78b387b54e0 New newmethodobject() interface takes struct methodlist pointer Guido van Rossum <guido@python.org> parents: 2062 diff changeset	82 if (doc != NULL) {
f78b387b54e0 New newmethodobject() interface takes struct methodlist pointer Guido van Rossum <guido@python.org> parents: 2062 diff changeset	83 v = newstringobject(doc);
f78b387b54e0 New newmethodobject() interface takes struct methodlist pointer Guido van Rossum <guido@python.org> parents: 2062 diff changeset	84 if (v == NULL \|\| dictinsert(d, "__doc__", v) != 0)
f78b387b54e0 New newmethodobject() interface takes struct methodlist pointer Guido van Rossum <guido@python.org> parents: 2062 diff changeset	85 fatal("can't add doc string");
f78b387b54e0 New newmethodobject() interface takes struct methodlist pointer Guido van Rossum <guido@python.org> parents: 2062 diff changeset	86 DECREF(v);
f78b387b54e0 New newmethodobject() interface takes struct methodlist pointer Guido van Rossum <guido@python.org> parents: 2062 diff changeset	87 }
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 12 diff changeset	88 return m;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	89 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	90
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	91
1211 406860dfaac7 * stdwinmodule.c: various new commands: setwin{pos,size}, Guido van Rossum <guido@python.org> parents: 1198 diff changeset	92 /* Helper for mkvalue() to scan the length of a format */
817 aa633f0defa6 Merged with Steve Miale's version Guido van Rossum <guido@python.org> parents: 816 diff changeset	93
aa633f0defa6 Merged with Steve Miale's version Guido van Rossum <guido@python.org> parents: 816 diff changeset	94 static int countformat PROTO((char *format, int endchar));
aa633f0defa6 Merged with Steve Miale's version Guido van Rossum <guido@python.org> parents: 816 diff changeset	95 static int countformat(format, endchar)
aa633f0defa6 Merged with Steve Miale's version Guido van Rossum <guido@python.org> parents: 816 diff changeset	96 char *format;
aa633f0defa6 Merged with Steve Miale's version Guido van Rossum <guido@python.org> parents: 816 diff changeset	97 int endchar;
aa633f0defa6 Merged with Steve Miale's version Guido van Rossum <guido@python.org> parents: 816 diff changeset	98 {
aa633f0defa6 Merged with Steve Miale's version Guido van Rossum <guido@python.org> parents: 816 diff changeset	99 int count = 0;
aa633f0defa6 Merged with Steve Miale's version Guido van Rossum <guido@python.org> parents: 816 diff changeset	100 int level = 0;
aa633f0defa6 Merged with Steve Miale's version Guido van Rossum <guido@python.org> parents: 816 diff changeset	101 while (level > 0 \|\| *format != endchar) {
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	102 switch (*format) {
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	103 case '\0':
817 aa633f0defa6 Merged with Steve Miale's version Guido van Rossum <guido@python.org> parents: 816 diff changeset	104 /* Premature end */
aa633f0defa6 Merged with Steve Miale's version Guido van Rossum <guido@python.org> parents: 816 diff changeset	105 err_setstr(SystemError, "unmatched paren in format");
aa633f0defa6 Merged with Steve Miale's version Guido van Rossum <guido@python.org> parents: 816 diff changeset	106 return -1;
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	107 case '(':
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	108 case '[':
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	109 case '{':
817 aa633f0defa6 Merged with Steve Miale's version Guido van Rossum <guido@python.org> parents: 816 diff changeset	110 if (level == 0)
aa633f0defa6 Merged with Steve Miale's version Guido van Rossum <guido@python.org> parents: 816 diff changeset	111 count++;
aa633f0defa6 Merged with Steve Miale's version Guido van Rossum <guido@python.org> parents: 816 diff changeset	112 level++;
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	113 break;
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	114 case ')':
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	115 case ']':
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	116 case '}':
817 aa633f0defa6 Merged with Steve Miale's version Guido van Rossum <guido@python.org> parents: 816 diff changeset	117 level--;
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	118 break;
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	119 case '#':
2202 9894e55468ec support "O&" taking an object constructor a void* Guido van Rossum <guido@python.org> parents: 2154 diff changeset	120 case '&':
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	121 case ',':
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	122 case ':':
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	123 case ' ':
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	124 case '\t':
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	125 break;
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	126 default:
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	127 if (level == 0)
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	128 count++;
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	129 }
817 aa633f0defa6 Merged with Steve Miale's version Guido van Rossum <guido@python.org> parents: 816 diff changeset	130 format++;
aa633f0defa6 Merged with Steve Miale's version Guido van Rossum <guido@python.org> parents: 816 diff changeset	131 }
aa633f0defa6 Merged with Steve Miale's version Guido van Rossum <guido@python.org> parents: 816 diff changeset	132 return count;
aa633f0defa6 Merged with Steve Miale's version Guido van Rossum <guido@python.org> parents: 816 diff changeset	133 }
aa633f0defa6 Merged with Steve Miale's version Guido van Rossum <guido@python.org> parents: 816 diff changeset	134
aa633f0defa6 Merged with Steve Miale's version Guido van Rossum <guido@python.org> parents: 816 diff changeset	135
aa633f0defa6 Merged with Steve Miale's version Guido van Rossum <guido@python.org> parents: 816 diff changeset	136 /* Generic function to create a value -- the inverse of getargs() */
aa633f0defa6 Merged with Steve Miale's version Guido van Rossum <guido@python.org> parents: 816 diff changeset	137 /* After an original idea and first implementation by Steven Miale */
aa633f0defa6 Merged with Steve Miale's version Guido van Rossum <guido@python.org> parents: 816 diff changeset	138
aa633f0defa6 Merged with Steve Miale's version Guido van Rossum <guido@python.org> parents: 816 diff changeset	139 static object do_mktuple PROTO((char, va_list , int, int));
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	140 static object do_mklist PROTO((char, va_list , int, int));
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	141 static object do_mkdict PROTO((char, va_list , int, int));
817 aa633f0defa6 Merged with Steve Miale's version Guido van Rossum <guido@python.org> parents: 816 diff changeset	142 static object do_mkvalue PROTO((char, va_list ));
aa633f0defa6 Merged with Steve Miale's version Guido van Rossum <guido@python.org> parents: 816 diff changeset	143
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	144
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	145 static object *
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	146 do_mkdict(p_format, p_va, endchar, n)
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	147 char **p_format;
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	148 va_list *p_va;
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	149 int endchar;
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	150 int n;
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	151 {
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	152 object *d;
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	153 int i;
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	154 if (n < 0)
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	155 return NULL;
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	156 if ((d = newdictobject()) == NULL)
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	157 return NULL;
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	158 for (i = 0; i < n; i+= 2) {
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	159 object k, v;
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	160 k = do_mkvalue(p_format, p_va);
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	161 if (k == NULL) {
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	162 DECREF(d);
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	163 return NULL;
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	164 }
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	165 v = do_mkvalue(p_format, p_va);
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	166 if (v == NULL) {
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	167 DECREF(k);
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	168 DECREF(d);
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	169 return NULL;
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	170 }
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	171 if (dict2insert(d, k, v) < 0) {
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	172 DECREF(k);
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	173 DECREF(v);
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	174 DECREF(d);
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	175 return NULL;
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	176 }
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	177 }
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	178 if (d != NULL && **p_format != endchar) {
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	179 DECREF(d);
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	180 d = NULL;
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	181 err_setstr(SystemError, "Unmatched paren in format");
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	182 }
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	183 else if (endchar)
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	184 ++*p_format;
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	185 return d;
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	186 }
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	187
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	188 static object *
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	189 do_mklist(p_format, p_va, endchar, n)
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	190 char **p_format;
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	191 va_list *p_va;
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	192 int endchar;
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	193 int n;
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	194 {
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	195 object *v;
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	196 int i;
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	197 if (n < 0)
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	198 return NULL;
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	199 if ((v = newlistobject(n)) == NULL)
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	200 return NULL;
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	201 for (i = 0; i < n; i++) {
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	202 object *w = do_mkvalue(p_format, p_va);
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	203 if (w == NULL) {
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	204 DECREF(v);
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	205 return NULL;
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	206 }
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	207 setlistitem(v, i, w);
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	208 }
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	209 if (v != NULL && **p_format != endchar) {
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	210 DECREF(v);
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	211 v = NULL;
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	212 err_setstr(SystemError, "Unmatched paren in format");
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	213 }
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	214 else if (endchar)
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	215 ++*p_format;
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	216 return v;
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	217 }
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	218
816 e4a27d84ea36 Added mkvalue() function Guido van Rossum <guido@python.org> parents: 795 diff changeset	219 static object *
817 aa633f0defa6 Merged with Steve Miale's version Guido van Rossum <guido@python.org> parents: 816 diff changeset	220 do_mktuple(p_format, p_va, endchar, n)
aa633f0defa6 Merged with Steve Miale's version Guido van Rossum <guido@python.org> parents: 816 diff changeset	221 char **p_format;
aa633f0defa6 Merged with Steve Miale's version Guido van Rossum <guido@python.org> parents: 816 diff changeset	222 va_list *p_va;
aa633f0defa6 Merged with Steve Miale's version Guido van Rossum <guido@python.org> parents: 816 diff changeset	223 int endchar;
aa633f0defa6 Merged with Steve Miale's version Guido van Rossum <guido@python.org> parents: 816 diff changeset	224 int n;
aa633f0defa6 Merged with Steve Miale's version Guido van Rossum <guido@python.org> parents: 816 diff changeset	225 {
816 e4a27d84ea36 Added mkvalue() function Guido van Rossum <guido@python.org> parents: 795 diff changeset	226 object *v;
817 aa633f0defa6 Merged with Steve Miale's version Guido van Rossum <guido@python.org> parents: 816 diff changeset	227 int i;
aa633f0defa6 Merged with Steve Miale's version Guido van Rossum <guido@python.org> parents: 816 diff changeset	228 if (n < 0)
aa633f0defa6 Merged with Steve Miale's version Guido van Rossum <guido@python.org> parents: 816 diff changeset	229 return NULL;
aa633f0defa6 Merged with Steve Miale's version Guido van Rossum <guido@python.org> parents: 816 diff changeset	230 if ((v = newtupleobject(n)) == NULL)
aa633f0defa6 Merged with Steve Miale's version Guido van Rossum <guido@python.org> parents: 816 diff changeset	231 return NULL;
aa633f0defa6 Merged with Steve Miale's version Guido van Rossum <guido@python.org> parents: 816 diff changeset	232 for (i = 0; i < n; i++) {
aa633f0defa6 Merged with Steve Miale's version Guido van Rossum <guido@python.org> parents: 816 diff changeset	233 object *w = do_mkvalue(p_format, p_va);
aa633f0defa6 Merged with Steve Miale's version Guido van Rossum <guido@python.org> parents: 816 diff changeset	234 if (w == NULL) {
aa633f0defa6 Merged with Steve Miale's version Guido van Rossum <guido@python.org> parents: 816 diff changeset	235 DECREF(v);
aa633f0defa6 Merged with Steve Miale's version Guido van Rossum <guido@python.org> parents: 816 diff changeset	236 return NULL;
aa633f0defa6 Merged with Steve Miale's version Guido van Rossum <guido@python.org> parents: 816 diff changeset	237 }
aa633f0defa6 Merged with Steve Miale's version Guido van Rossum <guido@python.org> parents: 816 diff changeset	238 settupleitem(v, i, w);
aa633f0defa6 Merged with Steve Miale's version Guido van Rossum <guido@python.org> parents: 816 diff changeset	239 }
aa633f0defa6 Merged with Steve Miale's version Guido van Rossum <guido@python.org> parents: 816 diff changeset	240 if (v != NULL && **p_format != endchar) {
aa633f0defa6 Merged with Steve Miale's version Guido van Rossum <guido@python.org> parents: 816 diff changeset	241 DECREF(v);
aa633f0defa6 Merged with Steve Miale's version Guido van Rossum <guido@python.org> parents: 816 diff changeset	242 v = NULL;
aa633f0defa6 Merged with Steve Miale's version Guido van Rossum <guido@python.org> parents: 816 diff changeset	243 err_setstr(SystemError, "Unmatched paren in format");
aa633f0defa6 Merged with Steve Miale's version Guido van Rossum <guido@python.org> parents: 816 diff changeset	244 }
aa633f0defa6 Merged with Steve Miale's version Guido van Rossum <guido@python.org> parents: 816 diff changeset	245 else if (endchar)
aa633f0defa6 Merged with Steve Miale's version Guido van Rossum <guido@python.org> parents: 816 diff changeset	246 ++*p_format;
aa633f0defa6 Merged with Steve Miale's version Guido van Rossum <guido@python.org> parents: 816 diff changeset	247 return v;
aa633f0defa6 Merged with Steve Miale's version Guido van Rossum <guido@python.org> parents: 816 diff changeset	248 }
aa633f0defa6 Merged with Steve Miale's version Guido van Rossum <guido@python.org> parents: 816 diff changeset	249
aa633f0defa6 Merged with Steve Miale's version Guido van Rossum <guido@python.org> parents: 816 diff changeset	250 static object *
860 39134c99c923 Added parameter decls to do_mkvalue for non-template machines Guido van Rossum <guido@python.org> parents: 817 diff changeset	251 do_mkvalue(p_format, p_va)
39134c99c923 Added parameter decls to do_mkvalue for non-template machines Guido van Rossum <guido@python.org> parents: 817 diff changeset	252 char **p_format;
39134c99c923 Added parameter decls to do_mkvalue for non-template machines Guido van Rossum <guido@python.org> parents: 817 diff changeset	253 va_list *p_va;
39134c99c923 Added parameter decls to do_mkvalue for non-template machines Guido van Rossum <guido@python.org> parents: 817 diff changeset	254 {
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	255 for (;;) {
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	256 switch ((p_format)++) {
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	257 case '(':
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	258 return do_mktuple(p_format, p_va, ')',
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	259 countformat(*p_format, ')'));
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	260
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	261 case '[':
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	262 return do_mklist(p_format, p_va, ']',
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	263 countformat(*p_format, ']'));
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	264
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	265 case '{':
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	266 return do_mkdict(p_format, p_va, '}',
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	267 countformat(*p_format, '}'));
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	268
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	269 case 'b':
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	270 case 'h':
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	271 case 'i':
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	272 return newintobject((long)va_arg(*p_va, int));
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	273
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	274 case 'l':
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	275 return newintobject((long)va_arg(*p_va, long));
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	276
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	277 case 'f':
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	278 case 'd':
2202 9894e55468ec support "O&" taking an object constructor a void* Guido van Rossum <guido@python.org> parents: 2154 diff changeset	279 return newfloatobject((double)va_arg(*p_va, va_double));
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	280
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	281 case 'c':
817 aa633f0defa6 Merged with Steve Miale's version Guido van Rossum <guido@python.org> parents: 816 diff changeset	282 {
aa633f0defa6 Merged with Steve Miale's version Guido van Rossum <guido@python.org> parents: 816 diff changeset	283 char p[1];
aa633f0defa6 Merged with Steve Miale's version Guido van Rossum <guido@python.org> parents: 816 diff changeset	284 p[0] = va_arg(*p_va, int);
aa633f0defa6 Merged with Steve Miale's version Guido van Rossum <guido@python.org> parents: 816 diff changeset	285 return newsizedstringobject(p, 1);
aa633f0defa6 Merged with Steve Miale's version Guido van Rossum <guido@python.org> parents: 816 diff changeset	286 }
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	287
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	288 case 's':
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	289 case 'z':
816 e4a27d84ea36 Added mkvalue() function Guido van Rossum <guido@python.org> parents: 795 diff changeset	290 {
817 aa633f0defa6 Merged with Steve Miale's version Guido van Rossum <guido@python.org> parents: 816 diff changeset	291 object *v;
816 e4a27d84ea36 Added mkvalue() function Guido van Rossum <guido@python.org> parents: 795 diff changeset	292 char str = va_arg(p_va, char *);
e4a27d84ea36 Added mkvalue() function Guido van Rossum <guido@python.org> parents: 795 diff changeset	293 int n;
e4a27d84ea36 Added mkvalue() function Guido van Rossum <guido@python.org> parents: 795 diff changeset	294 if (**p_format == '#') {
e4a27d84ea36 Added mkvalue() function Guido van Rossum <guido@python.org> parents: 795 diff changeset	295 ++*p_format;
e4a27d84ea36 Added mkvalue() function Guido van Rossum <guido@python.org> parents: 795 diff changeset	296 n = va_arg(*p_va, int);
e4a27d84ea36 Added mkvalue() function Guido van Rossum <guido@python.org> parents: 795 diff changeset	297 }
e4a27d84ea36 Added mkvalue() function Guido van Rossum <guido@python.org> parents: 795 diff changeset	298 else
e4a27d84ea36 Added mkvalue() function Guido van Rossum <guido@python.org> parents: 795 diff changeset	299 n = -1;
e4a27d84ea36 Added mkvalue() function Guido van Rossum <guido@python.org> parents: 795 diff changeset	300 if (str == NULL) {
e4a27d84ea36 Added mkvalue() function Guido van Rossum <guido@python.org> parents: 795 diff changeset	301 v = None;
e4a27d84ea36 Added mkvalue() function Guido van Rossum <guido@python.org> parents: 795 diff changeset	302 INCREF(v);
e4a27d84ea36 Added mkvalue() function Guido van Rossum <guido@python.org> parents: 795 diff changeset	303 }
e4a27d84ea36 Added mkvalue() function Guido van Rossum <guido@python.org> parents: 795 diff changeset	304 else {
e4a27d84ea36 Added mkvalue() function Guido van Rossum <guido@python.org> parents: 795 diff changeset	305 if (n < 0)
e4a27d84ea36 Added mkvalue() function Guido van Rossum <guido@python.org> parents: 795 diff changeset	306 n = strlen(str);
e4a27d84ea36 Added mkvalue() function Guido van Rossum <guido@python.org> parents: 795 diff changeset	307 v = newsizedstringobject(str, n);
e4a27d84ea36 Added mkvalue() function Guido van Rossum <guido@python.org> parents: 795 diff changeset	308 }
817 aa633f0defa6 Merged with Steve Miale's version Guido van Rossum <guido@python.org> parents: 816 diff changeset	309 return v;
816 e4a27d84ea36 Added mkvalue() function Guido van Rossum <guido@python.org> parents: 795 diff changeset	310 }
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	311
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	312 case 'S':
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	313 case 'O':
2202 9894e55468ec support "O&" taking an object constructor a void* Guido van Rossum <guido@python.org> parents: 2154 diff changeset	314 if (**p_format == '&') {
2501 b5ce80114416 use PROTO macro around fn prototype Guido van Rossum <guido@python.org> parents: 2202 diff changeset	315 typedef object (converter) PROTO((void *));
2202 9894e55468ec support "O&" taking an object constructor a void* Guido van Rossum <guido@python.org> parents: 2154 diff changeset	316 converter func = va_arg(*p_va, converter);
9894e55468ec support "O&" taking an object constructor a void* Guido van Rossum <guido@python.org> parents: 2154 diff changeset	317 void arg = va_arg(p_va, void *);
9894e55468ec support "O&" taking an object constructor a void* Guido van Rossum <guido@python.org> parents: 2154 diff changeset	318 ++*p_format;
9894e55468ec support "O&" taking an object constructor a void* Guido van Rossum <guido@python.org> parents: 2154 diff changeset	319 return (*func)(arg);
9894e55468ec support "O&" taking an object constructor a void* Guido van Rossum <guido@python.org> parents: 2154 diff changeset	320 }
9894e55468ec support "O&" taking an object constructor a void* Guido van Rossum <guido@python.org> parents: 2154 diff changeset	321 else {
817 aa633f0defa6 Merged with Steve Miale's version Guido van Rossum <guido@python.org> parents: 816 diff changeset	322 object *v;
aa633f0defa6 Merged with Steve Miale's version Guido van Rossum <guido@python.org> parents: 816 diff changeset	323 v = va_arg(p_va, object );
aa633f0defa6 Merged with Steve Miale's version Guido van Rossum <guido@python.org> parents: 816 diff changeset	324 if (v != NULL)
aa633f0defa6 Merged with Steve Miale's version Guido van Rossum <guido@python.org> parents: 816 diff changeset	325 INCREF(v);
aa633f0defa6 Merged with Steve Miale's version Guido van Rossum <guido@python.org> parents: 816 diff changeset	326 else if (!err_occurred())
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	327 /* If a NULL was passed
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	328 * because a call that should
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	329 * have constructed a value
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	330 * failed, that's OK, and we
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	331 * pass the error on; but if
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	332 * no error occurred it's not
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	333 * clear that the caller knew
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	334 * what she was doing. */
817 aa633f0defa6 Merged with Steve Miale's version Guido van Rossum <guido@python.org> parents: 816 diff changeset	335 err_setstr(SystemError,
aa633f0defa6 Merged with Steve Miale's version Guido van Rossum <guido@python.org> parents: 816 diff changeset	336 "NULL object passed to mkvalue");
aa633f0defa6 Merged with Steve Miale's version Guido van Rossum <guido@python.org> parents: 816 diff changeset	337 return v;
816 e4a27d84ea36 Added mkvalue() function Guido van Rossum <guido@python.org> parents: 795 diff changeset	338 }
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	339
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	340 case ':':
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	341 case ',':
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	342 case ' ':
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	343 case '\t':
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	344 break;
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	345
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	346 default:
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	347 err_setstr(SystemError,
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	348 "bad format char passed to mkvalue");
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	349 return NULL;
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	350
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	351 }
816 e4a27d84ea36 Added mkvalue() function Guido van Rossum <guido@python.org> parents: 795 diff changeset	352 }
e4a27d84ea36 Added mkvalue() function Guido van Rossum <guido@python.org> parents: 795 diff changeset	353 }
e4a27d84ea36 Added mkvalue() function Guido van Rossum <guido@python.org> parents: 795 diff changeset	354
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	355
1848 b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1319 diff changeset	356 #ifdef HAVE_STDARG_PROTOTYPES
817 aa633f0defa6 Merged with Steve Miale's version Guido van Rossum <guido@python.org> parents: 816 diff changeset	357 /* VARARGS 2 */
aa633f0defa6 Merged with Steve Miale's version Guido van Rossum <guido@python.org> parents: 816 diff changeset	358 object mkvalue(char format, ...)
aa633f0defa6 Merged with Steve Miale's version Guido van Rossum <guido@python.org> parents: 816 diff changeset	359 #else
aa633f0defa6 Merged with Steve Miale's version Guido van Rossum <guido@python.org> parents: 816 diff changeset	360 /* VARARGS */
aa633f0defa6 Merged with Steve Miale's version Guido van Rossum <guido@python.org> parents: 816 diff changeset	361 object *mkvalue(va_alist) va_dcl
aa633f0defa6 Merged with Steve Miale's version Guido van Rossum <guido@python.org> parents: 816 diff changeset	362 #endif
816 e4a27d84ea36 Added mkvalue() function Guido van Rossum <guido@python.org> parents: 795 diff changeset	363 {
817 aa633f0defa6 Merged with Steve Miale's version Guido van Rossum <guido@python.org> parents: 816 diff changeset	364 va_list va;
aa633f0defa6 Merged with Steve Miale's version Guido van Rossum <guido@python.org> parents: 816 diff changeset	365 object* retval;
1848 b724599401ff Merge back to main trunk Guido van Rossum <guido@python.org> parents: 1319 diff changeset	366 #ifdef HAVE_STDARG_PROTOTYPES
817 aa633f0defa6 Merged with Steve Miale's version Guido van Rossum <guido@python.org> parents: 816 diff changeset	367 va_start(va, format);
aa633f0defa6 Merged with Steve Miale's version Guido van Rossum <guido@python.org> parents: 816 diff changeset	368 #else
aa633f0defa6 Merged with Steve Miale's version Guido van Rossum <guido@python.org> parents: 816 diff changeset	369 char *format;
aa633f0defa6 Merged with Steve Miale's version Guido van Rossum <guido@python.org> parents: 816 diff changeset	370 va_start(va);
aa633f0defa6 Merged with Steve Miale's version Guido van Rossum <guido@python.org> parents: 816 diff changeset	371 format = va_arg(va, char *);
aa633f0defa6 Merged with Steve Miale's version Guido van Rossum <guido@python.org> parents: 816 diff changeset	372 #endif
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1211 diff changeset	373 retval = vmkvalue(format, va);
817 aa633f0defa6 Merged with Steve Miale's version Guido van Rossum <guido@python.org> parents: 816 diff changeset	374 va_end(va);
aa633f0defa6 Merged with Steve Miale's version Guido van Rossum <guido@python.org> parents: 816 diff changeset	375 return retval;
816 e4a27d84ea36 Added mkvalue() function Guido van Rossum <guido@python.org> parents: 795 diff changeset	376 }
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1211 diff changeset	377
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1211 diff changeset	378 object *
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1211 diff changeset	379 vmkvalue(format, va)
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1211 diff changeset	380 char *format;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1211 diff changeset	381 va_list va;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1211 diff changeset	382 {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1211 diff changeset	383 char *f = format;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1211 diff changeset	384 int n = countformat(f, '\0');
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	385 va_list lva;
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	386
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	387 #ifdef VA_LIST_IS_ARRAY
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	388 memcpy(lva, va, sizeof(va_list));
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	389 #else
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	390 lva = va;
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	391 #endif
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	392
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1211 diff changeset	393 if (n < 0)
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1211 diff changeset	394 return NULL;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1211 diff changeset	395 if (n == 0) {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1211 diff changeset	396 INCREF(None);
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1211 diff changeset	397 return None;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1211 diff changeset	398 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1211 diff changeset	399 if (n == 1)
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	400 return do_mkvalue(&f, &lva);
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	401 return do_mktuple(&f, &lva, '\0', n);
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	402 }
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	403
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	404
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	405 #ifdef HAVE_STDARG_PROTOTYPES
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	406 object *
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	407 PyEval_CallFunction(object obj, char format, ...)
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	408 #else
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	409 object *
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	410 PyEval_CallFunction(obj, format, va_alist)
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	411 object *obj;
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	412 char *format;
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	413 va_dcl
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	414 #endif
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	415 {
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	416 va_list vargs;
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	417 object *args;
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	418 object *res;
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	419
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	420 #ifdef HAVE_STDARG_PROTOTYPES
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	421 va_start(vargs, format);
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	422 #else
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	423 va_start(vargs);
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	424 #endif
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	425
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	426 args = vmkvalue(format, vargs);
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	427 va_end(vargs);
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	428
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	429 if (args == NULL)
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	430 return NULL;
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	431
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	432 res = call_object(obj, args);
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	433 DECREF(args);
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	434
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	435 return res;
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1211 diff changeset	436 }
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	437
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	438
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	439 #ifdef HAVE_STDARG_PROTOTYPES
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	440 object *
2154 0728feb1d031 rename method arg because of typedef conflict Guido van Rossum <guido@python.org> parents: 2095 diff changeset	441 PyEval_CallMethod(object obj, char methonname, char *format, ...)
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	442 #else
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	443 object *
2154 0728feb1d031 rename method arg because of typedef conflict Guido van Rossum <guido@python.org> parents: 2095 diff changeset	444 PyEval_CallMethod(obj, methonname, format, va_alist)
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	445 object *obj;
2154 0728feb1d031 rename method arg because of typedef conflict Guido van Rossum <guido@python.org> parents: 2095 diff changeset	446 char *methonname;
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	447 char *format;
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	448 va_dcl
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	449 #endif
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	450 {
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	451 va_list vargs;
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	452 object *meth;
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	453 object *args;
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	454 object *res;
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	455
2154 0728feb1d031 rename method arg because of typedef conflict Guido van Rossum <guido@python.org> parents: 2095 diff changeset	456 meth = getattr(obj, methonname);
2052 d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	457 if (meth == NULL)
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	458 return NULL;
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	459
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	460 #ifdef HAVE_STDARG_PROTOTYPES
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	461 va_start(vargs, format);
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	462 #else
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	463 va_start(vargs);
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	464 #endif
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	465
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	466 args = vmkvalue(format, vargs);
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	467 va_end(vargs);
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	468
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	469 if (args == NULL) {
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	470 DECREF(meth);
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	471 return NULL;
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	472 }
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	473
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	474 res = call_object(meth, args);
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	475 DECREF(meth);
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	476 DECREF(args);
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	477
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	478 return res;
d7e91437f0a2 Lots of changes, most minor (fatal() instead of abort(), use of Guido van Rossum <guido@python.org> parents: 1913 diff changeset	479 }

Mercurial > cpython-lru_cache-weakref

annotate Python/modsupport.c @ 4503:65d2d8e67da3 legacy-trunk