Kaydet (Commit) fe1bcb64 authored tarafından Benjamin Peterson's avatar Benjamin Peterson

move more variable declarations to the top of blocks

üst f208df36
...@@ -1834,13 +1834,14 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag) ...@@ -1834,13 +1834,14 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)
TARGET(PRINT_EXPR) { TARGET(PRINT_EXPR) {
PyObject *value = POP(); PyObject *value = POP();
PyObject *hook = PySys_GetObject("displayhook"); PyObject *hook = PySys_GetObject("displayhook");
PyObject *res;
if (hook == NULL) { if (hook == NULL) {
PyErr_SetString(PyExc_RuntimeError, PyErr_SetString(PyExc_RuntimeError,
"lost sys.displayhook"); "lost sys.displayhook");
Py_DECREF(value); Py_DECREF(value);
goto error; goto error;
} }
PyObject *res = PyObject_CallFunctionObjArgs(hook, value, NULL); res = PyObject_CallFunctionObjArgs(hook, value, NULL);
Py_DECREF(value); Py_DECREF(value);
if (res == NULL) if (res == NULL)
goto error; goto error;
...@@ -2394,7 +2395,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag) ...@@ -2394,7 +2395,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)
_Py_IDENTIFIER(__import__); _Py_IDENTIFIER(__import__);
PyObject *name = GETITEM(names, oparg); PyObject *name = GETITEM(names, oparg);
PyObject *func = _PyDict_GetItemId(f->f_builtins, &PyId___import__); PyObject *func = _PyDict_GetItemId(f->f_builtins, &PyId___import__);
PyObject *from, *level, *args; PyObject *from, *level, *args, *res;
if (func == NULL) { if (func == NULL) {
PyErr_SetString(PyExc_ImportError, PyErr_SetString(PyExc_ImportError,
"__import__ not found"); "__import__ not found");
...@@ -2426,7 +2427,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag) ...@@ -2426,7 +2427,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)
goto error; goto error;
} }
READ_TIMESTAMP(intr0); READ_TIMESTAMP(intr0);
PyObject *res = PyEval_CallObject(func, args); res = PyEval_CallObject(func, args);
READ_TIMESTAMP(intr1); READ_TIMESTAMP(intr1);
Py_DECREF(args); Py_DECREF(args);
Py_DECREF(func); Py_DECREF(func);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment