diff options
Diffstat (limited to 'Python')
| -rw-r--r-- | Python/ceval.c | 14 | ||||
| -rw-r--r-- | Python/compile.c | 11 | ||||
| -rw-r--r-- | Python/import.c | 5 | ||||
| -rw-r--r-- | Python/pystrcmp.c | 25 |
4 files changed, 45 insertions, 10 deletions
diff --git a/Python/ceval.c b/Python/ceval.c index 20ea349..57e6cd5 100644 --- a/Python/ceval.c +++ b/Python/ceval.c @@ -1787,11 +1787,23 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag) break; case BUILD_MAP: - x = PyDict_New(); + x = _PyDict_NewPresized((Py_ssize_t)oparg); PUSH(x); if (x != NULL) continue; break; + case STORE_MAP: + w = TOP(); /* key */ + u = SECOND(); /* value */ + v = THIRD(); /* dict */ + STACKADJ(-2); + assert (PyDict_CheckExact(v)); + err = PyDict_SetItem(v, w, u); /* v[w] = u */ + Py_DECREF(u); + Py_DECREF(w); + if (err == 0) continue; + break; + case LOAD_ATTR: w = GETITEM(names, oparg); v = TOP(); diff --git a/Python/compile.c b/Python/compile.c index 8951331..c3ef67a 100644 --- a/Python/compile.c +++ b/Python/compile.c @@ -714,6 +714,8 @@ opcode_stack_effect(int opcode, int oparg) return -1; case STORE_SUBSCR: return -3; + case STORE_MAP: + return -2; case DELETE_SUBSCR: return -2; @@ -3169,19 +3171,14 @@ compiler_visit_expr(struct compiler *c, expr_ty e) case IfExp_kind: return compiler_ifexp(c, e); case Dict_kind: - /* XXX get rid of arg? */ - ADDOP_I(c, BUILD_MAP, 0); n = asdl_seq_LEN(e->v.Dict.values); - /* We must arrange things just right for STORE_SUBSCR. - It wants the stack to look like (value) (dict) (key) */ + ADDOP_I(c, BUILD_MAP, (n>255 ? 255 : n)); for (i = 0; i < n; i++) { - ADDOP(c, DUP_TOP); VISIT(c, expr, (expr_ty)asdl_seq_GET(e->v.Dict.values, i)); - ADDOP(c, ROT_TWO); VISIT(c, expr, (expr_ty)asdl_seq_GET(e->v.Dict.keys, i)); - ADDOP(c, STORE_SUBSCR); + ADDOP(c, STORE_MAP); } break; case Set_kind: diff --git a/Python/import.c b/Python/import.c index 9db8fb0..a7f6a48 100644 --- a/Python/import.c +++ b/Python/import.c @@ -66,7 +66,7 @@ extern time_t PyOS_GetLastModificationTime(char *, FILE *); Python 2.5c1: 62121 (fix wrong lnotab with for loops and storing constants that should have been removed) Python 2.5c2: 62131 (fix wrong code: for x, in ... in listcomp/genexp) - Python 2.6a0: 62141 (peephole optimizations) + Python 2.6a0: 62151 (peephole optimizations and STORE_MAP opcode) Python 3000: 3000 3010 (removed UNARY_CONVERT) 3020 (added BUILD_SET) @@ -77,9 +77,10 @@ extern time_t PyOS_GetLastModificationTime(char *, FILE *); 3070 (PEP 3109 raise changes) 3080 (PEP 3137 make __file__ and __name__ unicode) 3090 (kill str8 interning) + 3100 (merge from 2.6a0, see 62151) . */ -#define MAGIC (3090 | ((long)'\r'<<16) | ((long)'\n'<<24)) +#define MAGIC (3100 | ((long)'\r'<<16) | ((long)'\n'<<24)) /* Magic word as global; note that _PyImport_Init() can change the value of this global to accommodate for alterations of how the diff --git a/Python/pystrcmp.c b/Python/pystrcmp.c new file mode 100644 index 0000000..0012ef3 --- /dev/null +++ b/Python/pystrcmp.c @@ -0,0 +1,25 @@ +/* Cross platform case insenstive string compare functions + */ + +#include "Python.h" + +int +PyOS_mystrnicmp(const char *s1, const char *s2, Py_ssize_t size) +{ + if (size == 0) + return 0; + while ((--size > 0) && (tolower(*s1) == tolower(*s2))) { + if (!*s1++ || !*s2++) + break; + } + return tolower(*s1) - tolower(*s2); +} + +int +PyOS_mystricmp(const char *s1, const char *s2) +{ + while (*s1 && (tolower(*s1++) == tolower(*s2++))) { + ; + } + return (tolower(*s1) - tolower(*s2)); +} |