cpython-lru_cache-weakref: Modules/

annotate Modules/_struct.c @ 64166:d0e9febfa00a 3.1

Merged revisions 84172 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r84172 | martin.v.loewis | 2010-08-18 18:12:23 +0200 (Mi, 18 Aug 2010) | 2 lines Restore GIL in nis_cat in case of error. ........

author	Martin v. Löwis <martin@v.loewis.de>
date	Thu, 19 Aug 2010 09:03:03 +0000
parents	902131b31922
children	0991b40e895d 3c9232a684ae

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

Mercurial > cpython-lru_cache-weakref

annotate Modules/_struct.c @ 64166:d0e9febfa00a 3.1