traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Issue #16191: Merge comment fixes from 3.5

This commit is contained in:
Martin Panter 2016-07-18 08:25:01 +00:00
parent bd09f15b69 95f53c13ce
commit 36261d7446
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Python/ceval.c
View File

@ -1565,7 +1565,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)
if (PyUnicode_CheckExact(left) &&
PyUnicode_CheckExact(right)) {
sum = unicode_concatenate(left, right, f, next_instr);
/* unicode_concatenate consumed the ref to v */
/* unicode_concatenate consumed the ref to left */
}
else {
sum = PyNumber_Add(left, right);
@ -1764,7 +1764,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)
PyObject *sum;
if (PyUnicode_CheckExact(left) && PyUnicode_CheckExact(right)) {
sum = unicode_concatenate(left, right, f, next_instr);
/* unicode_concatenate consumed the ref to v */
/* unicode_concatenate consumed the ref to left */
}
else {
sum = PyNumber_InPlaceAdd(left, right);
@ -1855,7 +1855,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)
PyObject *v = THIRD();
int err;
STACKADJ(-3);
/* v[w] = u */
/* container[sub] = v */
err = PyObject_SetItem(container, sub, v);
Py_DECREF(v);
Py_DECREF(container);
@ -1870,7 +1870,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)
PyObject *container = SECOND();
int err;
STACKADJ(-2);
/* del v[w] */
/* del container[sub] */
err = PyObject_DelItem(container, sub);
Py_DECREF(container);
Py_DECREF(sub);
@ -2113,7 +2113,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)
SET_TOP(val);
DISPATCH();
}
/* x remains on stack, retval is value to be yielded */
/* receiver remains on stack, retval is value to be yielded */
f->f_stacktop = stack_pointer;
why = WHY_YIELD;
/* and repeat... */
@ -2773,7 +2773,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)
STACKADJ(-2);
map = stack_pointer[-oparg]; /* dict */
assert(PyDict_CheckExact(map));
err = PyDict_SetItem(map, key, value); /* v[w] = u */
err = PyDict_SetItem(map, key, value); /* map[key] = value */
Py_DECREF(value);
Py_DECREF(key);
if (err != 0)