mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 10:19:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

get rid of GETNAMEV macro - use GETITEM directly

Browse source 
same idea as getting rid of GETCONST & GETNAME (see patch #506436)
This commit is contained in:
Skip Montanaro 2002-08-06 17:47:40 +00:00
parent fce538c31e
commit 496e6581e1
1 changed files with 11 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Python/ceval.c
View file

@ -514,7 +514,6 @@ eval_frame(PyFrameObject *f)
/* Code access macros */ /* Code access macros */
#define GETNAMEV(i) (GETITEM(names, (i)))
#define INSTR_OFFSET() (next_instr - first_instr) #define INSTR_OFFSET() (next_instr - first_instr)
#define NEXTOP() (*next_instr++) #define NEXTOP() (*next_instr++)
#define NEXTARG() (next_instr += 2, (next_instr[-1]<<8) + next_instr[-2]) #define NEXTARG() (next_instr += 2, (next_instr[-1]<<8) + next_instr[-2])
@ -1563,7 +1562,7 @@ eval_frame(PyFrameObject *f)
break; break;
case STORE_NAME: case STORE_NAME:
w = GETNAMEV(oparg); w = GETITEM(names, oparg);
v = POP(); v = POP();
if ((x = f->f_locals) == NULL) { if ((x = f->f_locals) == NULL) {
PyErr_Format(PyExc_SystemError, PyErr_Format(PyExc_SystemError,
@ -1576,7 +1575,7 @@ eval_frame(PyFrameObject *f)
break; break;
case DELETE_NAME: case DELETE_NAME:
w = GETNAMEV(oparg); w = GETITEM(names, oparg);
if ((x = f->f_locals) == NULL) { if ((x = f->f_locals) == NULL) {
PyErr_Format(PyExc_SystemError, PyErr_Format(PyExc_SystemError,
"no locals when deleting %s", "no locals when deleting %s",
@ -1631,7 +1630,7 @@ eval_frame(PyFrameObject *f)
break; break;
case STORE_ATTR: case STORE_ATTR:
w = GETNAMEV(oparg); w = GETITEM(names, oparg);
v = POP(); v = POP();
u = POP(); u = POP();
err = PyObject_SetAttr(v, w, u); /* v.w = u */ err = PyObject_SetAttr(v, w, u); /* v.w = u */
@ -1640,7 +1639,7 @@ eval_frame(PyFrameObject *f)
break; break;
case DELETE_ATTR: case DELETE_ATTR:
w = GETNAMEV(oparg); w = GETITEM(names, oparg);
v = POP(); v = POP();
err = PyObject_SetAttr(v, w, (PyObject *)NULL); err = PyObject_SetAttr(v, w, (PyObject *)NULL);
/* del v.w */ /* del v.w */
@ -1648,21 +1647,21 @@ eval_frame(PyFrameObject *f)
break; break;
case STORE_GLOBAL: case STORE_GLOBAL:
w = GETNAMEV(oparg); w = GETITEM(names, oparg);
v = POP(); v = POP();
err = PyDict_SetItem(f->f_globals, w, v); err = PyDict_SetItem(f->f_globals, w, v);
Py_DECREF(v); Py_DECREF(v);
break; break;
case DELETE_GLOBAL: case DELETE_GLOBAL:
w = GETNAMEV(oparg); w = GETITEM(names, oparg);
if ((err = PyDict_DelItem(f->f_globals, w)) != 0) if ((err = PyDict_DelItem(f->f_globals, w)) != 0)
format_exc_check_arg( format_exc_check_arg(
PyExc_NameError, GLOBAL_NAME_ERROR_MSG, w); PyExc_NameError, GLOBAL_NAME_ERROR_MSG, w);
break; break;
case LOAD_NAME: case LOAD_NAME:
w = GETNAMEV(oparg); w = GETITEM(names, oparg);
if ((x = f->f_locals) == NULL) { if ((x = f->f_locals) == NULL) {
PyErr_Format(PyExc_SystemError, PyErr_Format(PyExc_SystemError,
"no locals when loading %s", "no locals when loading %s",
@ -1687,7 +1686,7 @@ eval_frame(PyFrameObject *f)
break; break;
case LOAD_GLOBAL: case LOAD_GLOBAL:
w = GETNAMEV(oparg); w = GETITEM(names, oparg);
x = PyDict_GetItem(f->f_globals, w); x = PyDict_GetItem(f->f_globals, w);
if (x == NULL) { if (x == NULL) {
x = PyDict_GetItem(f->f_builtins, w); x = PyDict_GetItem(f->f_builtins, w);
@ -1788,7 +1787,7 @@ eval_frame(PyFrameObject *f)
break; break;
case LOAD_ATTR: case LOAD_ATTR:
w = GETNAMEV(oparg); w = GETITEM(names, oparg);
v = POP(); v = POP();
x = PyObject_GetAttr(v, w); x = PyObject_GetAttr(v, w);
Py_DECREF(v); Py_DECREF(v);
@ -1830,7 +1829,7 @@ eval_frame(PyFrameObject *f)
break; break;
case IMPORT_NAME: case IMPORT_NAME:
w = GETNAMEV(oparg); w = GETITEM(names, oparg);
x = PyDict_GetItemString(f->f_builtins, "__import__"); x = PyDict_GetItemString(f->f_builtins, "__import__");
if (x == NULL) { if (x == NULL) {
PyErr_SetString(PyExc_ImportError, PyErr_SetString(PyExc_ImportError,
@ -1870,7 +1869,7 @@ eval_frame(PyFrameObject *f)
break; break;
case IMPORT_FROM: case IMPORT_FROM:
w = GETNAMEV(oparg); w = GETITEM(names, oparg);
v = TOP(); v = TOP();
x = import_from(v, w); x = import_from(v, w);
PUSH(x); PUSH(x);