Commit 65abcc7f authored by Stefan Behnel's avatar Stefan Behnel

merge

parents 71295b90 3d30a2a7
...@@ -3042,21 +3042,10 @@ class SequenceNode(NewTempExprNode): ...@@ -3042,21 +3042,10 @@ class SequenceNode(NewTempExprNode):
code.putln("} else {") code.putln("} else {")
if rhs.type is tuple_type: if rhs.type is tuple_type:
code.globalstate.use_utility_code(raise_none_iter_error_utility_code) code.globalstate.use_utility_code(tuple_unpacking_error_code)
code.putln("if (%s == Py_None) {" % code.putln("__Pyx_UnpackTupleError(%s, %s);" % (
rhs.py_result()) rhs.py_result(), len(self.args)))
code.putln("__Pyx_RaiseNoneNotIterableError();") code.putln(code.error_goto(self.pos))
code.putln("} else if (PyTuple_GET_SIZE(%s) < %s) {" % (
rhs.py_result(), len(self.args)))
code.globalstate.use_utility_code(raise_need_more_values_to_unpack)
code.putln("__Pyx_RaiseNeedMoreValuesError(PyTuple_GET_SIZE(%s));" %
rhs.py_result());
code.putln("} else {")
code.globalstate.use_utility_code(raise_need_more_values_to_unpack)
code.putln("__Pyx_RaiseTooManyValuesError();");
code.putln("}")
code.putln(
code.error_goto(self.pos))
else: else:
code.putln( code.putln(
"%s = PyObject_GetIter(%s); %s" % ( "%s = PyObject_GetIter(%s); %s" % (
...@@ -5570,6 +5559,26 @@ static INLINE void __Pyx_RaiseNeedMoreValuesError(Py_ssize_t index) { ...@@ -5570,6 +5559,26 @@ static INLINE void __Pyx_RaiseNeedMoreValuesError(Py_ssize_t index) {
#------------------------------------------------------------------------------------ #------------------------------------------------------------------------------------
tuple_unpacking_error_code = UtilityCode(
proto = """
static void __Pyx_UnpackTupleError(PyObject *, Py_ssize_t index); /*proto*/
""",
impl = """
static void __Pyx_UnpackTupleError(PyObject *t, Py_ssize_t index) {
if (t == Py_None) {
__Pyx_RaiseNoneNotIterableError();
} else if (PyTuple_GET_SIZE(t) < index) {
__Pyx_RaiseNeedMoreValuesError(PyTuple_GET_SIZE(t));
} else {
__Pyx_RaiseTooManyValuesError();
}
}
""",
requires = [raise_none_iter_error_utility_code,
raise_need_more_values_to_unpack,
raise_too_many_values_to_unpack]
)
unpacking_utility_code = UtilityCode( unpacking_utility_code = UtilityCode(
proto = """ proto = """
static PyObject *__Pyx_UnpackItem(PyObject *, Py_ssize_t index); /*proto*/ static PyObject *__Pyx_UnpackItem(PyObject *, Py_ssize_t index); /*proto*/
......
cdef void f(obj): cdef void f(obj):
cdef int i=0 cdef int i=0
cdef char *p cdef char *p
p = <char *>i
p = <char *>&i p = <char *>&i
obj = <object>p obj = <object>p
p = <char *>obj p = <char *>obj
......
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