cpython-lru_cache-weakref: Modules/

annotate Modules/_struct.c @ 63298:29ab536cfef6

Issue #9422: Fix memory leak when re-initializing a struct.Struct object.

author	Mark Dickinson <dickinsm@gmail.com>
date	Thu, 29 Jul 2010 21:41:59 +0000
parents	2683333755f3
children	8304bd765bcf

rev	line source
48591 1de718a31004 update the struct documentation to refer to bytes Benjamin Peterson <benjamin@python.org> parents: 48321 diff changeset	1 /* struct module -- pack values into and (out of) bytes objects */
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	3 /* New version supporting byte order, alignment and size options,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	4 character strings, and unsigned numbers */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	5
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	6 #define PY_SSIZE_T_CLEAN
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	7
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	8 #include "Python.h"
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	9 #include "structseq.h"
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	10 #include "structmember.h"
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	11 #include <ctype.h>
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	12
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	13 static PyTypeObject PyStructType;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	14
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	15 /* The translation function for each format character is table driven */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	16 typedef struct _formatdef {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	17 char format;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	18 Py_ssize_t size;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	19 Py_ssize_t alignment;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	20 PyObject* (unpack)(const char ,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	21 const struct _formatdef *);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	22 int (pack)(char , PyObject *,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	23 const struct _formatdef *);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	24 } formatdef;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	25
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	26 typedef struct _formatcode {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	27 const struct _formatdef *fmtdef;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	28 Py_ssize_t offset;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	29 Py_ssize_t size;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	30 } formatcode;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	31
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	32 /* Struct object interface */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	33
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	34 typedef struct {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	35 PyObject_HEAD
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	36 Py_ssize_t s_size;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	37 Py_ssize_t s_len;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	38 formatcode *s_codes;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	39 PyObject *s_format;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	40 PyObject weakreflist; / List of weak references */
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	41 } PyStructObject;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	42
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	43
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	44 #define PyStruct_Check(op) PyObject_TypeCheck(op, &PyStructType)
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	45 #define PyStruct_CheckExact(op) (Py_TYPE(op) == &PyStructType)
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	46
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	47
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	48 /* Exception */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	49
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	50 static PyObject *StructError;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	51
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	52
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	53 /* Define various structs to figure out the alignments of types */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	54
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	55
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	56 typedef struct { char c; short x; } st_short;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	57 typedef struct { char c; int x; } st_int;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	58 typedef struct { char c; long x; } st_long;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	59 typedef struct { char c; float x; } st_float;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	60 typedef struct { char c; double x; } st_double;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	61 typedef struct { char c; void *x; } st_void_p;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	62
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	63 #define SHORT_ALIGN (sizeof(st_short) - sizeof(short))
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	64 #define INT_ALIGN (sizeof(st_int) - sizeof(int))
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	65 #define LONG_ALIGN (sizeof(st_long) - sizeof(long))
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	66 #define FLOAT_ALIGN (sizeof(st_float) - sizeof(float))
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	67 #define DOUBLE_ALIGN (sizeof(st_double) - sizeof(double))
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	68 #define VOID_P_ALIGN (sizeof(st_void_p) - sizeof(void *))
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	69
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	70 /* We can't support q and Q in native mode unless the compiler does;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	71 in std mode, they're 8 bytes on all platforms. */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	72 #ifdef HAVE_LONG_LONG
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	73 typedef struct { char c; PY_LONG_LONG x; } s_long_long;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	74 #define LONG_LONG_ALIGN (sizeof(s_long_long) - sizeof(PY_LONG_LONG))
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	75 #endif
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	76
40737 6ebad2a6b990 Merged revisions 53451-53537 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40626 diff changeset	77 #ifdef HAVE_C99_BOOL
6ebad2a6b990 Merged revisions 53451-53537 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40626 diff changeset	78 #define BOOL_TYPE _Bool
6ebad2a6b990 Merged revisions 53451-53537 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40626 diff changeset	79 typedef struct { char c; _Bool x; } s_bool;
6ebad2a6b990 Merged revisions 53451-53537 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40626 diff changeset	80 #define BOOL_ALIGN (sizeof(s_bool) - sizeof(BOOL_TYPE))
6ebad2a6b990 Merged revisions 53451-53537 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40626 diff changeset	81 #else
6ebad2a6b990 Merged revisions 53451-53537 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40626 diff changeset	82 #define BOOL_TYPE char
6ebad2a6b990 Merged revisions 53451-53537 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40626 diff changeset	83 #define BOOL_ALIGN 0
6ebad2a6b990 Merged revisions 53451-53537 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40626 diff changeset	84 #endif
6ebad2a6b990 Merged revisions 53451-53537 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40626 diff changeset	85
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	86 #define STRINGIFY(x) #x
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	87
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	88 #ifdef __powerc
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	89 #pragma options align=reset
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	90 #endif
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	91
60252 9b24aa36c06f Internal refactoring in struct.pack: make all integer conversions go through get_pylong. Mark Dickinson <dickinsm@gmail.com> parents: 60240 diff changeset	92 /* Helper for integer format codes: converts an arbitrary Python object to a
9b24aa36c06f Internal refactoring in struct.pack: make all integer conversions go through get_pylong. Mark Dickinson <dickinsm@gmail.com> parents: 60240 diff changeset	93 PyLongObject if possible, otherwise fails. Caller should decref. */
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	94
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	95 static PyObject *
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	96 get_pylong(PyObject *v)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	97 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	98 assert(v != NULL);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	99 if (!PyLong_Check(v)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	100 /* Not an integer; try to use __index__ to convert. */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	101 if (PyIndex_Check(v)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	102 v = PyNumber_Index(v);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	103 if (v == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	104 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	105 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	106 else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	107 PyErr_SetString(StructError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	108 "required argument is not an integer");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	109 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	110 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	111 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	112 else
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	113 Py_INCREF(v);
53271 4527c152daa9 Issue #5463: Remove deprecated float coercion from struct module, along Mark Dickinson <dickinsm@gmail.com> parents: 52414 diff changeset	114
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	115 assert(PyLong_Check(v));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	116 return v;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	117 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	118
53271 4527c152daa9 Issue #5463: Remove deprecated float coercion from struct module, along Mark Dickinson <dickinsm@gmail.com> parents: 52414 diff changeset	119 /* Helper routine to get a C long and raise the appropriate error if it isn't
4527c152daa9 Issue #5463: Remove deprecated float coercion from struct module, along Mark Dickinson <dickinsm@gmail.com> parents: 52414 diff changeset	120 one */
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	121
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	122 static int
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	123 get_long(PyObject v, long p)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	124 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	125 long x;
53271 4527c152daa9 Issue #5463: Remove deprecated float coercion from struct module, along Mark Dickinson <dickinsm@gmail.com> parents: 52414 diff changeset	126
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	127 v = get_pylong(v);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	128 if (v == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	129 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	130 assert(PyLong_Check(v));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	131 x = PyLong_AsLong(v);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	132 Py_DECREF(v);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	133 if (x == (long)-1 && PyErr_Occurred()) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	134 if (PyErr_ExceptionMatches(PyExc_OverflowError))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	135 PyErr_SetString(StructError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	136 "argument out of range");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	137 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	138 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	139 *p = x;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	140 return 0;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	141 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	142
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	143
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	144 /* Same, but handling unsigned long */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	145
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	146 static int
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	147 get_ulong(PyObject v, unsigned long p)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	148 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	149 unsigned long x;
53271 4527c152daa9 Issue #5463: Remove deprecated float coercion from struct module, along Mark Dickinson <dickinsm@gmail.com> parents: 52414 diff changeset	150
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	151 v = get_pylong(v);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	152 if (v == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	153 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	154 assert(PyLong_Check(v));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	155 x = PyLong_AsUnsignedLong(v);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	156 Py_DECREF(v);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	157 if (x == (unsigned long)-1 && PyErr_Occurred()) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	158 if (PyErr_ExceptionMatches(PyExc_OverflowError))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	159 PyErr_SetString(StructError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	160 "argument out of range");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	161 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	162 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	163 *p = x;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	164 return 0;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	165 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	166
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	167 #ifdef HAVE_LONG_LONG
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	168
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	169 /* Same, but handling native long long. */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	170
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	171 static int
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	172 get_longlong(PyObject v, PY_LONG_LONG p)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	173 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	174 PY_LONG_LONG x;
60252 9b24aa36c06f Internal refactoring in struct.pack: make all integer conversions go through get_pylong. Mark Dickinson <dickinsm@gmail.com> parents: 60240 diff changeset	175
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	176 v = get_pylong(v);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	177 if (v == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	178 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	179 assert(PyLong_Check(v));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	180 x = PyLong_AsLongLong(v);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	181 Py_DECREF(v);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	182 if (x == (PY_LONG_LONG)-1 && PyErr_Occurred()) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	183 if (PyErr_ExceptionMatches(PyExc_OverflowError))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	184 PyErr_SetString(StructError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	185 "argument out of range");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	186 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	187 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	188 *p = x;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	189 return 0;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	190 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	191
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	192 /* Same, but handling native unsigned long long. */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	193
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	194 static int
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	195 get_ulonglong(PyObject v, unsigned PY_LONG_LONG p)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	196 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	197 unsigned PY_LONG_LONG x;
60252 9b24aa36c06f Internal refactoring in struct.pack: make all integer conversions go through get_pylong. Mark Dickinson <dickinsm@gmail.com> parents: 60240 diff changeset	198
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	199 v = get_pylong(v);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	200 if (v == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	201 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	202 assert(PyLong_Check(v));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	203 x = PyLong_AsUnsignedLongLong(v);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	204 Py_DECREF(v);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	205 if (x == (unsigned PY_LONG_LONG)-1 && PyErr_Occurred()) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	206 if (PyErr_ExceptionMatches(PyExc_OverflowError))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	207 PyErr_SetString(StructError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	208 "argument out of range");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	209 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	210 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	211 *p = x;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	212 return 0;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	213 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	214
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	215 #endif
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	216
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	217
19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	218 #define RANGE_ERROR(x, f, flag, mask) return _range_error(f, flag)
19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	219
19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	220
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	221 /* Floating point helpers */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	222
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	223 static PyObject *
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	224 unpack_float(const char p, / start of 4-byte string */
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	225 int le) /* true for little-endian, false for big-endian */
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	226 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	227 double x;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	228
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	229 x = _PyFloat_Unpack4((unsigned char *)p, le);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	230 if (x == -1.0 && PyErr_Occurred())
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	231 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	232 return PyFloat_FromDouble(x);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	233 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	234
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	235 static PyObject *
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	236 unpack_double(const char p, / start of 8-byte string */
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	237 int le) /* true for little-endian, false for big-endian */
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	238 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	239 double x;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	240
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	241 x = _PyFloat_Unpack8((unsigned char *)p, le);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	242 if (x == -1.0 && PyErr_Occurred())
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	243 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	244 return PyFloat_FromDouble(x);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	245 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	246
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	247 /* Helper to format the range error exceptions */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	248 static int
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	249 _range_error(const formatdef *f, int is_unsigned)
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	250 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	251 /* ulargest is the largest unsigned value with f->size bytes.
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	252 * Note that the simpler:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	253 * ((size_t)1 << (f->size * 8)) - 1
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	254 * doesn't work when f->size == sizeof(size_t) because C doesn't
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	255 * define what happens when a left shift count is >= the number of
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	256 * bits in the integer being shifted; e.g., on some boxes it doesn't
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	257 * shift at all when they're equal.
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	258 */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	259 const size_t ulargest = (size_t)-1 >> ((SIZEOF_SIZE_T - f->size)*8);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	260 assert(f->size >= 1 && f->size <= SIZEOF_SIZE_T);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	261 if (is_unsigned)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	262 PyErr_Format(StructError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	263 "'%c' format requires 0 <= number <= %zu",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	264 f->format,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	265 ulargest);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	266 else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	267 const Py_ssize_t largest = (Py_ssize_t)(ulargest >> 1);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	268 PyErr_Format(StructError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	269 "'%c' format requires %zd <= number <= %zd",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	270 f->format,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	271 ~ largest,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	272 largest);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	273 }
52249 5cace75bcb05 - Issue #5463: In struct module, remove deprecated overflow wrapping Mark Dickinson <dickinsm@gmail.com> parents: 51596 diff changeset	274
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	275 return -1;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	276 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	277
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	278
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	279
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	280 /* A large number of small routines follow, with names of the form
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	281
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	282 [bln][up]_TYPE
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	283
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	284 [bln] distiguishes among big-endian, little-endian and native.
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	285 [pu] distiguishes between pack (to struct) and unpack (from struct).
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	286 TYPE is one of char, byte, ubyte, etc.
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	287 */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	288
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	289 /* Native mode routines. ****************************************************/
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	290 /* NOTE:
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	291 In all n[up]_<type> routines handling types larger than 1 byte, there is
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	292 no guarantee that the p pointer is properly aligned for each type,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	293 therefore memcpy is called. An intermediate variable is used to
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	294 compensate for big-endian architectures.
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	295 Normally both the intermediate variable and the memcpy call will be
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	296 skipped by C optimisation in little-endian architectures (gcc >= 2.91
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	297 does this). */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	298
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	299 static PyObject *
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	300 nu_char(const char p, const formatdef f)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	301 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	302 return PyBytes_FromStringAndSize(p, 1);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	303 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	304
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	305 static PyObject *
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	306 nu_byte(const char p, const formatdef f)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	307 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	308 return PyLong_FromLong((long) (signed char )p);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	309 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	310
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	311 static PyObject *
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	312 nu_ubyte(const char p, const formatdef f)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	313 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	314 return PyLong_FromLong((long) (unsigned char )p);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	315 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	316
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	317 static PyObject *
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	318 nu_short(const char p, const formatdef f)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	319 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	320 short x;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	321 memcpy((char *)&x, p, sizeof x);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	322 return PyLong_FromLong((long)x);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	323 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	324
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	325 static PyObject *
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	326 nu_ushort(const char p, const formatdef f)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	327 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	328 unsigned short x;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	329 memcpy((char *)&x, p, sizeof x);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	330 return PyLong_FromLong((long)x);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	331 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	332
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	333 static PyObject *
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	334 nu_int(const char p, const formatdef f)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	335 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	336 int x;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	337 memcpy((char *)&x, p, sizeof x);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	338 return PyLong_FromLong((long)x);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	339 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	340
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	341 static PyObject *
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	342 nu_uint(const char p, const formatdef f)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	343 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	344 unsigned int x;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	345 memcpy((char *)&x, p, sizeof x);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	346 #if (SIZEOF_LONG > SIZEOF_INT)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	347 return PyLong_FromLong((long)x);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	348 #else
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	349 if (x <= ((unsigned int)LONG_MAX))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	350 return PyLong_FromLong((long)x);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	351 return PyLong_FromUnsignedLong((unsigned long)x);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	352 #endif
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	353 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	354
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	355 static PyObject *
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	356 nu_long(const char p, const formatdef f)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	357 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	358 long x;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	359 memcpy((char *)&x, p, sizeof x);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	360 return PyLong_FromLong(x);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	361 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	362
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	363 static PyObject *
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	364 nu_ulong(const char p, const formatdef f)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	365 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	366 unsigned long x;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	367 memcpy((char *)&x, p, sizeof x);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	368 if (x <= LONG_MAX)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	369 return PyLong_FromLong((long)x);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	370 return PyLong_FromUnsignedLong(x);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	371 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	372
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	373 /* Native mode doesn't support q or Q unless the platform C supports
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	374 long long (or, on Windows, __int64). */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	375
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	376 #ifdef HAVE_LONG_LONG
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	377
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	378 static PyObject *
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	379 nu_longlong(const char p, const formatdef f)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	380 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	381 PY_LONG_LONG x;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	382 memcpy((char *)&x, p, sizeof x);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	383 if (x >= LONG_MIN && x <= LONG_MAX)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	384 return PyLong_FromLong(Py_SAFE_DOWNCAST(x, PY_LONG_LONG, long));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	385 return PyLong_FromLongLong(x);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	386 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	387
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	388 static PyObject *
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	389 nu_ulonglong(const char p, const formatdef f)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	390 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	391 unsigned PY_LONG_LONG x;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	392 memcpy((char *)&x, p, sizeof x);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	393 if (x <= LONG_MAX)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	394 return PyLong_FromLong(Py_SAFE_DOWNCAST(x, unsigned PY_LONG_LONG, long));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	395 return PyLong_FromUnsignedLongLong(x);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	396 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	397
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	398 #endif
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	399
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	400 static PyObject *
40737 6ebad2a6b990 Merged revisions 53451-53537 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40626 diff changeset	401 nu_bool(const char p, const formatdef f)
6ebad2a6b990 Merged revisions 53451-53537 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40626 diff changeset	402 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	403 BOOL_TYPE x;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	404 memcpy((char *)&x, p, sizeof x);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	405 return PyBool_FromLong(x != 0);
40737 6ebad2a6b990 Merged revisions 53451-53537 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40626 diff changeset	406 }
6ebad2a6b990 Merged revisions 53451-53537 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40626 diff changeset	407
6ebad2a6b990 Merged revisions 53451-53537 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40626 diff changeset	408
6ebad2a6b990 Merged revisions 53451-53537 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40626 diff changeset	409 static PyObject *
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	410 nu_float(const char p, const formatdef f)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	411 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	412 float x;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	413 memcpy((char *)&x, p, sizeof x);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	414 return PyFloat_FromDouble((double)x);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	415 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	416
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	417 static PyObject *
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	418 nu_double(const char p, const formatdef f)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	419 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	420 double x;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	421 memcpy((char *)&x, p, sizeof x);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	422 return PyFloat_FromDouble(x);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	423 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	424
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	425 static PyObject *
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	426 nu_void_p(const char p, const formatdef f)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	427 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	428 void *x;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	429 memcpy((char *)&x, p, sizeof x);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	430 return PyLong_FromVoidPtr(x);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	431 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	432
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	433 static int
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	434 np_byte(char p, PyObject v, const formatdef *f)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	435 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	436 long x;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	437 if (get_long(v, &x) < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	438 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	439 if (x < -128 \|\| x > 127){
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	440 PyErr_SetString(StructError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	441 "byte format requires -128 <= number <= 127");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	442 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	443 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	444 *p = (char)x;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	445 return 0;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	446 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	447
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	448 static int
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	449 np_ubyte(char p, PyObject v, const formatdef *f)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	450 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	451 long x;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	452 if (get_long(v, &x) < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	453 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	454 if (x < 0 \|\| x > 255){
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	455 PyErr_SetString(StructError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	456 "ubyte format requires 0 <= number <= 255");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	457 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	458 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	459 *p = (char)x;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	460 return 0;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	461 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	462
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	463 static int
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	464 np_char(char p, PyObject v, const formatdef *f)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	465 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	466 if (PyUnicode_Check(v)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	467 v = _PyUnicode_AsDefaultEncodedString(v, NULL);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	468 if (v == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	469 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	470 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	471 if (!PyBytes_Check(v) \|\| PyBytes_Size(v) != 1) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	472 PyErr_SetString(StructError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	473 "char format requires bytes or string of length 1");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	474 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	475 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	476 p = PyBytes_AsString(v);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	477 return 0;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	478 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	479
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	480 static int
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	481 np_short(char p, PyObject v, const formatdef *f)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	482 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	483 long x;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	484 short y;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	485 if (get_long(v, &x) < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	486 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	487 if (x < SHRT_MIN \|\| x > SHRT_MAX){
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	488 PyErr_SetString(StructError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	489 "short format requires " STRINGIFY(SHRT_MIN)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	490 " <= number <= " STRINGIFY(SHRT_MAX));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	491 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	492 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	493 y = (short)x;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	494 memcpy(p, (char *)&y, sizeof y);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	495 return 0;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	496 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	497
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	498 static int
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	499 np_ushort(char p, PyObject v, const formatdef *f)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	500 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	501 long x;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	502 unsigned short y;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	503 if (get_long(v, &x) < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	504 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	505 if (x < 0 \|\| x > USHRT_MAX){
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	506 PyErr_SetString(StructError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	507 "ushort format requires 0 <= number <= " STRINGIFY(USHRT_MAX));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	508 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	509 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	510 y = (unsigned short)x;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	511 memcpy(p, (char *)&y, sizeof y);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	512 return 0;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	513 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	514
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	515 static int
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	516 np_int(char p, PyObject v, const formatdef *f)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	517 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	518 long x;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	519 int y;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	520 if (get_long(v, &x) < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	521 return -1;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	522 #if (SIZEOF_LONG > SIZEOF_INT)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	523 if ((x < ((long)INT_MIN)) \|\| (x > ((long)INT_MAX)))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	524 RANGE_ERROR(x, f, 0, -1);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	525 #endif
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	526 y = (int)x;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	527 memcpy(p, (char *)&y, sizeof y);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	528 return 0;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	529 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	530
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	531 static int
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	532 np_uint(char p, PyObject v, const formatdef *f)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	533 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	534 unsigned long x;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	535 unsigned int y;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	536 if (get_ulong(v, &x) < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	537 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	538 y = (unsigned int)x;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	539 #if (SIZEOF_LONG > SIZEOF_INT)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	540 if (x > ((unsigned long)UINT_MAX))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	541 RANGE_ERROR(y, f, 1, -1);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	542 #endif
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	543 memcpy(p, (char *)&y, sizeof y);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	544 return 0;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	545 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	546
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	547 static int
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	548 np_long(char p, PyObject v, const formatdef *f)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	549 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	550 long x;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	551 if (get_long(v, &x) < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	552 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	553 memcpy(p, (char *)&x, sizeof x);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	554 return 0;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	555 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	556
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	557 static int
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	558 np_ulong(char p, PyObject v, const formatdef *f)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	559 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	560 unsigned long x;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	561 if (get_ulong(v, &x) < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	562 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	563 memcpy(p, (char *)&x, sizeof x);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	564 return 0;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	565 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	566
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	567 #ifdef HAVE_LONG_LONG
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	568
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	569 static int
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	570 np_longlong(char p, PyObject v, const formatdef *f)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	571 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	572 PY_LONG_LONG x;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	573 if (get_longlong(v, &x) < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	574 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	575 memcpy(p, (char *)&x, sizeof x);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	576 return 0;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	577 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	578
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	579 static int
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	580 np_ulonglong(char p, PyObject v, const formatdef *f)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	581 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	582 unsigned PY_LONG_LONG x;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	583 if (get_ulonglong(v, &x) < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	584 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	585 memcpy(p, (char *)&x, sizeof x);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	586 return 0;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	587 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	588 #endif
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	589
40737 6ebad2a6b990 Merged revisions 53451-53537 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40626 diff changeset	590
6ebad2a6b990 Merged revisions 53451-53537 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40626 diff changeset	591 static int
6ebad2a6b990 Merged revisions 53451-53537 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40626 diff changeset	592 np_bool(char p, PyObject v, const formatdef *f)
6ebad2a6b990 Merged revisions 53451-53537 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40626 diff changeset	593 {
62847 f6266c459156 don't ignore exceptions from PyObject_IsTrue Benjamin Peterson <benjamin@python.org> parents: 62314 diff changeset	594 int y;
f6266c459156 don't ignore exceptions from PyObject_IsTrue Benjamin Peterson <benjamin@python.org> parents: 62314 diff changeset	595 BOOL_TYPE x;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	596 y = PyObject_IsTrue(v);
62847 f6266c459156 don't ignore exceptions from PyObject_IsTrue Benjamin Peterson <benjamin@python.org> parents: 62314 diff changeset	597 if (y < 0)
f6266c459156 don't ignore exceptions from PyObject_IsTrue Benjamin Peterson <benjamin@python.org> parents: 62314 diff changeset	598 return -1;
f6266c459156 don't ignore exceptions from PyObject_IsTrue Benjamin Peterson <benjamin@python.org> parents: 62314 diff changeset	599 x = y;
f6266c459156 don't ignore exceptions from PyObject_IsTrue Benjamin Peterson <benjamin@python.org> parents: 62314 diff changeset	600 memcpy(p, (char *)&x, sizeof x);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	601 return 0;
40737 6ebad2a6b990 Merged revisions 53451-53537 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40626 diff changeset	602 }
6ebad2a6b990 Merged revisions 53451-53537 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40626 diff changeset	603
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	604 static int
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	605 np_float(char p, PyObject v, const formatdef *f)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	606 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	607 float x = (float)PyFloat_AsDouble(v);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	608 if (x == -1 && PyErr_Occurred()) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	609 PyErr_SetString(StructError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	610 "required argument is not a float");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	611 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	612 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	613 memcpy(p, (char *)&x, sizeof x);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	614 return 0;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	615 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	616
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	617 static int
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	618 np_double(char p, PyObject v, const formatdef *f)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	619 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	620 double x = PyFloat_AsDouble(v);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	621 if (x == -1 && PyErr_Occurred()) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	622 PyErr_SetString(StructError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	623 "required argument is not a float");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	624 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	625 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	626 memcpy(p, (char *)&x, sizeof(double));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	627 return 0;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	628 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	629
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	630 static int
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	631 np_void_p(char p, PyObject v, const formatdef *f)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	632 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	633 void *x;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	634
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	635 v = get_pylong(v);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	636 if (v == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	637 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	638 assert(PyLong_Check(v));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	639 x = PyLong_AsVoidPtr(v);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	640 Py_DECREF(v);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	641 if (x == NULL && PyErr_Occurred())
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	642 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	643 memcpy(p, (char *)&x, sizeof x);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	644 return 0;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	645 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	646
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	647 static formatdef native_table[] = {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	648 {'x', sizeof(char), 0, NULL},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	649 {'b', sizeof(char), 0, nu_byte, np_byte},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	650 {'B', sizeof(char), 0, nu_ubyte, np_ubyte},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	651 {'c', sizeof(char), 0, nu_char, np_char},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	652 {'s', sizeof(char), 0, NULL},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	653 {'p', sizeof(char), 0, NULL},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	654 {'h', sizeof(short), SHORT_ALIGN, nu_short, np_short},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	655 {'H', sizeof(short), SHORT_ALIGN, nu_ushort, np_ushort},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	656 {'i', sizeof(int), INT_ALIGN, nu_int, np_int},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	657 {'I', sizeof(int), INT_ALIGN, nu_uint, np_uint},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	658 {'l', sizeof(long), LONG_ALIGN, nu_long, np_long},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	659 {'L', sizeof(long), LONG_ALIGN, nu_ulong, np_ulong},
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	660 #ifdef HAVE_LONG_LONG
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	661 {'q', sizeof(PY_LONG_LONG), LONG_LONG_ALIGN, nu_longlong, np_longlong},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	662 {'Q', sizeof(PY_LONG_LONG), LONG_LONG_ALIGN, nu_ulonglong,np_ulonglong},
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	663 #endif
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	664 {'?', sizeof(BOOL_TYPE), BOOL_ALIGN, nu_bool, np_bool},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	665 {'f', sizeof(float), FLOAT_ALIGN, nu_float, np_float},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	666 {'d', sizeof(double), DOUBLE_ALIGN, nu_double, np_double},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	667 {'P', sizeof(void *), VOID_P_ALIGN, nu_void_p, np_void_p},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	668 {0}
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	669 };
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	670
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	671 /* Big-endian routines. *****************************************************/
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	672
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	673 static PyObject *
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	674 bu_int(const char p, const formatdef f)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	675 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	676 long x = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	677 Py_ssize_t i = f->size;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	678 const unsigned char bytes = (const unsigned char )p;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	679 do {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	680 x = (x<<8) \| *bytes++;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	681 } while (--i > 0);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	682 /* Extend the sign bit. */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	683 if (SIZEOF_LONG > f->size)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	684 x \|= -(x & (1L << ((8 * f->size) - 1)));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	685 return PyLong_FromLong(x);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	686 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	687
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	688 static PyObject *
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	689 bu_uint(const char p, const formatdef f)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	690 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	691 unsigned long x = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	692 Py_ssize_t i = f->size;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	693 const unsigned char bytes = (const unsigned char )p;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	694 do {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	695 x = (x<<8) \| *bytes++;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	696 } while (--i > 0);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	697 if (x <= LONG_MAX)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	698 return PyLong_FromLong((long)x);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	699 return PyLong_FromUnsignedLong(x);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	700 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	701
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	702 static PyObject *
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	703 bu_longlong(const char p, const formatdef f)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	704 {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	705 #ifdef HAVE_LONG_LONG
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	706 PY_LONG_LONG x = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	707 Py_ssize_t i = f->size;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	708 const unsigned char bytes = (const unsigned char )p;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	709 do {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	710 x = (x<<8) \| *bytes++;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	711 } while (--i > 0);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	712 /* Extend the sign bit. */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	713 if (SIZEOF_LONG_LONG > f->size)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	714 x \|= -(x & ((PY_LONG_LONG)1 << ((8 * f->size) - 1)));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	715 if (x >= LONG_MIN && x <= LONG_MAX)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	716 return PyLong_FromLong(Py_SAFE_DOWNCAST(x, PY_LONG_LONG, long));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	717 return PyLong_FromLongLong(x);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	718 #else
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	719 return _PyLong_FromByteArray((const unsigned char *)p,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	720 8,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	721 0, /* little-endian */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	722 1 /* signed */);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	723 #endif
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	724 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	725
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	726 static PyObject *
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	727 bu_ulonglong(const char p, const formatdef f)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	728 {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	729 #ifdef HAVE_LONG_LONG
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	730 unsigned PY_LONG_LONG x = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	731 Py_ssize_t i = f->size;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	732 const unsigned char bytes = (const unsigned char )p;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	733 do {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	734 x = (x<<8) \| *bytes++;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	735 } while (--i > 0);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	736 if (x <= LONG_MAX)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	737 return PyLong_FromLong(Py_SAFE_DOWNCAST(x, unsigned PY_LONG_LONG, long));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	738 return PyLong_FromUnsignedLongLong(x);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	739 #else
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	740 return _PyLong_FromByteArray((const unsigned char *)p,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	741 8,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	742 0, /* little-endian */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	743 0 /* signed */);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	744 #endif
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	745 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	746
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	747 static PyObject *
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	748 bu_float(const char p, const formatdef f)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	749 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	750 return unpack_float(p, 0);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	751 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	752
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	753 static PyObject *
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	754 bu_double(const char p, const formatdef f)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	755 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	756 return unpack_double(p, 0);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	757 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	758
40737 6ebad2a6b990 Merged revisions 53451-53537 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40626 diff changeset	759 static PyObject *
6ebad2a6b990 Merged revisions 53451-53537 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40626 diff changeset	760 bu_bool(const char p, const formatdef f)
6ebad2a6b990 Merged revisions 53451-53537 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40626 diff changeset	761 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	762 char x;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	763 memcpy((char *)&x, p, sizeof x);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	764 return PyBool_FromLong(x != 0);
40737 6ebad2a6b990 Merged revisions 53451-53537 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40626 diff changeset	765 }
6ebad2a6b990 Merged revisions 53451-53537 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40626 diff changeset	766
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	767 static int
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	768 bp_int(char p, PyObject v, const formatdef *f)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	769 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	770 long x;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	771 Py_ssize_t i;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	772 if (get_long(v, &x) < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	773 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	774 i = f->size;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	775 if (i != SIZEOF_LONG) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	776 if ((i == 2) && (x < -32768 \|\| x > 32767))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	777 RANGE_ERROR(x, f, 0, 0xffffL);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	778 #if (SIZEOF_LONG != 4)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	779 else if ((i == 4) && (x < -2147483648L \|\| x > 2147483647L))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	780 RANGE_ERROR(x, f, 0, 0xffffffffL);
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	781 #endif
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	782 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	783 do {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	784 p[--i] = (char)x;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	785 x >>= 8;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	786 } while (i > 0);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	787 return 0;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	788 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	789
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	790 static int
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	791 bp_uint(char p, PyObject v, const formatdef *f)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	792 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	793 unsigned long x;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	794 Py_ssize_t i;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	795 if (get_ulong(v, &x) < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	796 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	797 i = f->size;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	798 if (i != SIZEOF_LONG) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	799 unsigned long maxint = 1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	800 maxint <<= (unsigned long)(i * 8);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	801 if (x >= maxint)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	802 RANGE_ERROR(x, f, 1, maxint - 1);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	803 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	804 do {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	805 p[--i] = (char)x;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	806 x >>= 8;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	807 } while (i > 0);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	808 return 0;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	809 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	810
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	811 static int
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	812 bp_longlong(char p, PyObject v, const formatdef *f)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	813 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	814 int res;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	815 v = get_pylong(v);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	816 if (v == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	817 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	818 res = _PyLong_AsByteArray((PyLongObject *)v,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	819 (unsigned char *)p,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	820 8,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	821 0, /* little_endian */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	822 1 /* signed */);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	823 Py_DECREF(v);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	824 return res;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	825 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	826
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	827 static int
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	828 bp_ulonglong(char p, PyObject v, const formatdef *f)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	829 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	830 int res;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	831 v = get_pylong(v);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	832 if (v == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	833 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	834 res = _PyLong_AsByteArray((PyLongObject *)v,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	835 (unsigned char *)p,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	836 8,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	837 0, /* little_endian */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	838 0 /* signed */);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	839 Py_DECREF(v);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	840 return res;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	841 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	842
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	843 static int
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	844 bp_float(char p, PyObject v, const formatdef *f)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	845 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	846 double x = PyFloat_AsDouble(v);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	847 if (x == -1 && PyErr_Occurred()) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	848 PyErr_SetString(StructError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	849 "required argument is not a float");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	850 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	851 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	852 return _PyFloat_Pack4(x, (unsigned char *)p, 0);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	853 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	854
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	855 static int
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	856 bp_double(char p, PyObject v, const formatdef *f)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	857 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	858 double x = PyFloat_AsDouble(v);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	859 if (x == -1 && PyErr_Occurred()) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	860 PyErr_SetString(StructError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	861 "required argument is not a float");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	862 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	863 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	864 return _PyFloat_Pack8(x, (unsigned char *)p, 0);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	865 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	866
40737 6ebad2a6b990 Merged revisions 53451-53537 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40626 diff changeset	867 static int
6ebad2a6b990 Merged revisions 53451-53537 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40626 diff changeset	868 bp_bool(char p, PyObject v, const formatdef *f)
6ebad2a6b990 Merged revisions 53451-53537 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40626 diff changeset	869 {
63065 2683333755f3 Issue #9277: Struct module: standard bool packing was incorrect if Mark Dickinson <dickinsm@gmail.com> parents: 62847 diff changeset	870 int y;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	871 y = PyObject_IsTrue(v);
62847 f6266c459156 don't ignore exceptions from PyObject_IsTrue Benjamin Peterson <benjamin@python.org> parents: 62314 diff changeset	872 if (y < 0)
f6266c459156 don't ignore exceptions from PyObject_IsTrue Benjamin Peterson <benjamin@python.org> parents: 62314 diff changeset	873 return -1;
63065 2683333755f3 Issue #9277: Struct module: standard bool packing was incorrect if Mark Dickinson <dickinsm@gmail.com> parents: 62847 diff changeset	874 *p = (char)y;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	875 return 0;
40737 6ebad2a6b990 Merged revisions 53451-53537 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40626 diff changeset	876 }
6ebad2a6b990 Merged revisions 53451-53537 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40626 diff changeset	877
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	878 static formatdef bigendian_table[] = {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	879 {'x', 1, 0, NULL},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	880 {'b', 1, 0, nu_byte, np_byte},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	881 {'B', 1, 0, nu_ubyte, np_ubyte},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	882 {'c', 1, 0, nu_char, np_char},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	883 {'s', 1, 0, NULL},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	884 {'p', 1, 0, NULL},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	885 {'h', 2, 0, bu_int, bp_int},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	886 {'H', 2, 0, bu_uint, bp_uint},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	887 {'i', 4, 0, bu_int, bp_int},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	888 {'I', 4, 0, bu_uint, bp_uint},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	889 {'l', 4, 0, bu_int, bp_int},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	890 {'L', 4, 0, bu_uint, bp_uint},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	891 {'q', 8, 0, bu_longlong, bp_longlong},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	892 {'Q', 8, 0, bu_ulonglong, bp_ulonglong},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	893 {'?', 1, 0, bu_bool, bp_bool},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	894 {'f', 4, 0, bu_float, bp_float},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	895 {'d', 8, 0, bu_double, bp_double},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	896 {0}
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	897 };
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	898
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	899 /* Little-endian routines. *****************************************************/
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	900
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	901 static PyObject *
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	902 lu_int(const char p, const formatdef f)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	903 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	904 long x = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	905 Py_ssize_t i = f->size;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	906 const unsigned char bytes = (const unsigned char )p;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	907 do {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	908 x = (x<<8) \| bytes[--i];
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	909 } while (i > 0);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	910 /* Extend the sign bit. */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	911 if (SIZEOF_LONG > f->size)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	912 x \|= -(x & (1L << ((8 * f->size) - 1)));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	913 return PyLong_FromLong(x);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	914 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	915
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	916 static PyObject *
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	917 lu_uint(const char p, const formatdef f)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	918 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	919 unsigned long x = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	920 Py_ssize_t i = f->size;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	921 const unsigned char bytes = (const unsigned char )p;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	922 do {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	923 x = (x<<8) \| bytes[--i];
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	924 } while (i > 0);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	925 if (x <= LONG_MAX)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	926 return PyLong_FromLong((long)x);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	927 return PyLong_FromUnsignedLong((long)x);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	928 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	929
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	930 static PyObject *
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	931 lu_longlong(const char p, const formatdef f)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	932 {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	933 #ifdef HAVE_LONG_LONG
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	934 PY_LONG_LONG x = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	935 Py_ssize_t i = f->size;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	936 const unsigned char bytes = (const unsigned char )p;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	937 do {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	938 x = (x<<8) \| bytes[--i];
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	939 } while (i > 0);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	940 /* Extend the sign bit. */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	941 if (SIZEOF_LONG_LONG > f->size)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	942 x \|= -(x & ((PY_LONG_LONG)1 << ((8 * f->size) - 1)));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	943 if (x >= LONG_MIN && x <= LONG_MAX)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	944 return PyLong_FromLong(Py_SAFE_DOWNCAST(x, PY_LONG_LONG, long));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	945 return PyLong_FromLongLong(x);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	946 #else
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	947 return _PyLong_FromByteArray((const unsigned char *)p,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	948 8,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	949 1, /* little-endian */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	950 1 /* signed */);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	951 #endif
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	952 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	953
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	954 static PyObject *
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	955 lu_ulonglong(const char p, const formatdef f)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	956 {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	957 #ifdef HAVE_LONG_LONG
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	958 unsigned PY_LONG_LONG x = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	959 Py_ssize_t i = f->size;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	960 const unsigned char bytes = (const unsigned char )p;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	961 do {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	962 x = (x<<8) \| bytes[--i];
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	963 } while (i > 0);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	964 if (x <= LONG_MAX)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	965 return PyLong_FromLong(Py_SAFE_DOWNCAST(x, unsigned PY_LONG_LONG, long));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	966 return PyLong_FromUnsignedLongLong(x);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	967 #else
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	968 return _PyLong_FromByteArray((const unsigned char *)p,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	969 8,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	970 1, /* little-endian */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	971 0 /* signed */);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	972 #endif
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	973 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	974
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	975 static PyObject *
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	976 lu_float(const char p, const formatdef f)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	977 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	978 return unpack_float(p, 1);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	979 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	980
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	981 static PyObject *
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	982 lu_double(const char p, const formatdef f)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	983 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	984 return unpack_double(p, 1);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	985 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	986
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	987 static int
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	988 lp_int(char p, PyObject v, const formatdef *f)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	989 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	990 long x;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	991 Py_ssize_t i;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	992 if (get_long(v, &x) < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	993 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	994 i = f->size;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	995 if (i != SIZEOF_LONG) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	996 if ((i == 2) && (x < -32768 \|\| x > 32767))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	997 RANGE_ERROR(x, f, 0, 0xffffL);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	998 #if (SIZEOF_LONG != 4)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	999 else if ((i == 4) && (x < -2147483648L \|\| x > 2147483647L))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1000 RANGE_ERROR(x, f, 0, 0xffffffffL);
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1001 #endif
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1002 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1003 do {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1004 *p++ = (char)x;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1005 x >>= 8;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1006 } while (--i > 0);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1007 return 0;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1008 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1009
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1010 static int
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1011 lp_uint(char p, PyObject v, const formatdef *f)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1012 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1013 unsigned long x;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1014 Py_ssize_t i;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1015 if (get_ulong(v, &x) < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1016 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1017 i = f->size;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1018 if (i != SIZEOF_LONG) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1019 unsigned long maxint = 1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1020 maxint <<= (unsigned long)(i * 8);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1021 if (x >= maxint)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1022 RANGE_ERROR(x, f, 1, maxint - 1);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1023 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1024 do {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1025 *p++ = (char)x;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1026 x >>= 8;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1027 } while (--i > 0);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1028 return 0;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1029 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1030
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1031 static int
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1032 lp_longlong(char p, PyObject v, const formatdef *f)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1033 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1034 int res;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1035 v = get_pylong(v);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1036 if (v == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1037 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1038 res = _PyLong_AsByteArray((PyLongObject*)v,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1039 (unsigned char *)p,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1040 8,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1041 1, /* little_endian */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1042 1 /* signed */);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1043 Py_DECREF(v);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1044 return res;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1045 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1046
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1047 static int
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1048 lp_ulonglong(char p, PyObject v, const formatdef *f)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1049 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1050 int res;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1051 v = get_pylong(v);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1052 if (v == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1053 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1054 res = _PyLong_AsByteArray((PyLongObject*)v,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1055 (unsigned char *)p,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1056 8,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1057 1, /* little_endian */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1058 0 /* signed */);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1059 Py_DECREF(v);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1060 return res;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1061 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1062
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1063 static int
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1064 lp_float(char p, PyObject v, const formatdef *f)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1065 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1066 double x = PyFloat_AsDouble(v);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1067 if (x == -1 && PyErr_Occurred()) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1068 PyErr_SetString(StructError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1069 "required argument is not a float");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1070 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1071 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1072 return _PyFloat_Pack4(x, (unsigned char *)p, 1);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1073 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1074
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1075 static int
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1076 lp_double(char p, PyObject v, const formatdef *f)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1077 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1078 double x = PyFloat_AsDouble(v);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1079 if (x == -1 && PyErr_Occurred()) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1080 PyErr_SetString(StructError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1081 "required argument is not a float");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1082 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1083 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1084 return _PyFloat_Pack8(x, (unsigned char *)p, 1);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1085 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1086
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1087 static formatdef lilendian_table[] = {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1088 {'x', 1, 0, NULL},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1089 {'b', 1, 0, nu_byte, np_byte},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1090 {'B', 1, 0, nu_ubyte, np_ubyte},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1091 {'c', 1, 0, nu_char, np_char},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1092 {'s', 1, 0, NULL},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1093 {'p', 1, 0, NULL},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1094 {'h', 2, 0, lu_int, lp_int},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1095 {'H', 2, 0, lu_uint, lp_uint},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1096 {'i', 4, 0, lu_int, lp_int},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1097 {'I', 4, 0, lu_uint, lp_uint},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1098 {'l', 4, 0, lu_int, lp_int},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1099 {'L', 4, 0, lu_uint, lp_uint},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1100 {'q', 8, 0, lu_longlong, lp_longlong},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1101 {'Q', 8, 0, lu_ulonglong, lp_ulonglong},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1102 {'?', 1, 0, bu_bool, bp_bool}, /* Std rep not endian dep,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1103 but potentially different from native rep -- reuse bx_bool funcs. */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1104 {'f', 4, 0, lu_float, lp_float},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1105 {'d', 8, 0, lu_double, lp_double},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1106 {0}
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1107 };
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1108
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1109
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1110 static const formatdef *
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1111 whichtable(char **pfmt)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1112 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1113 const char fmt = (pfmt)++; /* May be backed out of later */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1114 switch (*fmt) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1115 case '<':
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1116 return lilendian_table;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1117 case '>':
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1118 case '!': /* Network byte order is big-endian */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1119 return bigendian_table;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1120 case '=': { /* Host byte order -- different from native in aligment! */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1121 int n = 1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1122 char p = (char ) &n;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1123 if (*p == 1)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1124 return lilendian_table;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1125 else
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1126 return bigendian_table;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1127 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1128 default:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1129 --pfmt; / Back out of pointer increment */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1130 /* Fall through */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1131 case '@':
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1132 return native_table;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1133 }
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1134 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1135
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1136
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1137 /* Get the table entry for a format code */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1138
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1139 static const formatdef *
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1140 getentry(int c, const formatdef *f)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1141 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1142 for (; f->format != '\0'; f++) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1143 if (f->format == c) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1144 return f;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1145 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1146 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1147 PyErr_SetString(StructError, "bad char in struct format");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1148 return NULL;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1149 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1150
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1151
62250 73d82b0b6dee Fix more undefined-behaviour inducing overflow checks in struct module. Mark Dickinson <dickinsm@gmail.com> parents: 62246 diff changeset	1152 /* Align a size according to a format code. Return -1 on overflow. */
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1153
62246 6ff88dca8133 Fix an incorrect return type. Mark Dickinson <dickinsm@gmail.com> parents: 62245 diff changeset	1154 static Py_ssize_t
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1155 align(Py_ssize_t size, char c, const formatdef *e)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1156 {
62250 73d82b0b6dee Fix more undefined-behaviour inducing overflow checks in struct module. Mark Dickinson <dickinsm@gmail.com> parents: 62246 diff changeset	1157 Py_ssize_t extra;
73d82b0b6dee Fix more undefined-behaviour inducing overflow checks in struct module. Mark Dickinson <dickinsm@gmail.com> parents: 62246 diff changeset	1158
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1159 if (e->format == c) {
62250 73d82b0b6dee Fix more undefined-behaviour inducing overflow checks in struct module. Mark Dickinson <dickinsm@gmail.com> parents: 62246 diff changeset	1160 if (e->alignment && size > 0) {
73d82b0b6dee Fix more undefined-behaviour inducing overflow checks in struct module. Mark Dickinson <dickinsm@gmail.com> parents: 62246 diff changeset	1161 extra = (e->alignment - 1) - (size - 1) % (e->alignment);
73d82b0b6dee Fix more undefined-behaviour inducing overflow checks in struct module. Mark Dickinson <dickinsm@gmail.com> parents: 62246 diff changeset	1162 if (extra > PY_SSIZE_T_MAX - size)
73d82b0b6dee Fix more undefined-behaviour inducing overflow checks in struct module. Mark Dickinson <dickinsm@gmail.com> parents: 62246 diff changeset	1163 return -1;
73d82b0b6dee Fix more undefined-behaviour inducing overflow checks in struct module. Mark Dickinson <dickinsm@gmail.com> parents: 62246 diff changeset	1164 size += extra;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1165 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1166 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1167 return size;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1168 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1169
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1170
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1171 /* calculate the size of a format string */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1172
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1173 static int
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1174 prepare_s(PyStructObject *self)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1175 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1176 const formatdef *f;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1177 const formatdef *e;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1178 formatcode *codes;
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1179
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1180 const char *s;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1181 const char *fmt;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1182 char c;
62250 73d82b0b6dee Fix more undefined-behaviour inducing overflow checks in struct module. Mark Dickinson <dickinsm@gmail.com> parents: 62246 diff changeset	1183 Py_ssize_t size, len, num, itemsize;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1184
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1185 fmt = PyBytes_AS_STRING(self->s_format);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1186
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1187 f = whichtable((char **)&fmt);
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1188
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1189 s = fmt;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1190 size = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1191 len = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1192 while ((c = *s++) != '\0') {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1193 if (isspace(Py_CHARMASK(c)))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1194 continue;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1195 if ('0' <= c && c <= '9') {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1196 num = c - '0';
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1197 while ('0' <= (c = *s++) && c <= '9') {
62245 6adc83d999d0 Avoid possible undefined behaviour from signed overflow. Mark Dickinson <dickinsm@gmail.com> parents: 62243 diff changeset	1198 /* overflow-safe version of
6adc83d999d0 Avoid possible undefined behaviour from signed overflow. Mark Dickinson <dickinsm@gmail.com> parents: 62243 diff changeset	1199 if (num10 + (c - '0') > PY_SSIZE_T_MAX) { ... } /
6adc83d999d0 Avoid possible undefined behaviour from signed overflow. Mark Dickinson <dickinsm@gmail.com> parents: 62243 diff changeset	1200 if (num >= PY_SSIZE_T_MAX / 10 && (
6adc83d999d0 Avoid possible undefined behaviour from signed overflow. Mark Dickinson <dickinsm@gmail.com> parents: 62243 diff changeset	1201 num > PY_SSIZE_T_MAX / 10 \|\|
62250 73d82b0b6dee Fix more undefined-behaviour inducing overflow checks in struct module. Mark Dickinson <dickinsm@gmail.com> parents: 62246 diff changeset	1202 (c - '0') > PY_SSIZE_T_MAX % 10))
73d82b0b6dee Fix more undefined-behaviour inducing overflow checks in struct module. Mark Dickinson <dickinsm@gmail.com> parents: 62246 diff changeset	1203 goto overflow;
62245 6adc83d999d0 Avoid possible undefined behaviour from signed overflow. Mark Dickinson <dickinsm@gmail.com> parents: 62243 diff changeset	1204 num = num*10 + (c - '0');
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1205 }
62243 3ba1b5b4c108 Issue #3129: Trailing digits in format string are no longer ignored. Alexander Belopolsky <alexander.belopolsky@gmail.com> parents: 61466 diff changeset	1206 if (c == '\0') {
3ba1b5b4c108 Issue #3129: Trailing digits in format string are no longer ignored. Alexander Belopolsky <alexander.belopolsky@gmail.com> parents: 61466 diff changeset	1207 PyErr_SetString(StructError,
3ba1b5b4c108 Issue #3129: Trailing digits in format string are no longer ignored. Alexander Belopolsky <alexander.belopolsky@gmail.com> parents: 61466 diff changeset	1208 "repeat count given without format specifier");
3ba1b5b4c108 Issue #3129: Trailing digits in format string are no longer ignored. Alexander Belopolsky <alexander.belopolsky@gmail.com> parents: 61466 diff changeset	1209 return -1;
3ba1b5b4c108 Issue #3129: Trailing digits in format string are no longer ignored. Alexander Belopolsky <alexander.belopolsky@gmail.com> parents: 61466 diff changeset	1210 }
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1211 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1212 else
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1213 num = 1;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1214
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1215 e = getentry(c, f);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1216 if (e == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1217 return -1;
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1218
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1219 switch (c) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1220 case 's': /* fall through */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1221 case 'p': len++; break;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1222 case 'x': break;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1223 default: len += num; break;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1224 }
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1225
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1226 itemsize = e->size;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1227 size = align(size, c, e);
62250 73d82b0b6dee Fix more undefined-behaviour inducing overflow checks in struct module. Mark Dickinson <dickinsm@gmail.com> parents: 62246 diff changeset	1228 if (size == -1)
73d82b0b6dee Fix more undefined-behaviour inducing overflow checks in struct module. Mark Dickinson <dickinsm@gmail.com> parents: 62246 diff changeset	1229 goto overflow;
73d82b0b6dee Fix more undefined-behaviour inducing overflow checks in struct module. Mark Dickinson <dickinsm@gmail.com> parents: 62246 diff changeset	1230
73d82b0b6dee Fix more undefined-behaviour inducing overflow checks in struct module. Mark Dickinson <dickinsm@gmail.com> parents: 62246 diff changeset	1231 /* if (size + num * itemsize > PY_SSIZE_T_MAX) { ... } */
73d82b0b6dee Fix more undefined-behaviour inducing overflow checks in struct module. Mark Dickinson <dickinsm@gmail.com> parents: 62246 diff changeset	1232 if (num > (PY_SSIZE_T_MAX - size) / itemsize)
73d82b0b6dee Fix more undefined-behaviour inducing overflow checks in struct module. Mark Dickinson <dickinsm@gmail.com> parents: 62246 diff changeset	1233 goto overflow;
73d82b0b6dee Fix more undefined-behaviour inducing overflow checks in struct module. Mark Dickinson <dickinsm@gmail.com> parents: 62246 diff changeset	1234 size += num * itemsize;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1235 }
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1236
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1237 /* check for overflow */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1238 if ((len + 1) > (PY_SSIZE_T_MAX / sizeof(formatcode))) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1239 PyErr_NoMemory();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1240 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1241 }
48321 f6726f32ef70 Merged revisions 64119,64147,64150,64165,64219-64221,64229-64230,64233,64235,64253,64278,64280,64301,64303,64320,64328,64338-64339 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47580 diff changeset	1242
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1243 self->s_size = size;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1244 self->s_len = len;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1245 codes = PyMem_MALLOC((len + 1) * sizeof(formatcode));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1246 if (codes == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1247 PyErr_NoMemory();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1248 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1249 }
63298 29ab536cfef6 Issue #9422: Fix memory leak when re-initializing a struct.Struct object. Mark Dickinson <dickinsm@gmail.com> parents: 63065 diff changeset	1250 /* Free any s_codes value left over from a previous initialization. */
29ab536cfef6 Issue #9422: Fix memory leak when re-initializing a struct.Struct object. Mark Dickinson <dickinsm@gmail.com> parents: 63065 diff changeset	1251 if (self->s_codes != NULL)
29ab536cfef6 Issue #9422: Fix memory leak when re-initializing a struct.Struct object. Mark Dickinson <dickinsm@gmail.com> parents: 63065 diff changeset	1252 PyMem_FREE(self->s_codes);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1253 self->s_codes = codes;
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1254
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1255 s = fmt;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1256 size = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1257 while ((c = *s++) != '\0') {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1258 if (isspace(Py_CHARMASK(c)))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1259 continue;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1260 if ('0' <= c && c <= '9') {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1261 num = c - '0';
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1262 while ('0' <= (c = *s++) && c <= '9')
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1263 num = num*10 + (c - '0');
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1264 if (c == '\0')
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1265 break;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1266 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1267 else
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1268 num = 1;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1269
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1270 e = getentry(c, f);
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1271
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1272 size = align(size, c, e);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1273 if (c == 's' \|\| c == 'p') {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1274 codes->offset = size;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1275 codes->size = num;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1276 codes->fmtdef = e;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1277 codes++;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1278 size += num;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1279 } else if (c == 'x') {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1280 size += num;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1281 } else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1282 while (--num >= 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1283 codes->offset = size;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1284 codes->size = e->size;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1285 codes->fmtdef = e;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1286 codes++;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1287 size += e->size;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1288 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1289 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1290 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1291 codes->fmtdef = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1292 codes->offset = size;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1293 codes->size = 0;
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1294
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1295 return 0;
62250 73d82b0b6dee Fix more undefined-behaviour inducing overflow checks in struct module. Mark Dickinson <dickinsm@gmail.com> parents: 62246 diff changeset	1296
73d82b0b6dee Fix more undefined-behaviour inducing overflow checks in struct module. Mark Dickinson <dickinsm@gmail.com> parents: 62246 diff changeset	1297 overflow:
73d82b0b6dee Fix more undefined-behaviour inducing overflow checks in struct module. Mark Dickinson <dickinsm@gmail.com> parents: 62246 diff changeset	1298 PyErr_SetString(StructError,
73d82b0b6dee Fix more undefined-behaviour inducing overflow checks in struct module. Mark Dickinson <dickinsm@gmail.com> parents: 62246 diff changeset	1299 "total struct size too long");
73d82b0b6dee Fix more undefined-behaviour inducing overflow checks in struct module. Mark Dickinson <dickinsm@gmail.com> parents: 62246 diff changeset	1300 return -1;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1301 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1302
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1303 static PyObject *
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1304 s_new(PyTypeObject type, PyObject args, PyObject *kwds)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1305 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1306 PyObject *self;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1307
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1308 assert(type != NULL && type->tp_alloc != NULL);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1309
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1310 self = type->tp_alloc(type, 0);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1311 if (self != NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1312 PyStructObject s = (PyStructObject)self;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1313 Py_INCREF(Py_None);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1314 s->s_format = Py_None;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1315 s->s_codes = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1316 s->s_size = -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1317 s->s_len = -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1318 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1319 return self;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1320 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1321
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1322 static int
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1323 s_init(PyObject self, PyObject args, PyObject *kwds)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1324 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1325 PyStructObject soself = (PyStructObject )self;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1326 PyObject *o_format = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1327 int ret = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1328 static char *kwlist[] = {"format", 0};
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1329
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1330 assert(PyStruct_Check(self));
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1331
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1332 if (!PyArg_ParseTupleAndKeywords(args, kwds, "O:Struct", kwlist,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1333 &o_format))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1334 return -1;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1335
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1336 if (PyUnicode_Check(o_format)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1337 o_format = PyUnicode_AsASCIIString(o_format);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1338 if (o_format == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1339 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1340 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1341 /* XXX support buffer interface, too */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1342 else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1343 Py_INCREF(o_format);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1344 }
44460 13aabc23cf2e Merged revisions 59680-59695 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1345
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1346 if (!PyBytes_Check(o_format)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1347 Py_DECREF(o_format);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1348 PyErr_Format(PyExc_TypeError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1349 "Struct() argument 1 must be bytes, not %.200s",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1350 Py_TYPE(o_format)->tp_name);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1351 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1352 }
44460 13aabc23cf2e Merged revisions 59680-59695 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1353
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1354 Py_CLEAR(soself->s_format);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1355 soself->s_format = o_format;
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1356
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1357 ret = prepare_s(soself);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1358 return ret;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1359 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1360
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1361 static void
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1362 s_dealloc(PyStructObject *s)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1363 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1364 if (s->weakreflist != NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1365 PyObject_ClearWeakRefs((PyObject *)s);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1366 if (s->s_codes != NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1367 PyMem_FREE(s->s_codes);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1368 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1369 Py_XDECREF(s->s_format);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1370 Py_TYPE(s)->tp_free((PyObject *)s);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1371 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1372
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1373 static PyObject *
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1374 s_unpack_internal(PyStructObject soself, char startfrom) {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1375 formatcode *code;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1376 Py_ssize_t i = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1377 PyObject *result = PyTuple_New(soself->s_len);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1378 if (result == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1379 return NULL;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1380
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1381 for (code = soself->s_codes; code->fmtdef != NULL; code++) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1382 PyObject *v;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1383 const formatdef *e = code->fmtdef;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1384 const char *res = startfrom + code->offset;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1385 if (e->format == 's') {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1386 v = PyBytes_FromStringAndSize(res, code->size);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1387 } else if (e->format == 'p') {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1388 Py_ssize_t n = (unsigned char)res;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1389 if (n >= code->size)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1390 n = code->size - 1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1391 v = PyBytes_FromStringAndSize(res + 1, n);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1392 } else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1393 v = e->unpack(res, e);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1394 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1395 if (v == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1396 goto fail;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1397 PyTuple_SET_ITEM(result, i++, v);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1398 }
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1399
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1400 return result;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1401 fail:
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1402 Py_DECREF(result);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1403 return NULL;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1404 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1405
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1406
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1407 PyDoc_STRVAR(s_unpack__doc__,
41453 35f9ffc6b510 struct.unpack() allows a bytes string too (if it has the right size). Guido van Rossum <guido@python.org> parents: 40737 diff changeset	1408 "S.unpack(buffer) -> (v1, v2, ...)\n\
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1409 \n\
62298 9550eda1c096 Issue #8973: Improve struct module docstrings. Mark Dickinson <dickinsm@gmail.com> parents: 62297 diff changeset	1410 Return a tuple containing values unpacked according to the format\n\
9550eda1c096 Issue #8973: Improve struct module docstrings. Mark Dickinson <dickinsm@gmail.com> parents: 62297 diff changeset	1411 string S.format. Requires len(buffer) == S.size. See help(struct)\n\
9550eda1c096 Issue #8973: Improve struct module docstrings. Mark Dickinson <dickinsm@gmail.com> parents: 62297 diff changeset	1412 for more on format strings.");
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1413
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1414 static PyObject *
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 42334 diff changeset	1415 s_unpack(PyObject self, PyObject input)
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1416 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1417 Py_buffer vbuf;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1418 PyObject *result;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1419 PyStructObject soself = (PyStructObject )self;
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 42334 diff changeset	1420
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1421 assert(PyStruct_Check(self));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1422 assert(soself->s_codes != NULL);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1423 if (PyObject_GetBuffer(input, &vbuf, PyBUF_SIMPLE) < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1424 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1425 if (vbuf.len != soself->s_size) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1426 PyErr_Format(StructError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1427 "unpack requires a bytes argument of length %zd",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1428 soself->s_size);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1429 PyBuffer_Release(&vbuf);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1430 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1431 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1432 result = s_unpack_internal(soself, vbuf.buf);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1433 PyBuffer_Release(&vbuf);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1434 return result;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1435 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1436
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1437 PyDoc_STRVAR(s_unpack_from__doc__,
62314 7ac6148e6a7f Remove unnecessary brackets from docstring optional arguments. Mark Dickinson <dickinsm@gmail.com> parents: 62310 diff changeset	1438 "S.unpack_from(buffer, offset=0) -> (v1, v2, ...)\n\
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1439 \n\
62298 9550eda1c096 Issue #8973: Improve struct module docstrings. Mark Dickinson <dickinsm@gmail.com> parents: 62297 diff changeset	1440 Return a tuple containing values unpacked according to the format\n\
9550eda1c096 Issue #8973: Improve struct module docstrings. Mark Dickinson <dickinsm@gmail.com> parents: 62297 diff changeset	1441 string S.format. Requires len(buffer[offset:]) >= S.size. See\n\
9550eda1c096 Issue #8973: Improve struct module docstrings. Mark Dickinson <dickinsm@gmail.com> parents: 62297 diff changeset	1442 help(struct) for more on format strings.");
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1443
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1444 static PyObject *
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1445 s_unpack_from(PyObject self, PyObject args, PyObject *kwds)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1446 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1447 static char *kwlist[] = {"buffer", "offset", 0};
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 42334 diff changeset	1448
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1449 PyObject *input;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1450 Py_ssize_t offset = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1451 Py_buffer vbuf;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1452 PyObject *result;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1453 PyStructObject soself = (PyStructObject )self;
43777 0d462d789b18 Merging the py3k-pep3137 branch back into the py3k branch. Guido van Rossum <guido@python.org> parents: 42334 diff changeset	1454
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1455 assert(PyStruct_Check(self));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1456 assert(soself->s_codes != NULL);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1457
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1458 if (!PyArg_ParseTupleAndKeywords(args, kwds,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1459 "O\|n:unpack_from", kwlist,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1460 &input, &offset))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1461 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1462 if (PyObject_GetBuffer(input, &vbuf, PyBUF_SIMPLE) < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1463 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1464 if (offset < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1465 offset += vbuf.len;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1466 if (offset < 0 \|\| vbuf.len - offset < soself->s_size) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1467 PyErr_Format(StructError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1468 "unpack_from requires a buffer of at least %zd bytes",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1469 soself->s_size);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1470 PyBuffer_Release(&vbuf);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1471 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1472 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1473 result = s_unpack_internal(soself, (char*)vbuf.buf + offset);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1474 PyBuffer_Release(&vbuf);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1475 return result;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1476 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1477
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1478
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1479 /*
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1480 * Guts of the pack function.
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1481 *
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1482 * Takes a struct object, a tuple of arguments, and offset in that tuple of
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1483 * argument for where to start processing the arguments for packing, and a
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1484 * character buffer for writing the packed string. The caller must insure
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1485 * that the buffer may contain the required length for packing the arguments.
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1486 * 0 is returned on success, 1 is returned if there is an error.
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1487 *
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1488 */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1489 static int
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1490 s_pack_internal(PyStructObject soself, PyObject args, int offset, char* buf)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1491 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1492 formatcode *code;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1493 /* XXX(nnorwitz): why does i need to be a local? can we use
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1494 the offset parameter or do we need the wider width? */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1495 Py_ssize_t i;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1496
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1497 memset(buf, '\0', soself->s_size);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1498 i = offset;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1499 for (code = soself->s_codes; code->fmtdef != NULL; code++) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1500 Py_ssize_t n;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1501 PyObject *v = PyTuple_GET_ITEM(args, i++);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1502 const formatdef *e = code->fmtdef;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1503 char *res = buf + code->offset;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1504 if (e->format == 's') {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1505 int isstring;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1506 void *p;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1507 if (PyUnicode_Check(v)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1508 v = _PyUnicode_AsDefaultEncodedString(v, NULL);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1509 if (v == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1510 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1511 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1512 isstring = PyBytes_Check(v);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1513 if (!isstring && !PyByteArray_Check(v)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1514 PyErr_SetString(StructError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1515 "argument for 's' must be a bytes or string");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1516 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1517 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1518 if (isstring) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1519 n = PyBytes_GET_SIZE(v);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1520 p = PyBytes_AS_STRING(v);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1521 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1522 else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1523 n = PyByteArray_GET_SIZE(v);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1524 p = PyByteArray_AS_STRING(v);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1525 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1526 if (n > code->size)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1527 n = code->size;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1528 if (n > 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1529 memcpy(res, p, n);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1530 } else if (e->format == 'p') {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1531 int isstring;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1532 void *p;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1533 if (PyUnicode_Check(v)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1534 v = _PyUnicode_AsDefaultEncodedString(v, NULL);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1535 if (v == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1536 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1537 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1538 isstring = PyBytes_Check(v);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1539 if (!isstring && !PyByteArray_Check(v)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1540 PyErr_SetString(StructError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1541 "argument for 'p' must be a bytes or string");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1542 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1543 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1544 if (isstring) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1545 n = PyBytes_GET_SIZE(v);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1546 p = PyBytes_AS_STRING(v);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1547 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1548 else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1549 n = PyByteArray_GET_SIZE(v);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1550 p = PyByteArray_AS_STRING(v);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1551 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1552 if (n > (code->size - 1))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1553 n = code->size - 1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1554 if (n > 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1555 memcpy(res + 1, p, n);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1556 if (n > 255)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1557 n = 255;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1558 *res = Py_SAFE_DOWNCAST(n, Py_ssize_t, unsigned char);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1559 } else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1560 if (e->pack(res, v, e) < 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1561 if (PyLong_Check(v) && PyErr_ExceptionMatches(PyExc_OverflowError))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1562 PyErr_SetString(StructError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1563 "long too large to convert to int");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1564 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1565 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1566 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1567 }
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1568
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1569 /* Success */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1570 return 0;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1571 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1572
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1573
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1574 PyDoc_STRVAR(s_pack__doc__,
48591 1de718a31004 update the struct documentation to refer to bytes Benjamin Peterson <benjamin@python.org> parents: 48321 diff changeset	1575 "S.pack(v1, v2, ...) -> bytes\n\
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1576 \n\
62298 9550eda1c096 Issue #8973: Improve struct module docstrings. Mark Dickinson <dickinsm@gmail.com> parents: 62297 diff changeset	1577 Return a bytes object containing values v1, v2, ... packed according\n\
9550eda1c096 Issue #8973: Improve struct module docstrings. Mark Dickinson <dickinsm@gmail.com> parents: 62297 diff changeset	1578 to the format string S.format. See help(struct) for more on format\n\
9550eda1c096 Issue #8973: Improve struct module docstrings. Mark Dickinson <dickinsm@gmail.com> parents: 62297 diff changeset	1579 strings.");
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1580
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1581 static PyObject *
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1582 s_pack(PyObject self, PyObject args)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1583 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1584 PyStructObject *soself;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1585 PyObject *result;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1586
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1587 /* Validate arguments. */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1588 soself = (PyStructObject *)self;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1589 assert(PyStruct_Check(self));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1590 assert(soself->s_codes != NULL);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1591 if (PyTuple_GET_SIZE(args) != soself->s_len)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1592 {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1593 PyErr_Format(StructError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1594 "pack requires exactly %zd arguments", soself->s_len);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1595 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1596 }
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1597
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1598 /* Allocate a new string */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1599 result = PyBytes_FromStringAndSize((char *)NULL, soself->s_size);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1600 if (result == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1601 return NULL;
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1602
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1603 /* Call the guts */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1604 if ( s_pack_internal(soself, args, 0, PyBytes_AS_STRING(result)) != 0 ) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1605 Py_DECREF(result);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1606 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1607 }
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1608
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1609 return result;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1610 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1611
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	1612 PyDoc_STRVAR(s_pack_into__doc__,
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	1613 "S.pack_into(buffer, offset, v1, v2, ...)\n\
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1614 \n\
62298 9550eda1c096 Issue #8973: Improve struct module docstrings. Mark Dickinson <dickinsm@gmail.com> parents: 62297 diff changeset	1615 Pack the values v1, v2, ... according to the format string S.format\n\
9550eda1c096 Issue #8973: Improve struct module docstrings. Mark Dickinson <dickinsm@gmail.com> parents: 62297 diff changeset	1616 and write the packed bytes into the writable buffer buf starting at\n\
62299 9b333bf08d45 More struct module docs and docstring tweaks. Mark Dickinson <dickinsm@gmail.com> parents: 62298 diff changeset	1617 offset. Note that the offset is a required argument. See\n\
62298 9550eda1c096 Issue #8973: Improve struct module docstrings. Mark Dickinson <dickinsm@gmail.com> parents: 62297 diff changeset	1618 help(struct) for more on format strings.");
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1619
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1620 static PyObject *
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	1621 s_pack_into(PyObject self, PyObject args)
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1622 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1623 PyStructObject *soself;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1624 char *buffer;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1625 Py_ssize_t buffer_len, offset;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1626
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1627 /* Validate arguments. +1 is for the first arg as buffer. */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1628 soself = (PyStructObject *)self;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1629 assert(PyStruct_Check(self));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1630 assert(soself->s_codes != NULL);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1631 if (PyTuple_GET_SIZE(args) != (soself->s_len + 2))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1632 {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1633 PyErr_Format(StructError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1634 "pack_into requires exactly %zd arguments",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1635 (soself->s_len + 2));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1636 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1637 }
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1638
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1639 /* Extract a writable memory buffer from the first argument */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1640 if ( PyObject_AsWriteBuffer(PyTuple_GET_ITEM(args, 0),
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1641 (void**)&buffer, &buffer_len) == -1 ) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1642 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1643 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1644 assert( buffer_len >= 0 );
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1645
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1646 /* Extract the offset from the first argument */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1647 offset = PyNumber_AsSsize_t(PyTuple_GET_ITEM(args, 1), PyExc_IndexError);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1648 if (offset == -1 && PyErr_Occurred())
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1649 return NULL;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1650
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1651 /* Support negative offsets. */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1652 if (offset < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1653 offset += buffer_len;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1654
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1655 /* Check boundaries */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1656 if (offset < 0 \|\| (buffer_len - offset) < soself->s_size) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1657 PyErr_Format(StructError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1658 "pack_into requires a buffer of at least %zd bytes",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1659 soself->s_size);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1660 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1661 }
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1662
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1663 /* Call the guts */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1664 if ( s_pack_internal(soself, args, 2, buffer + offset) != 0 ) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1665 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1666 }
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1667
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1668 Py_RETURN_NONE;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1669 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1670
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1671 static PyObject *
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1672 s_get_format(PyStructObject self, void unused)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1673 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1674 Py_INCREF(self->s_format);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1675 return self->s_format;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1676 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1677
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1678 static PyObject *
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1679 s_get_size(PyStructObject self, void unused)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1680 {
44099 f324631462a2 Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h Christian Heimes <christian@cheimes.de> parents: 43777 diff changeset	1681 return PyLong_FromSsize_t(self->s_size);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1682 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1683
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1684 /* List of functions */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1685
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1686 static struct PyMethodDef s_methods[] = {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1687 {"pack", s_pack, METH_VARARGS, s_pack__doc__},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1688 {"pack_into", s_pack_into, METH_VARARGS, s_pack_into__doc__},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1689 {"unpack", s_unpack, METH_O, s_unpack__doc__},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1690 {"unpack_from", (PyCFunction)s_unpack_from, METH_VARARGS\|METH_KEYWORDS,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1691 s_unpack_from__doc__},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1692 {NULL, NULL} /* sentinel */
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1693 };
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1694
62310 e585b2431c4a Issue #8973: Expanded Struct.__doc__. Alexander Belopolsky <alexander.belopolsky@gmail.com> parents: 62299 diff changeset	1695 PyDoc_STRVAR(s__doc__,
e585b2431c4a Issue #8973: Expanded Struct.__doc__. Alexander Belopolsky <alexander.belopolsky@gmail.com> parents: 62299 diff changeset	1696 "Struct(fmt) --> compiled struct object\n"
e585b2431c4a Issue #8973: Expanded Struct.__doc__. Alexander Belopolsky <alexander.belopolsky@gmail.com> parents: 62299 diff changeset	1697 "\n"
e585b2431c4a Issue #8973: Expanded Struct.__doc__. Alexander Belopolsky <alexander.belopolsky@gmail.com> parents: 62299 diff changeset	1698 "Return a new Struct object which writes and reads binary data according to\n"
e585b2431c4a Issue #8973: Expanded Struct.__doc__. Alexander Belopolsky <alexander.belopolsky@gmail.com> parents: 62299 diff changeset	1699 "the format string fmt. See help(struct) for more on format strings.");
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1700
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1701 #define OFF(x) offsetof(PyStructObject, x)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1702
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1703 static PyGetSetDef s_getsetlist[] = {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1704 {"format", (getter)s_get_format, (setter)NULL, "struct format string", NULL},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1705 {"size", (getter)s_get_size, (setter)NULL, "struct size in bytes", NULL},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1706 {NULL} /* sentinel */
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1707 };
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1708
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1709 static
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1710 PyTypeObject PyStructType = {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1711 PyVarObject_HEAD_INIT(NULL, 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1712 "Struct",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1713 sizeof(PyStructObject),
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1714 0,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1715 (destructor)s_dealloc, /* tp_dealloc */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1716 0, /* tp_print */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1717 0, /* tp_getattr */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1718 0, /* tp_setattr */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1719 0, /* tp_reserved */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1720 0, /* tp_repr */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1721 0, /* tp_as_number */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1722 0, /* tp_as_sequence */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1723 0, /* tp_as_mapping */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1724 0, /* tp_hash */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1725 0, /* tp_call */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1726 0, /* tp_str */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1727 PyObject_GenericGetAttr, /* tp_getattro */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1728 PyObject_GenericSetAttr, /* tp_setattro */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1729 0, /* tp_as_buffer */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1730 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_BASETYPE, /* tp_flags */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1731 s__doc__, /* tp_doc */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1732 0, /* tp_traverse */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1733 0, /* tp_clear */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1734 0, /* tp_richcompare */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1735 offsetof(PyStructObject, weakreflist), /* tp_weaklistoffset */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1736 0, /* tp_iter */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1737 0, /* tp_iternext */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1738 s_methods, /* tp_methods */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1739 NULL, /* tp_members */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1740 s_getsetlist, /* tp_getset */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1741 0, /* tp_base */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1742 0, /* tp_dict */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1743 0, /* tp_descr_get */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1744 0, /* tp_descr_set */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1745 0, /* tp_dictoffset */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1746 s_init, /* tp_init */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1747 PyType_GenericAlloc,/* tp_alloc */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1748 s_new, /* tp_new */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1749 PyObject_Del, /* tp_free */
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1750 };
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1751
44460 13aabc23cf2e Merged revisions 59680-59695 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1752
13aabc23cf2e Merged revisions 59680-59695 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1753 /* ---- Standalone functions ---- */
13aabc23cf2e Merged revisions 59680-59695 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1754
13aabc23cf2e Merged revisions 59680-59695 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1755 #define MAXCACHE 100
13aabc23cf2e Merged revisions 59680-59695 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1756 static PyObject *cache = NULL;
13aabc23cf2e Merged revisions 59680-59695 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1757
13aabc23cf2e Merged revisions 59680-59695 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1758 static PyObject *
13aabc23cf2e Merged revisions 59680-59695 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1759 cache_struct(PyObject *fmt)
13aabc23cf2e Merged revisions 59680-59695 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1760 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1761 PyObject * s_object;
44460 13aabc23cf2e Merged revisions 59680-59695 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1762
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1763 if (cache == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1764 cache = PyDict_New();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1765 if (cache == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1766 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1767 }
44460 13aabc23cf2e Merged revisions 59680-59695 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1768
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1769 s_object = PyDict_GetItem(cache, fmt);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1770 if (s_object != NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1771 Py_INCREF(s_object);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1772 return s_object;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1773 }
44460 13aabc23cf2e Merged revisions 59680-59695 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1774
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1775 s_object = PyObject_CallFunctionObjArgs((PyObject *)(&PyStructType), fmt, NULL);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1776 if (s_object != NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1777 if (PyDict_Size(cache) >= MAXCACHE)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1778 PyDict_Clear(cache);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1779 /* Attempt to cache the result */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1780 if (PyDict_SetItem(cache, fmt, s_object) == -1)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1781 PyErr_Clear();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1782 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1783 return s_object;
44460 13aabc23cf2e Merged revisions 59680-59695 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1784 }
13aabc23cf2e Merged revisions 59680-59695 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1785
13aabc23cf2e Merged revisions 59680-59695 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1786 PyDoc_STRVAR(clearcache_doc,
13aabc23cf2e Merged revisions 59680-59695 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1787 "Clear the internal cache.");
13aabc23cf2e Merged revisions 59680-59695 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1788
13aabc23cf2e Merged revisions 59680-59695 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1789 static PyObject *
13aabc23cf2e Merged revisions 59680-59695 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1790 clearcache(PyObject *self)
13aabc23cf2e Merged revisions 59680-59695 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1791 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1792 Py_CLEAR(cache);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1793 Py_RETURN_NONE;
44460 13aabc23cf2e Merged revisions 59680-59695 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1794 }
13aabc23cf2e Merged revisions 59680-59695 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1795
13aabc23cf2e Merged revisions 59680-59695 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1796 PyDoc_STRVAR(calcsize_doc,
62298 9550eda1c096 Issue #8973: Improve struct module docstrings. Mark Dickinson <dickinsm@gmail.com> parents: 62297 diff changeset	1797 "calcsize(fmt) -> integer\n\
9550eda1c096 Issue #8973: Improve struct module docstrings. Mark Dickinson <dickinsm@gmail.com> parents: 62297 diff changeset	1798 \n\
9550eda1c096 Issue #8973: Improve struct module docstrings. Mark Dickinson <dickinsm@gmail.com> parents: 62297 diff changeset	1799 Return size in bytes of the struct described by the format string fmt.");
44460 13aabc23cf2e Merged revisions 59680-59695 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1800
13aabc23cf2e Merged revisions 59680-59695 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1801 static PyObject *
13aabc23cf2e Merged revisions 59680-59695 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1802 calcsize(PyObject self, PyObject fmt)
13aabc23cf2e Merged revisions 59680-59695 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1803 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1804 Py_ssize_t n;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1805 PyObject *s_object = cache_struct(fmt);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1806 if (s_object == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1807 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1808 n = ((PyStructObject *)s_object)->s_size;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1809 Py_DECREF(s_object);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1810 return PyLong_FromSsize_t(n);
44460 13aabc23cf2e Merged revisions 59680-59695 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1811 }
13aabc23cf2e Merged revisions 59680-59695 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1812
13aabc23cf2e Merged revisions 59680-59695 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1813 PyDoc_STRVAR(pack_doc,
62298 9550eda1c096 Issue #8973: Improve struct module docstrings. Mark Dickinson <dickinsm@gmail.com> parents: 62297 diff changeset	1814 "pack(fmt, v1, v2, ...) -> bytes\n\
9550eda1c096 Issue #8973: Improve struct module docstrings. Mark Dickinson <dickinsm@gmail.com> parents: 62297 diff changeset	1815 \n\
62299 9b333bf08d45 More struct module docs and docstring tweaks. Mark Dickinson <dickinsm@gmail.com> parents: 62298 diff changeset	1816 Return a bytes object containing the values v1, v2, ... packed according\n\
9b333bf08d45 More struct module docs and docstring tweaks. Mark Dickinson <dickinsm@gmail.com> parents: 62298 diff changeset	1817 to the format string fmt. See help(struct) for more on format strings.");
44460 13aabc23cf2e Merged revisions 59680-59695 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1818
13aabc23cf2e Merged revisions 59680-59695 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1819 static PyObject *
13aabc23cf2e Merged revisions 59680-59695 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1820 pack(PyObject self, PyObject args)
13aabc23cf2e Merged revisions 59680-59695 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1821 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1822 PyObject s_object, fmt, newargs, result;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1823 Py_ssize_t n = PyTuple_GET_SIZE(args);
44460 13aabc23cf2e Merged revisions 59680-59695 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1824
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1825 if (n == 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1826 PyErr_SetString(PyExc_TypeError, "missing format argument");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1827 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1828 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1829 fmt = PyTuple_GET_ITEM(args, 0);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1830 newargs = PyTuple_GetSlice(args, 1, n);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1831 if (newargs == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1832 return NULL;
44460 13aabc23cf2e Merged revisions 59680-59695 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1833
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1834 s_object = cache_struct(fmt);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1835 if (s_object == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1836 Py_DECREF(newargs);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1837 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1838 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1839 result = s_pack(s_object, newargs);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1840 Py_DECREF(newargs);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1841 Py_DECREF(s_object);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1842 return result;
44460 13aabc23cf2e Merged revisions 59680-59695 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1843 }
13aabc23cf2e Merged revisions 59680-59695 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1844
13aabc23cf2e Merged revisions 59680-59695 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1845 PyDoc_STRVAR(pack_into_doc,
62298 9550eda1c096 Issue #8973: Improve struct module docstrings. Mark Dickinson <dickinsm@gmail.com> parents: 62297 diff changeset	1846 "pack_into(fmt, buffer, offset, v1, v2, ...)\n\
9550eda1c096 Issue #8973: Improve struct module docstrings. Mark Dickinson <dickinsm@gmail.com> parents: 62297 diff changeset	1847 \n\
9550eda1c096 Issue #8973: Improve struct module docstrings. Mark Dickinson <dickinsm@gmail.com> parents: 62297 diff changeset	1848 Pack the values v1, v2, ... according to the format string fmt and write\n\
9550eda1c096 Issue #8973: Improve struct module docstrings. Mark Dickinson <dickinsm@gmail.com> parents: 62297 diff changeset	1849 the packed bytes into the writable buffer buf starting at offset. Note\n\
62299 9b333bf08d45 More struct module docs and docstring tweaks. Mark Dickinson <dickinsm@gmail.com> parents: 62298 diff changeset	1850 that the offset is a required argument. See help(struct) for more\n\
62298 9550eda1c096 Issue #8973: Improve struct module docstrings. Mark Dickinson <dickinsm@gmail.com> parents: 62297 diff changeset	1851 on format strings.");
44460 13aabc23cf2e Merged revisions 59680-59695 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1852
13aabc23cf2e Merged revisions 59680-59695 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1853 static PyObject *
13aabc23cf2e Merged revisions 59680-59695 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1854 pack_into(PyObject self, PyObject args)
13aabc23cf2e Merged revisions 59680-59695 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1855 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1856 PyObject s_object, fmt, newargs, result;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1857 Py_ssize_t n = PyTuple_GET_SIZE(args);
44460 13aabc23cf2e Merged revisions 59680-59695 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1858
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1859 if (n == 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1860 PyErr_SetString(PyExc_TypeError, "missing format argument");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1861 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1862 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1863 fmt = PyTuple_GET_ITEM(args, 0);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1864 newargs = PyTuple_GetSlice(args, 1, n);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1865 if (newargs == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1866 return NULL;
44460 13aabc23cf2e Merged revisions 59680-59695 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1867
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1868 s_object = cache_struct(fmt);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1869 if (s_object == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1870 Py_DECREF(newargs);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1871 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1872 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1873 result = s_pack_into(s_object, newargs);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1874 Py_DECREF(newargs);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1875 Py_DECREF(s_object);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1876 return result;
44460 13aabc23cf2e Merged revisions 59680-59695 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1877 }
13aabc23cf2e Merged revisions 59680-59695 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1878
13aabc23cf2e Merged revisions 59680-59695 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1879 PyDoc_STRVAR(unpack_doc,
62298 9550eda1c096 Issue #8973: Improve struct module docstrings. Mark Dickinson <dickinsm@gmail.com> parents: 62297 diff changeset	1880 "unpack(fmt, buffer) -> (v1, v2, ...)\n\
9550eda1c096 Issue #8973: Improve struct module docstrings. Mark Dickinson <dickinsm@gmail.com> parents: 62297 diff changeset	1881 \n\
9550eda1c096 Issue #8973: Improve struct module docstrings. Mark Dickinson <dickinsm@gmail.com> parents: 62297 diff changeset	1882 Return a tuple containing values unpacked according to the format string\n\
9550eda1c096 Issue #8973: Improve struct module docstrings. Mark Dickinson <dickinsm@gmail.com> parents: 62297 diff changeset	1883 fmt. Requires len(buffer) == calcsize(fmt). See help(struct) for more\n\
9550eda1c096 Issue #8973: Improve struct module docstrings. Mark Dickinson <dickinsm@gmail.com> parents: 62297 diff changeset	1884 on format strings.");
44460 13aabc23cf2e Merged revisions 59680-59695 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1885
13aabc23cf2e Merged revisions 59680-59695 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1886 static PyObject *
13aabc23cf2e Merged revisions 59680-59695 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1887 unpack(PyObject self, PyObject args)
13aabc23cf2e Merged revisions 59680-59695 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1888 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1889 PyObject s_object, fmt, inputstr, result;
44460 13aabc23cf2e Merged revisions 59680-59695 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1890
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1891 if (!PyArg_UnpackTuple(args, "unpack", 2, 2, &fmt, &inputstr))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1892 return NULL;
44460 13aabc23cf2e Merged revisions 59680-59695 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1893
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1894 s_object = cache_struct(fmt);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1895 if (s_object == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1896 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1897 result = s_unpack(s_object, inputstr);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1898 Py_DECREF(s_object);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1899 return result;
44460 13aabc23cf2e Merged revisions 59680-59695 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1900 }
13aabc23cf2e Merged revisions 59680-59695 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1901
13aabc23cf2e Merged revisions 59680-59695 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1902 PyDoc_STRVAR(unpack_from_doc,
62314 7ac6148e6a7f Remove unnecessary brackets from docstring optional arguments. Mark Dickinson <dickinsm@gmail.com> parents: 62310 diff changeset	1903 "unpack_from(fmt, buffer, offset=0) -> (v1, v2, ...)\n\
62298 9550eda1c096 Issue #8973: Improve struct module docstrings. Mark Dickinson <dickinsm@gmail.com> parents: 62297 diff changeset	1904 \n\
9550eda1c096 Issue #8973: Improve struct module docstrings. Mark Dickinson <dickinsm@gmail.com> parents: 62297 diff changeset	1905 Return a tuple containing values unpacked according to the format string\n\
9550eda1c096 Issue #8973: Improve struct module docstrings. Mark Dickinson <dickinsm@gmail.com> parents: 62297 diff changeset	1906 fmt. Requires len(buffer[offset:]) >= calcsize(fmt). See help(struct)\n\
9550eda1c096 Issue #8973: Improve struct module docstrings. Mark Dickinson <dickinsm@gmail.com> parents: 62297 diff changeset	1907 for more on format strings.");
44460 13aabc23cf2e Merged revisions 59680-59695 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1908
13aabc23cf2e Merged revisions 59680-59695 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1909 static PyObject *
13aabc23cf2e Merged revisions 59680-59695 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1910 unpack_from(PyObject self, PyObject args, PyObject *kwds)
13aabc23cf2e Merged revisions 59680-59695 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1911 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1912 PyObject s_object, fmt, newargs, result;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1913 Py_ssize_t n = PyTuple_GET_SIZE(args);
44460 13aabc23cf2e Merged revisions 59680-59695 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1914
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1915 if (n == 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1916 PyErr_SetString(PyExc_TypeError, "missing format argument");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1917 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1918 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1919 fmt = PyTuple_GET_ITEM(args, 0);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1920 newargs = PyTuple_GetSlice(args, 1, n);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1921 if (newargs == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1922 return NULL;
44460 13aabc23cf2e Merged revisions 59680-59695 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1923
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1924 s_object = cache_struct(fmt);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1925 if (s_object == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1926 Py_DECREF(newargs);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1927 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1928 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1929 result = s_unpack_from(s_object, newargs, kwds);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1930 Py_DECREF(newargs);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1931 Py_DECREF(s_object);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1932 return result;
44460 13aabc23cf2e Merged revisions 59680-59695 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1933 }
13aabc23cf2e Merged revisions 59680-59695 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1934
13aabc23cf2e Merged revisions 59680-59695 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1935 static struct PyMethodDef module_functions[] = {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1936 {"_clearcache", (PyCFunction)clearcache, METH_NOARGS, clearcache_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1937 {"calcsize", calcsize, METH_O, calcsize_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1938 {"pack", pack, METH_VARARGS, pack_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1939 {"pack_into", pack_into, METH_VARARGS, pack_into_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1940 {"unpack", unpack, METH_VARARGS, unpack_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1941 {"unpack_from", (PyCFunction)unpack_from,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1942 METH_VARARGS\|METH_KEYWORDS, unpack_from_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1943 {NULL, NULL} /* sentinel */
44460 13aabc23cf2e Merged revisions 59680-59695 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1944 };
13aabc23cf2e Merged revisions 59680-59695 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1945
13aabc23cf2e Merged revisions 59680-59695 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1946
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1947 /* Module initialization */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1948
44460 13aabc23cf2e Merged revisions 59680-59695 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1949 PyDoc_STRVAR(module_doc,
13aabc23cf2e Merged revisions 59680-59695 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1950 "Functions to convert between Python values and C structs.\n\
48591 1de718a31004 update the struct documentation to refer to bytes Benjamin Peterson <benjamin@python.org> parents: 48321 diff changeset	1951 Python bytes objects are used to hold the data representing the C struct\n\
56418 dd94f1d8c9a5 Merged revisions 75284 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 55145 diff changeset	1952 and also as format strings (explained below) to describe the layout of data\n\
dd94f1d8c9a5 Merged revisions 75284 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 55145 diff changeset	1953 in the C struct.\n\
44460 13aabc23cf2e Merged revisions 59680-59695 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1954 \n\
13aabc23cf2e Merged revisions 59680-59695 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1955 The optional first format char indicates byte order, size and alignment:\n\
56418 dd94f1d8c9a5 Merged revisions 75284 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 55145 diff changeset	1956 @: native order, size & alignment (default)\n\
dd94f1d8c9a5 Merged revisions 75284 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 55145 diff changeset	1957 =: native order, std. size & alignment\n\
dd94f1d8c9a5 Merged revisions 75284 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 55145 diff changeset	1958 <: little-endian, std. size & alignment\n\
dd94f1d8c9a5 Merged revisions 75284 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 55145 diff changeset	1959 >: big-endian, std. size & alignment\n\
dd94f1d8c9a5 Merged revisions 75284 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 55145 diff changeset	1960 !: same as >\n\
44460 13aabc23cf2e Merged revisions 59680-59695 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1961 \n\
13aabc23cf2e Merged revisions 59680-59695 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1962 The remaining chars indicate types of args and must match exactly;\n\
13aabc23cf2e Merged revisions 59680-59695 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1963 these can be preceded by a decimal repeat count:\n\
13aabc23cf2e Merged revisions 59680-59695 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1964 x: pad byte (no data); c:char; b:signed byte; B:unsigned byte;\n\
56418 dd94f1d8c9a5 Merged revisions 75284 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 55145 diff changeset	1965 ?: _Bool (requires C99; if not available, char is used instead)\n\
44460 13aabc23cf2e Merged revisions 59680-59695 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1966 h:short; H:unsigned short; i:int; I:unsigned int;\n\
13aabc23cf2e Merged revisions 59680-59695 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1967 l:long; L:unsigned long; f:float; d:double.\n\
13aabc23cf2e Merged revisions 59680-59695 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1968 Special cases (preceding decimal count indicates length):\n\
13aabc23cf2e Merged revisions 59680-59695 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1969 s:string (array of char); p: pascal string (with count byte).\n\
13aabc23cf2e Merged revisions 59680-59695 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1970 Special case (only available in native format):\n\
13aabc23cf2e Merged revisions 59680-59695 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1971 P:an integer type that is wide enough to hold a pointer.\n\
13aabc23cf2e Merged revisions 59680-59695 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1972 Special case (not in native mode unless 'long long' in platform C):\n\
13aabc23cf2e Merged revisions 59680-59695 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1973 q:long long; Q:unsigned long long\n\
13aabc23cf2e Merged revisions 59680-59695 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1974 Whitespace between formats is ignored.\n\
13aabc23cf2e Merged revisions 59680-59695 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1975 \n\
13aabc23cf2e Merged revisions 59680-59695 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1976 The variable struct.error is an exception raised on errors.\n");
13aabc23cf2e Merged revisions 59680-59695 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1977
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	1978
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	1979 static struct PyModuleDef _structmodule = {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1980 PyModuleDef_HEAD_INIT,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1981 "_struct",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1982 module_doc,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1983 -1,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1984 module_functions,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1985 NULL,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1986 NULL,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1987 NULL,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1988 NULL
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	1989 };
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	1990
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1991 PyMODINIT_FUNC
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	1992 PyInit__struct(void)
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1993 {
62287 a490aa303d8a Remove unused variable. Mark Dickinson <dickinsm@gmail.com> parents: 62286 diff changeset	1994 PyObject *m;
44460 13aabc23cf2e Merged revisions 59680-59695 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1995
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1996 m = PyModule_Create(&_structmodule);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1997 if (m == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	1998 return NULL;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	1999
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	2000 Py_TYPE(&PyStructType) = &PyType_Type;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	2001 if (PyType_Ready(&PyStructType) < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	2002 return NULL;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2003
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	2004 /* Check endian and swap in faster functions */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	2005 {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	2006 int one = 1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	2007 formatdef *native = native_table;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	2008 formatdef other, ptr;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	2009 if ((int)(unsigned char)&one)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	2010 other = lilendian_table;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	2011 else
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	2012 other = bigendian_table;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	2013 /* Scan through the native table, find a matching
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	2014 entry in the endian table and swap in the
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	2015 native implementations whenever possible
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	2016 (64-bit platforms may not have "standard" sizes) */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	2017 while (native->format != '\0' && other->format != '\0') {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	2018 ptr = other;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	2019 while (ptr->format != '\0') {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	2020 if (ptr->format == native->format) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	2021 /* Match faster when formats are
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	2022 listed in the same order */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	2023 if (ptr == other)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	2024 other++;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	2025 /* Only use the trick if the
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	2026 size matches */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	2027 if (ptr->size != native->size)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	2028 break;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	2029 /* Skip float and double, could be
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	2030 "unknown" float format */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	2031 if (ptr->format == 'd' \|\| ptr->format == 'f')
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	2032 break;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	2033 ptr->pack = native->pack;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	2034 ptr->unpack = native->unpack;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	2035 break;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	2036 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	2037 ptr++;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	2038 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	2039 native++;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	2040 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	2041 }
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2042
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	2043 /* Add some symbolic constants to the module */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	2044 if (StructError == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	2045 StructError = PyErr_NewException("struct.error", NULL, NULL);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	2046 if (StructError == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	2047 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	2048 }
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2049
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	2050 Py_INCREF(StructError);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	2051 PyModule_AddObject(m, "error", StructError);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2052
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	2053 Py_INCREF((PyObject*)&PyStructType);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	2054 PyModule_AddObject(m, "Struct", (PyObject*)&PyStructType);
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2055
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60312 diff changeset	2056 return m;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: diff changeset	2057 }

Mercurial > cpython-lru_cache-weakref

annotate Modules/_struct.c @ 63298:29ab536cfef6