cpython-lru_cache-weakref: Objects/stringobject.c annotate

annotate Objects/stringobject.c @ 1590:ac2e5cc29949 legacy-trunk

Added tests for missing host to open_http and open_gopher

author	Guido van Rossum <guido@python.org>
date	Mon, 18 Apr 1994 09:39:56 +0000
parents	f5b1ddfddba8
children	0d318475f9e3

rev	line source
145 853b736a6a9e Added copyright notice. Guido van Rossum <guido@python.org> parents: 136 diff changeset	1 /***********************************************************
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	2 Copyright 1991, 1992, 1993 by Stichting Mathematisch Centrum,
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	3 Amsterdam, The Netherlands.
145 853b736a6a9e Added copyright notice. Guido van Rossum <guido@python.org> parents: 136 diff changeset	4
853b736a6a9e Added copyright notice. Guido van Rossum <guido@python.org> parents: 136 diff changeset	5 All Rights Reserved
853b736a6a9e Added copyright notice. Guido van Rossum <guido@python.org> parents: 136 diff changeset	6
853b736a6a9e Added copyright notice. Guido van Rossum <guido@python.org> parents: 136 diff changeset	7 Permission to use, copy, modify, and distribute this software and its
853b736a6a9e Added copyright notice. Guido van Rossum <guido@python.org> parents: 136 diff changeset	8 documentation for any purpose and without fee is hereby granted,
853b736a6a9e Added copyright notice. Guido van Rossum <guido@python.org> parents: 136 diff changeset	9 provided that the above copyright notice appear in all copies and that
853b736a6a9e Added copyright notice. Guido van Rossum <guido@python.org> parents: 136 diff changeset	10 both that copyright notice and this permission notice appear in
853b736a6a9e Added copyright notice. Guido van Rossum <guido@python.org> parents: 136 diff changeset	11 supporting documentation, and that the names of Stichting Mathematisch
853b736a6a9e Added copyright notice. Guido van Rossum <guido@python.org> parents: 136 diff changeset	12 Centrum or CWI not be used in advertising or publicity pertaining to
853b736a6a9e Added copyright notice. Guido van Rossum <guido@python.org> parents: 136 diff changeset	13 distribution of the software without specific, written prior permission.
853b736a6a9e Added copyright notice. Guido van Rossum <guido@python.org> parents: 136 diff changeset	14
853b736a6a9e Added copyright notice. Guido van Rossum <guido@python.org> parents: 136 diff changeset	15 STICHTING MATHEMATISCH CENTRUM DISCLAIMS ALL WARRANTIES WITH REGARD TO
853b736a6a9e Added copyright notice. Guido van Rossum <guido@python.org> parents: 136 diff changeset	16 THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
853b736a6a9e Added copyright notice. Guido van Rossum <guido@python.org> parents: 136 diff changeset	17 FITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH CENTRUM BE LIABLE
853b736a6a9e Added copyright notice. Guido van Rossum <guido@python.org> parents: 136 diff changeset	18 FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
853b736a6a9e Added copyright notice. Guido van Rossum <guido@python.org> parents: 136 diff changeset	19 WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
853b736a6a9e Added copyright notice. Guido van Rossum <guido@python.org> parents: 136 diff changeset	20 ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
853b736a6a9e Added copyright notice. Guido van Rossum <guido@python.org> parents: 136 diff changeset	21 OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
853b736a6a9e Added copyright notice. Guido van Rossum <guido@python.org> parents: 136 diff changeset	22
853b736a6a9e Added copyright notice. Guido van Rossum <guido@python.org> parents: 136 diff changeset	23 ******************************************************************/
853b736a6a9e Added copyright notice. Guido van Rossum <guido@python.org> parents: 136 diff changeset	24
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	25 /* String object implementation */
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	26
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: 82 diff changeset	27 #include "allobjects.h"
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	28
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	29 #ifdef COUNT_ALLOCS
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	30 int null_strings, one_strings;
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	31 #endif
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	32
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	33 #ifdef __STDC__
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	34 #include <limits.h>
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	35 #else
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	36 #ifndef UCHAR_MAX
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	37 #define UCHAR_MAX 255
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	38 #endif
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	39 #endif
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	40
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	41 static stringobject *characters[UCHAR_MAX + 1];
1380 a4aa83012af3 Fixed bugs in resizetuple and extended the interface. Sjoerd Mullender <sjoerd@acm.org> parents: 1368 diff changeset	42 #ifndef DONT_SHARE_SHORT_STRINGS
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	43 static stringobject *nullstring;
1380 a4aa83012af3 Fixed bugs in resizetuple and extended the interface. Sjoerd Mullender <sjoerd@acm.org> parents: 1368 diff changeset	44 #endif
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	45
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	46 /*
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	47 Newsizedstringobject() and newstringobject() try in certain cases
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	48 to share string objects. When the size of the string is zero,
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	49 these routines always return a pointer to the same string object;
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	50 when the size is one, they return a pointer to an already existing
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	51 object if the contents of the string is known. For
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	52 newstringobject() this is always the case, for
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	53 newsizedstringobject() this is the case when the first argument in
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	54 not NULL.
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	55 A common practice to allocate a string and then fill it in or
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	56 change it must be done carefully. It is only allowed to change the
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	57 contents of the string if the obect was gotten from
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	58 newsizedstringobject() with a NULL first argument, because in the
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	59 future these routines may try to do even more sharing of objects.
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	60 */
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	61 object *
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	62 newsizedstringobject(str, size)
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	63 char *str;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	64 int size;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	65 {
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	66 register stringobject *op;
1380 a4aa83012af3 Fixed bugs in resizetuple and extended the interface. Sjoerd Mullender <sjoerd@acm.org> parents: 1368 diff changeset	67 #ifndef DONT_SHARE_SHORT_STRINGS
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	68 if (size == 0 && (op = nullstring) != NULL) {
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	69 #ifdef COUNT_ALLOCS
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	70 null_strings++;
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	71 #endif
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	72 INCREF(op);
1368 4c8e5fcb3301 Add some necessary casts; use double quotes to represent strings in Guido van Rossum <guido@python.org> parents: 1356 diff changeset	73 return (object *)op;
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	74 }
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	75 if (size == 1 && str != NULL && (op = characters[*str & UCHAR_MAX]) != NULL) {
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	76 #ifdef COUNT_ALLOCS
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	77 one_strings++;
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	78 #endif
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	79 INCREF(op);
1368 4c8e5fcb3301 Add some necessary casts; use double quotes to represent strings in Guido van Rossum <guido@python.org> parents: 1356 diff changeset	80 return (object *)op;
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	81 }
1380 a4aa83012af3 Fixed bugs in resizetuple and extended the interface. Sjoerd Mullender <sjoerd@acm.org> parents: 1368 diff changeset	82 #endif /* DONT_SHARE_SHORT_STRINGS */
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	83 op = (stringobject *)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	84 malloc(sizeof(stringobject) + size * sizeof(char));
27 82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	85 if (op == NULL)
82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	86 return err_nomem();
82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	87 op->ob_type = &Stringtype;
82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	88 op->ob_size = size;
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	89 #ifdef CACHE_HASH
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	90 op->ob_shash = -1;
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	91 #endif
1347 a22a350d3a5d * Extended X interface: pixmap objects, colormap objects visual objects, Sjoerd Mullender <sjoerd@acm.org> parents: 1313 diff changeset	92 NEWREF(op);
27 82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	93 if (str != NULL)
82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	94 memcpy(op->ob_sval, str, size);
82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	95 op->ob_sval[size] = '\0';
1380 a4aa83012af3 Fixed bugs in resizetuple and extended the interface. Sjoerd Mullender <sjoerd@acm.org> parents: 1368 diff changeset	96 #ifndef DONT_SHARE_SHORT_STRINGS
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	97 if (size == 0) {
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	98 nullstring = op;
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	99 INCREF(op);
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	100 } else if (size == 1 && str != NULL) {
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	101 characters[*str & UCHAR_MAX] = op;
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	102 INCREF(op);
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	103 }
1380 a4aa83012af3 Fixed bugs in resizetuple and extended the interface. Sjoerd Mullender <sjoerd@acm.org> parents: 1368 diff changeset	104 #endif
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	105 return (object *) op;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	106 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	107
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	108 object *
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	109 newstringobject(str)
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	110 char *str;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	111 {
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	112 register unsigned int size = strlen(str);
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	113 register stringobject *op;
1380 a4aa83012af3 Fixed bugs in resizetuple and extended the interface. Sjoerd Mullender <sjoerd@acm.org> parents: 1368 diff changeset	114 #ifndef DONT_SHARE_SHORT_STRINGS
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	115 if (size == 0 && (op = nullstring) != NULL) {
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	116 #ifdef COUNT_ALLOCS
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	117 null_strings++;
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	118 #endif
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	119 INCREF(op);
1368 4c8e5fcb3301 Add some necessary casts; use double quotes to represent strings in Guido van Rossum <guido@python.org> parents: 1356 diff changeset	120 return (object *)op;
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	121 }
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	122 if (size == 1 && (op = characters[*str & UCHAR_MAX]) != NULL) {
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	123 #ifdef COUNT_ALLOCS
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	124 one_strings++;
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	125 #endif
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	126 INCREF(op);
1368 4c8e5fcb3301 Add some necessary casts; use double quotes to represent strings in Guido van Rossum <guido@python.org> parents: 1356 diff changeset	127 return (object *)op;
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	128 }
1380 a4aa83012af3 Fixed bugs in resizetuple and extended the interface. Sjoerd Mullender <sjoerd@acm.org> parents: 1368 diff changeset	129 #endif /* DONT_SHARE_SHORT_STRINGS */
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	130 op = (stringobject *)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	131 malloc(sizeof(stringobject) + size * sizeof(char));
27 82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	132 if (op == NULL)
82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	133 return err_nomem();
82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	134 op->ob_type = &Stringtype;
82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	135 op->ob_size = size;
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	136 #ifdef CACHE_HASH
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	137 op->ob_shash = -1;
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	138 #endif
1347 a22a350d3a5d * Extended X interface: pixmap objects, colormap objects visual objects, Sjoerd Mullender <sjoerd@acm.org> parents: 1313 diff changeset	139 NEWREF(op);
27 82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	140 strcpy(op->ob_sval, str);
1380 a4aa83012af3 Fixed bugs in resizetuple and extended the interface. Sjoerd Mullender <sjoerd@acm.org> parents: 1368 diff changeset	141 #ifndef DONT_SHARE_SHORT_STRINGS
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	142 if (size == 0) {
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	143 nullstring = op;
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	144 INCREF(op);
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	145 } else if (size == 1) {
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	146 characters[*str & UCHAR_MAX] = op;
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	147 INCREF(op);
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	148 }
1380 a4aa83012af3 Fixed bugs in resizetuple and extended the interface. Sjoerd Mullender <sjoerd@acm.org> parents: 1368 diff changeset	149 #endif
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	150 return (object *) op;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	151 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	152
1313 6ee380349c84 * Added gmtime/localtime/mktime and SYSV timezone globals to timemodule.c. Guido van Rossum <guido@python.org> parents: 1282 diff changeset	153 static void
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	154 string_dealloc(op)
750 a5e6881cebf0 lint fix Guido van Rossum <guido@python.org> parents: 287 diff changeset	155 object *op;
a5e6881cebf0 lint fix Guido van Rossum <guido@python.org> parents: 287 diff changeset	156 {
a5e6881cebf0 lint fix Guido van Rossum <guido@python.org> parents: 287 diff changeset	157 DEL(op);
a5e6881cebf0 lint fix Guido van Rossum <guido@python.org> parents: 287 diff changeset	158 }
a5e6881cebf0 lint fix Guido van Rossum <guido@python.org> parents: 287 diff changeset	159
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	160 unsigned int
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	161 getstringsize(op)
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	162 register object *op;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	163 {
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	164 if (!is_stringobject(op)) {
27 82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	165 err_badcall();
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	166 return -1;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	167 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	168 return ((stringobject *)op) -> ob_size;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	169 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	170
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	171 /const/ char *
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	172 getstringvalue(op)
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	173 register object *op;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	174 {
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	175 if (!is_stringobject(op)) {
27 82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	176 err_badcall();
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	177 return NULL;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	178 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	179 return ((stringobject *)op) -> ob_sval;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	180 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	181
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	182 /* Methods */
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	183
287 07efda2951a8 printobject now returns an error code Guido van Rossum <guido@python.org> parents: 259 diff changeset	184 static int
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	185 string_print(op, fp, flags)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	186 stringobject *op;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	187 FILE *fp;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	188 int flags;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	189 {
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	190 int i;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	191 char c;
1368 4c8e5fcb3301 Add some necessary casts; use double quotes to represent strings in Guido van Rossum <guido@python.org> parents: 1356 diff changeset	192 int quote;
287 07efda2951a8 printobject now returns an error code Guido van Rossum <guido@python.org> parents: 259 diff changeset	193 /* XXX Ought to check for interrupts when writing long strings */
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	194 if (flags & PRINT_RAW) {
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	195 fwrite(op->ob_sval, 1, (int) op->ob_size, fp);
287 07efda2951a8 printobject now returns an error code Guido van Rossum <guido@python.org> parents: 259 diff changeset	196 return 0;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	197 }
1368 4c8e5fcb3301 Add some necessary casts; use double quotes to represent strings in Guido van Rossum <guido@python.org> parents: 1356 diff changeset	198
4c8e5fcb3301 Add some necessary casts; use double quotes to represent strings in Guido van Rossum <guido@python.org> parents: 1356 diff changeset	199 /* figure out which quote to use; single is prefered */
4c8e5fcb3301 Add some necessary casts; use double quotes to represent strings in Guido van Rossum <guido@python.org> parents: 1356 diff changeset	200 quote = '\'';
4c8e5fcb3301 Add some necessary casts; use double quotes to represent strings in Guido van Rossum <guido@python.org> parents: 1356 diff changeset	201 if (strchr(op->ob_sval, '\'') && !strchr(op->ob_sval, '"'))
4c8e5fcb3301 Add some necessary casts; use double quotes to represent strings in Guido van Rossum <guido@python.org> parents: 1356 diff changeset	202 quote = '"';
4c8e5fcb3301 Add some necessary casts; use double quotes to represent strings in Guido van Rossum <guido@python.org> parents: 1356 diff changeset	203
4c8e5fcb3301 Add some necessary casts; use double quotes to represent strings in Guido van Rossum <guido@python.org> parents: 1356 diff changeset	204 fputc(quote, fp);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	205 for (i = 0; i < op->ob_size; i++) {
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	206 c = op->ob_sval[i];
1368 4c8e5fcb3301 Add some necessary casts; use double quotes to represent strings in Guido van Rossum <guido@python.org> parents: 1356 diff changeset	207 if (c == quote \|\| c == '\\')
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	208 fprintf(fp, "\\%c", c);
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	209 else if (c < ' ' \|\| c >= 0177)
1368 4c8e5fcb3301 Add some necessary casts; use double quotes to represent strings in Guido van Rossum <guido@python.org> parents: 1356 diff changeset	210 fprintf(fp, "\\%03o", c & 0377);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	211 else
1368 4c8e5fcb3301 Add some necessary casts; use double quotes to represent strings in Guido van Rossum <guido@python.org> parents: 1356 diff changeset	212 fputc(c, fp);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	213 }
1368 4c8e5fcb3301 Add some necessary casts; use double quotes to represent strings in Guido van Rossum <guido@python.org> parents: 1356 diff changeset	214 fputc(quote, fp);
287 07efda2951a8 printobject now returns an error code Guido van Rossum <guido@python.org> parents: 259 diff changeset	215 return 0;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	216 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	217
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	218 static object *
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	219 string_repr(op)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	220 register stringobject *op;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	221 {
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	222 /* XXX overflow? */
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	223 int newsize = 2 + 4 * op->ob_size * sizeof(char);
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	224 object v = newsizedstringobject((char )NULL, newsize);
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	225 if (v == NULL) {
287 07efda2951a8 printobject now returns an error code Guido van Rossum <guido@python.org> parents: 259 diff changeset	226 return NULL;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	227 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	228 else {
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	229 register int i;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	230 register char c;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	231 register char *p;
1368 4c8e5fcb3301 Add some necessary casts; use double quotes to represent strings in Guido van Rossum <guido@python.org> parents: 1356 diff changeset	232 int quote;
4c8e5fcb3301 Add some necessary casts; use double quotes to represent strings in Guido van Rossum <guido@python.org> parents: 1356 diff changeset	233
4c8e5fcb3301 Add some necessary casts; use double quotes to represent strings in Guido van Rossum <guido@python.org> parents: 1356 diff changeset	234 /* figure out which quote to use; single is prefered */
4c8e5fcb3301 Add some necessary casts; use double quotes to represent strings in Guido van Rossum <guido@python.org> parents: 1356 diff changeset	235 quote = '\'';
4c8e5fcb3301 Add some necessary casts; use double quotes to represent strings in Guido van Rossum <guido@python.org> parents: 1356 diff changeset	236 if (strchr(op->ob_sval, '\'') && !strchr(op->ob_sval, '"'))
4c8e5fcb3301 Add some necessary casts; use double quotes to represent strings in Guido van Rossum <guido@python.org> parents: 1356 diff changeset	237 quote = '"';
4c8e5fcb3301 Add some necessary casts; use double quotes to represent strings in Guido van Rossum <guido@python.org> parents: 1356 diff changeset	238
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	239 p = ((stringobject *)v)->ob_sval;
1368 4c8e5fcb3301 Add some necessary casts; use double quotes to represent strings in Guido van Rossum <guido@python.org> parents: 1356 diff changeset	240 *p++ = quote;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	241 for (i = 0; i < op->ob_size; i++) {
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	242 c = op->ob_sval[i];
1368 4c8e5fcb3301 Add some necessary casts; use double quotes to represent strings in Guido van Rossum <guido@python.org> parents: 1356 diff changeset	243 if (c == quote \|\| c == '\\')
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	244 p++ = '\\', p++ = c;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	245 else if (c < ' ' \|\| c >= 0177) {
1368 4c8e5fcb3301 Add some necessary casts; use double quotes to represent strings in Guido van Rossum <guido@python.org> parents: 1356 diff changeset	246 sprintf(p, "\\%03o", c & 0377);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	247 while (*p != '\0')
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	248 p++;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	249 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	250 else
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	251 *p++ = c;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	252 }
1368 4c8e5fcb3301 Add some necessary casts; use double quotes to represent strings in Guido van Rossum <guido@python.org> parents: 1356 diff changeset	253 *p++ = quote;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	254 *p = '\0';
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	255 resizestring(&v, (int) (p - ((stringobject *)v)->ob_sval));
27 82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	256 return v;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	257 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	258 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	259
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	260 static int
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	261 string_length(a)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	262 stringobject *a;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	263 {
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	264 return a->ob_size;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	265 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	266
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	267 static object *
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	268 string_concat(a, bb)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	269 register stringobject *a;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	270 register object *bb;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	271 {
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	272 register unsigned int size;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	273 register stringobject *op;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	274 if (!is_stringobject(bb)) {
27 82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	275 err_badarg();
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	276 return NULL;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	277 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	278 #define b ((stringobject *)bb)
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	279 /* Optimize cases with empty left or right operand */
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	280 if (a->ob_size == 0) {
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	281 INCREF(bb);
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	282 return bb;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	283 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	284 if (b->ob_size == 0) {
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	285 INCREF(a);
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	286 return (object *)a;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	287 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	288 size = a->ob_size + b->ob_size;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	289 op = (stringobject *)
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	290 malloc(sizeof(stringobject) + size * sizeof(char));
27 82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	291 if (op == NULL)
82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	292 return err_nomem();
82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	293 op->ob_type = &Stringtype;
82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	294 op->ob_size = size;
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	295 #ifdef CACHE_HASH
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	296 op->ob_shash = -1;
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	297 #endif
1347 a22a350d3a5d * Extended X interface: pixmap objects, colormap objects visual objects, Sjoerd Mullender <sjoerd@acm.org> parents: 1313 diff changeset	298 NEWREF(op);
27 82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	299 memcpy(op->ob_sval, a->ob_sval, (int) a->ob_size);
82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	300 memcpy(op->ob_sval + a->ob_size, b->ob_sval, (int) b->ob_size);
82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	301 op->ob_sval[size] = '\0';
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	302 return (object *) op;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	303 #undef b
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	304 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	305
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	306 static object *
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	307 string_repeat(a, n)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	308 register stringobject *a;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	309 register int n;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	310 {
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	311 register int i;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	312 register unsigned int size;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	313 register stringobject *op;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	314 if (n < 0)
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	315 n = 0;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	316 size = a->ob_size * n;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	317 if (size == a->ob_size) {
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	318 INCREF(a);
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	319 return (object *)a;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	320 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	321 op = (stringobject *)
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	322 malloc(sizeof(stringobject) + size * sizeof(char));
27 82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	323 if (op == NULL)
82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	324 return err_nomem();
82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	325 op->ob_type = &Stringtype;
82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	326 op->ob_size = size;
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	327 #ifdef CACHE_HASH
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	328 op->ob_shash = -1;
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	329 #endif
1347 a22a350d3a5d * Extended X interface: pixmap objects, colormap objects visual objects, Sjoerd Mullender <sjoerd@acm.org> parents: 1313 diff changeset	330 NEWREF(op);
27 82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	331 for (i = 0; i < size; i += a->ob_size)
82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	332 memcpy(op->ob_sval+i, a->ob_sval, (int) a->ob_size);
82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	333 op->ob_sval[size] = '\0';
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	334 return (object *) op;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	335 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	336
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	337 /* String slice a[i:j] consists of characters a[i] ... a[j-1] */
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	338
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	339 static object *
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	340 string_slice(a, i, j)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	341 register stringobject *a;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	342 register int i, j; /* May be negative! */
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	343 {
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	344 if (i < 0)
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	345 i = 0;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	346 if (j < 0)
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	347 j = 0; /* Avoid signed/unsigned bug in next line */
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	348 if (j > a->ob_size)
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	349 j = a->ob_size;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	350 if (i == 0 && j == a->ob_size) { /* It's the same as a */
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	351 INCREF(a);
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	352 return (object *)a;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	353 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	354 if (j < i)
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	355 j = i;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	356 return newsizedstringobject(a->ob_sval + i, (int) (j-i));
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	357 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	358
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	359 static object *
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	360 string_item(a, i)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	361 stringobject *a;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	362 register int i;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	363 {
180 a405a31242e7 Optimized single-character strings gotten from s[i]. Guido van Rossum <guido@python.org> parents: 158 diff changeset	364 int c;
a405a31242e7 Optimized single-character strings gotten from s[i]. Guido van Rossum <guido@python.org> parents: 158 diff changeset	365 object *v;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	366 if (i < 0 \|\| i >= a->ob_size) {
27 82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	367 err_setstr(IndexError, "string index out of range");
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	368 return NULL;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	369 }
180 a405a31242e7 Optimized single-character strings gotten from s[i]. Guido van Rossum <guido@python.org> parents: 158 diff changeset	370 c = a->ob_sval[i] & UCHAR_MAX;
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	371 v = (object *) characters[c];
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	372 #ifdef COUNT_ALLOCS
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	373 if (v != NULL)
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	374 one_strings++;
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	375 #endif
180 a405a31242e7 Optimized single-character strings gotten from s[i]. Guido van Rossum <guido@python.org> parents: 158 diff changeset	376 if (v == NULL) {
a405a31242e7 Optimized single-character strings gotten from s[i]. Guido van Rossum <guido@python.org> parents: 158 diff changeset	377 v = newsizedstringobject((char *)NULL, 1);
a405a31242e7 Optimized single-character strings gotten from s[i]. Guido van Rossum <guido@python.org> parents: 158 diff changeset	378 if (v == NULL)
a405a31242e7 Optimized single-character strings gotten from s[i]. Guido van Rossum <guido@python.org> parents: 158 diff changeset	379 return NULL;
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	380 characters[c] = (stringobject *) v;
180 a405a31242e7 Optimized single-character strings gotten from s[i]. Guido van Rossum <guido@python.org> parents: 158 diff changeset	381 ((stringobject *)v)->ob_sval[0] = c;
a405a31242e7 Optimized single-character strings gotten from s[i]. Guido van Rossum <guido@python.org> parents: 158 diff changeset	382 }
a405a31242e7 Optimized single-character strings gotten from s[i]. Guido van Rossum <guido@python.org> parents: 158 diff changeset	383 INCREF(v);
a405a31242e7 Optimized single-character strings gotten from s[i]. Guido van Rossum <guido@python.org> parents: 158 diff changeset	384 return v;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	385 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	386
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	387 static int
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	388 string_compare(a, b)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	389 stringobject a, b;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	390 {
136 6523bd2954f0 Fix stringcompare when strings contain null bytes. Guido van Rossum <guido@python.org> parents: 86 diff changeset	391 int len_a = a->ob_size, len_b = b->ob_size;
6523bd2954f0 Fix stringcompare when strings contain null bytes. Guido van Rossum <guido@python.org> parents: 86 diff changeset	392 int min_len = (len_a < len_b) ? len_a : len_b;
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	393 int cmp;
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	394 if (min_len > 0) {
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	395 cmp = a->ob_sval - b->ob_sval;
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	396 if (cmp == 0)
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	397 cmp = memcmp(a->ob_sval, b->ob_sval, min_len);
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	398 if (cmp != 0)
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	399 return cmp;
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	400 }
136 6523bd2954f0 Fix stringcompare when strings contain null bytes. Guido van Rossum <guido@python.org> parents: 86 diff changeset	401 return (len_a < len_b) ? -1 : (len_a > len_b) ? 1 : 0;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	402 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	403
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	404 static long
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	405 string_hash(a)
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	406 stringobject *a;
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	407 {
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	408 register int len;
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	409 register unsigned char *p;
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	410 register long x;
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	411
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	412 #ifdef CACHE_HASH
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	413 if (a->ob_shash != -1)
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	414 return a->ob_shash;
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	415 #endif
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	416 len = a->ob_size;
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	417 p = (unsigned char *) a->ob_sval;
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	418 x = *p << 7;
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	419 while (--len >= 0)
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	420 x = (x + x + x) ^ *p++;
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	421 x ^= a->ob_size;
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	422 if (x == -1)
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	423 x = -2;
1356 043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	424 #ifdef CACHE_HASH
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	425 a->ob_shash = x;
043da19302ef Several optimizations and speed improvements. Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	426 #endif
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	427 return x;
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	428 }
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	429
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	430 static sequence_methods string_as_sequence = {
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	431 string_length, /sq_length/
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	432 string_concat, /sq_concat/
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	433 string_repeat, /sq_repeat/
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	434 string_item, /sq_item/
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	435 string_slice, /sq_slice/
259 6321d3dc57e0 Fix comments in string_as_sequence Guido van Rossum <guido@python.org> parents: 180 diff changeset	436 0, /sq_ass_item/
6321d3dc57e0 Fix comments in string_as_sequence Guido van Rossum <guido@python.org> parents: 180 diff changeset	437 0, /sq_ass_slice/
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	438 };
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	439
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	440 typeobject Stringtype = {
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	441 OB_HEAD_INIT(&Typetype)
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	442 0,
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	443 "string",
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	444 sizeof(stringobject),
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	445 sizeof(char),
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	446 string_dealloc, /tp_dealloc/
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	447 string_print, /tp_print/
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	448 0, /tp_getattr/
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	449 0, /tp_setattr/
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	450 string_compare, /tp_compare/
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	451 string_repr, /tp_repr/
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	452 0, /tp_as_number/
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	453 &string_as_sequence, /tp_as_sequence/
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	454 0, /tp_as_mapping/
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 1252 diff changeset	455 string_hash, /tp_hash/
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	456 };
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	457
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	458 void
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	459 joinstring(pv, w)
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	460 register object **pv;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	461 register object *w;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	462 {
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	463 register object *v;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	464 if (pv == NULL \|\| w == NULL \|\| !is_stringobject(pv))
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	465 return;
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	466 v = string_concat((stringobject ) pv, w);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	467 DECREF(*pv);
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	468 *pv = v;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	469 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	470
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	471 /* The following function breaks the notion that strings are immutable:
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	472 it changes the size of a string. We get away with this only if there
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	473 is only one module referencing the object. You can also think of it
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	474 as creating a new string object and destroying the old one, only
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	475 more efficiently. In any case, don't use this if the string may
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	476 already be known to some other part of the code... */
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	477
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	478 int
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	479 resizestring(pv, newsize)
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	480 object **pv;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	481 int newsize;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	482 {
71 ac4522e99ca9 Fixed resizestring() to work if reference tracing is turned on. Guido van Rossum <guido@python.org> parents: 27 diff changeset	483 register object *v;
ac4522e99ca9 Fixed resizestring() to work if reference tracing is turned on. Guido van Rossum <guido@python.org> parents: 27 diff changeset	484 register stringobject *sv;
ac4522e99ca9 Fixed resizestring() to work if reference tracing is turned on. Guido van Rossum <guido@python.org> parents: 27 diff changeset	485 v = *pv;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	486 if (!is_stringobject(v) \|\| v->ob_refcnt != 1) {
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	487 *pv = 0;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	488 DECREF(v);
27 82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	489 err_badcall();
82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	490 return -1;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	491 }
71 ac4522e99ca9 Fixed resizestring() to work if reference tracing is turned on. Guido van Rossum <guido@python.org> parents: 27 diff changeset	492 /* XXX UNREF/NEWREF interface should be more symmetrical */
82 554ac659b2cb Fix wrong #ifdef. Guido van Rossum <guido@python.org> parents: 71 diff changeset	493 #ifdef REF_DEBUG
71 ac4522e99ca9 Fixed resizestring() to work if reference tracing is turned on. Guido van Rossum <guido@python.org> parents: 27 diff changeset	494 --ref_total;
ac4522e99ca9 Fixed resizestring() to work if reference tracing is turned on. Guido van Rossum <guido@python.org> parents: 27 diff changeset	495 #endif
ac4522e99ca9 Fixed resizestring() to work if reference tracing is turned on. Guido van Rossum <guido@python.org> parents: 27 diff changeset	496 UNREF(v);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	497 pv = (object )
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	498 realloc((char *)v,
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	499 sizeof(stringobject) + newsize * sizeof(char));
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	500 if (*pv == NULL) {
71 ac4522e99ca9 Fixed resizestring() to work if reference tracing is turned on. Guido van Rossum <guido@python.org> parents: 27 diff changeset	501 DEL(v);
27 82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	502 err_nomem();
82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	503 return -1;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	504 }
71 ac4522e99ca9 Fixed resizestring() to work if reference tracing is turned on. Guido van Rossum <guido@python.org> parents: 27 diff changeset	505 NEWREF(*pv);
ac4522e99ca9 Fixed resizestring() to work if reference tracing is turned on. Guido van Rossum <guido@python.org> parents: 27 diff changeset	506 sv = (stringobject ) pv;
ac4522e99ca9 Fixed resizestring() to work if reference tracing is turned on. Guido van Rossum <guido@python.org> parents: 27 diff changeset	507 sv->ob_size = newsize;
ac4522e99ca9 Fixed resizestring() to work if reference tracing is turned on. Guido van Rossum <guido@python.org> parents: 27 diff changeset	508 sv->ob_sval[newsize] = '\0';
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	509 return 0;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	510 }
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	511
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	512 /* Helpers for formatstring */
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	513
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	514 static object *
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	515 getnextarg(args, arglen, p_argidx)
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	516 object *args;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	517 int arglen;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	518 int *p_argidx;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	519 {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	520 int argidx = *p_argidx;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	521 if (argidx < arglen) {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	522 (*p_argidx)++;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	523 if (arglen < 0)
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	524 return args;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	525 else
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	526 return gettupleitem(args, argidx);
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	527 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	528 err_setstr(TypeError, "not enough arguments for format string");
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	529 return NULL;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	530 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	531
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	532 #define F_LJUST (1<<0)
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	533 #define F_SIGN (1<<1)
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	534 #define F_BLANK (1<<2)
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	535 #define F_ALT (1<<3)
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	536 #define F_ZERO (1<<4)
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	537
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	538 extern double fabs PROTO((double));
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	539
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	540 static char *
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	541 formatfloat(flags, prec, type, v)
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	542 int flags;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	543 int prec;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	544 int type;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	545 object *v;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	546 {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	547 char fmt[20];
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	548 static char buf[120];
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	549 double x;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	550 if (!getargs(v, "d;float argument required", &x))
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	551 return NULL;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	552 if (prec < 0)
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	553 prec = 6;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	554 if (prec > 50)
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	555 prec = 50; /* Arbitrary limitation */
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	556 if (type == 'f' && fabs(x)/1e25 >= 1e25)
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	557 type = 'g';
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	558 sprintf(fmt, "%%%s.%d%c", (flags&F_ALT) ? "#" : "", prec, type);
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	559 sprintf(buf, fmt, x);
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	560 return buf;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	561 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	562
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	563 static char *
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	564 formatint(flags, prec, type, v)
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	565 int flags;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	566 int prec;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	567 int type;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	568 object *v;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	569 {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	570 char fmt[20];
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	571 static char buf[50];
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	572 long x;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	573 if (!getargs(v, "l;int argument required", &x))
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	574 return NULL;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	575 if (prec < 0)
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	576 prec = 1;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	577 sprintf(fmt, "%%%s.%dl%c", (flags&F_ALT) ? "#" : "", prec, type);
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	578 sprintf(buf, fmt, x);
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	579 return buf;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	580 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	581
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	582 static char *
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	583 formatchar(v)
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	584 object *v;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	585 {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	586 static char buf[2];
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	587 if (is_stringobject(v)) {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	588 if (!getargs(v, "c;%c requires int or char", &buf[0]))
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	589 return NULL;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	590 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	591 else {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	592 if (!getargs(v, "b;%c requires int or char", &buf[0]))
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	593 return NULL;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	594 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	595 buf[1] = '\0';
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	596 return buf;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	597 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	598
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	599 /* fmt%(v1,v2,...) is roughly equivalent to sprintf(fmt, v1, v2, ...) */
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	600
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	601 object *
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	602 formatstring(format, args)
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	603 object *format;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	604 object *args;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	605 {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	606 char fmt, res;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	607 int fmtcnt, rescnt, reslen, arglen, argidx;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	608 object *result;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	609 if (format == NULL \|\| !is_stringobject(format) \|\| args == NULL) {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	610 err_badcall();
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	611 return NULL;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	612 }
1282 e0464e7115ca * pythonrun.c: Print exception type+arg after stack trace instead of Guido van Rossum <guido@python.org> parents: 1257 diff changeset	613 fmt = getstringvalue(format);
e0464e7115ca * pythonrun.c: Print exception type+arg after stack trace instead of Guido van Rossum <guido@python.org> parents: 1257 diff changeset	614 fmtcnt = getstringsize(format);
e0464e7115ca * pythonrun.c: Print exception type+arg after stack trace instead of Guido van Rossum <guido@python.org> parents: 1257 diff changeset	615 reslen = rescnt = fmtcnt + 100;
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	616 result = newsizedstringobject((char *)NULL, reslen);
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	617 if (result == NULL)
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	618 return NULL;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	619 res = getstringvalue(result);
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	620 if (is_tupleobject(args)) {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	621 arglen = gettuplesize(args);
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	622 argidx = 0;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	623 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	624 else {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	625 arglen = -1;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	626 argidx = -2;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	627 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	628 while (--fmtcnt >= 0) {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	629 if (*fmt != '%') {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	630 if (--rescnt < 0) {
1282 e0464e7115ca * pythonrun.c: Print exception type+arg after stack trace instead of Guido van Rossum <guido@python.org> parents: 1257 diff changeset	631 rescnt = fmtcnt + 100;
e0464e7115ca * pythonrun.c: Print exception type+arg after stack trace instead of Guido van Rossum <guido@python.org> parents: 1257 diff changeset	632 reslen += rescnt;
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	633 if (resizestring(&result, reslen) < 0)
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	634 return NULL;
1282 e0464e7115ca * pythonrun.c: Print exception type+arg after stack trace instead of Guido van Rossum <guido@python.org> parents: 1257 diff changeset	635 res = getstringvalue(result) + reslen - rescnt;
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	636 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	637 res++ = fmt++;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	638 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	639 else {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	640 /* Got a format specifier */
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	641 int flags = 0;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	642 char *fmtstart = fmt++;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	643 int width = -1;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	644 int prec = -1;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	645 int size = 0;
1408 18df674539da Three micro fixes to formatstring Guido van Rossum <guido@python.org> parents: 1380 diff changeset	646 int c = '\0';
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	647 int fill;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	648 object *v;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	649 char *buf;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	650 int sign;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	651 int len;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	652 while (--fmtcnt >= 0) {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	653 switch (c = *fmt++) {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	654 case '-': flags \|= F_LJUST; continue;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	655 case '+': flags \|= F_SIGN; continue;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	656 case ' ': flags \|= F_BLANK; continue;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	657 case '#': flags \|= F_ALT; continue;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	658 case '0': flags \|= F_ZERO; continue;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	659 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	660 break;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	661 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	662 if (c == '*') {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	663 v = getnextarg(args, arglen, &argidx);
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	664 if (v == NULL)
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	665 goto error;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	666 if (!is_intobject(v)) {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	667 err_setstr(TypeError, "* wants int");
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	668 goto error;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	669 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	670 width = getintvalue(v);
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	671 if (width < 0)
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	672 width = 0;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	673 if (--fmtcnt >= 0)
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	674 c = *fmt++;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	675 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	676 else if (isdigit(c)) {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	677 width = c - '0';
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	678 while (--fmtcnt >= 0) {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	679 c = *fmt++;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	680 if (!isdigit(c))
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	681 break;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	682 if ((width*10) / 10 != width) {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	683 err_setstr(ValueError,
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	684 "width too big");
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	685 goto error;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	686 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	687 width = width*10 + (c - '0');
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	688 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	689 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	690 if (c == '.') {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	691 prec = 0;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	692 if (--fmtcnt >= 0)
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	693 c = *fmt++;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	694 if (c == '*') {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	695 v = getnextarg(args, arglen, &argidx);
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	696 if (v == NULL)
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	697 goto error;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	698 if (!is_intobject(v)) {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	699 err_setstr(TypeError,
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	700 "* wants int");
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	701 goto error;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	702 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	703 prec = getintvalue(v);
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	704 if (prec < 0)
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	705 prec = 0;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	706 if (--fmtcnt >= 0)
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	707 c = *fmt++;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	708 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	709 else if (isdigit(c)) {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	710 prec = c - '0';
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	711 while (--fmtcnt >= 0) {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	712 c = *fmt++;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	713 if (!isdigit(c))
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	714 break;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	715 if ((prec*10) / 10 != prec) {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	716 err_setstr(ValueError,
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	717 "prec too big");
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	718 goto error;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	719 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	720 prec = prec*10 + (c - '0');
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	721 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	722 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	723 } /* prec */
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	724 if (fmtcnt >= 0) {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	725 if (c == 'h' \|\| c == 'l' \|\| c == 'L') {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	726 size = c;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	727 if (--fmtcnt >= 0)
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	728 c = *fmt++;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	729 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	730 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	731 if (fmtcnt < 0) {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	732 err_setstr(ValueError, "incomplete format");
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	733 goto error;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	734 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	735 if (c != '%') {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	736 v = getnextarg(args, arglen, &argidx);
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	737 if (v == NULL)
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	738 goto error;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	739 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	740 sign = 0;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	741 fill = ' ';
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	742 switch (c) {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	743 case '%':
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	744 buf = "%";
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	745 len = 1;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	746 break;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	747 case 's':
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	748 if (!is_stringobject(v)) {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	749 err_setstr(TypeError,
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	750 "%s wants string");
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	751 goto error;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	752 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	753 buf = getstringvalue(v);
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	754 len = getstringsize(v);
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	755 if (prec >= 0 && len > prec)
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	756 len = prec;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	757 break;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	758 case 'i':
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	759 case 'd':
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	760 case 'u':
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	761 case 'o':
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	762 case 'x':
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	763 case 'X':
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	764 if (c == 'i')
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	765 c = 'd';
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	766 buf = formatint(flags, prec, c, v);
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	767 if (buf == NULL)
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	768 goto error;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	769 len = strlen(buf);
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	770 sign = (c == 'd');
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	771 if (flags&F_ZERO)
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	772 fill = '0';
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	773 break;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	774 case 'e':
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	775 case 'E':
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	776 case 'f':
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	777 case 'g':
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	778 case 'G':
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	779 buf = formatfloat(flags, prec, c, v);
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	780 if (buf == NULL)
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	781 goto error;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	782 len = strlen(buf);
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	783 sign = 1;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	784 if (flags&F_ZERO)
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	785 fill = '0';
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	786 break;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	787 case 'c':
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	788 buf = formatchar(v);
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	789 if (buf == NULL)
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	790 goto error;
1408 18df674539da Three micro fixes to formatstring Guido van Rossum <guido@python.org> parents: 1380 diff changeset	791 len = 1;
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	792 break;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	793 default:
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	794 err_setstr(ValueError,
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	795 "unsupported format character");
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	796 goto error;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	797 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	798 if (sign) {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	799 if (buf == '-' \|\| buf == '+') {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	800 sign = *buf++;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	801 len--;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	802 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	803 else if (flags & F_SIGN)
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	804 sign = '+';
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	805 else if (flags & F_BLANK)
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	806 sign = ' ';
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	807 else
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	808 sign = '\0';
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	809 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	810 if (width < len)
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	811 width = len;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	812 if (rescnt < width + (sign != '\0')) {
1282 e0464e7115ca * pythonrun.c: Print exception type+arg after stack trace instead of Guido van Rossum <guido@python.org> parents: 1257 diff changeset	813 reslen -= rescnt;
e0464e7115ca * pythonrun.c: Print exception type+arg after stack trace instead of Guido van Rossum <guido@python.org> parents: 1257 diff changeset	814 rescnt = width + fmtcnt + 100;
e0464e7115ca * pythonrun.c: Print exception type+arg after stack trace instead of Guido van Rossum <guido@python.org> parents: 1257 diff changeset	815 reslen += rescnt;
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	816 if (resizestring(&result, reslen) < 0)
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	817 return NULL;
1282 e0464e7115ca * pythonrun.c: Print exception type+arg after stack trace instead of Guido van Rossum <guido@python.org> parents: 1257 diff changeset	818 res = getstringvalue(result) + reslen - rescnt;
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	819 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	820 if (sign) {
1409 f5b1ddfddba8 Fix the fix :-( Guido van Rossum <guido@python.org> parents: 1408 diff changeset	821 if (fill != ' ')
f5b1ddfddba8 Fix the fix :-( Guido van Rossum <guido@python.org> parents: 1408 diff changeset	822 *res++ = sign;
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	823 rescnt--;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	824 if (width > len)
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	825 width--;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	826 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	827 if (width > len && !(flags&F_LJUST)) {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	828 do {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	829 --rescnt;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	830 *res++ = fill;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	831 } while (--width > len);
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	832 }
1409 f5b1ddfddba8 Fix the fix :-( Guido van Rossum <guido@python.org> parents: 1408 diff changeset	833 if (sign && fill == ' ')
1408 18df674539da Three micro fixes to formatstring Guido van Rossum <guido@python.org> parents: 1380 diff changeset	834 *res++ = sign;
1252 c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	835 memcpy(res, buf, len);
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	836 res += len;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	837 rescnt -= len;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	838 while (--width >= len) {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	839 --rescnt;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	840 *res++ = ' ';
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	841 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	842 } /* '%' */
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	843 } /* until end */
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	844 if (argidx < arglen) {
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	845 err_setstr(TypeError, "not all arguments converted");
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	846 goto error;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	847 }
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	848 resizestring(&result, reslen - rescnt);
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	849 return result;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	850 error:
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	851 DECREF(result);
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	852 return NULL;
c4cd0d9d8281 * Changed many files to use mkvalue() instead of newtupleobject(). Guido van Rossum <guido@python.org> parents: 1023 diff changeset	853 }

Mercurial > cpython-lru_cache-weakref

annotate Objects/stringobject.c @ 1590:ac2e5cc29949 legacy-trunk