merge

Cython/Compiler/ExprNodes.py

@@ -2062,12 +2062,12 @@ class SequenceNode(ExprNode):
                 rhs.py_result(), 
                 rhs.py_result(), 
                 len(self.args)))
+        code.putln("PyObject* tuple = %s;" % rhs.py_result())
         for i in range(len(self.args)):
             item = self.unpacked_items[i]
             code.putln(
-                "%s = PyTuple_GET_ITEM(%s, %s);" % (
+                "%s = PyTuple_GET_ITEM(tuple, %s);" % (
                     item.result_code,
-                    rhs.py_result(),
                     i))
             code.put_incref(item.result_code, item.ctype())
             value_node = self.coerced_unpacked_items[i]

Cython/Compiler/ModuleNode.py

@@ -797,7 +797,7 @@ class ModuleNode(Nodes.Node, Nodes.BlockNode):
                 code.putln("}")
         for entry in py_attrs:
             name = "p->%s" % entry.cname
-            code.putln("tmp = %s;" % code.as_pyobject(name, entry.type))
+            code.putln("tmp = ((PyObject*)%s);" % name)
             code.put_init_to_py_none(name, entry.type)
             code.putln("Py_XDECREF(tmp);")
         code.putln(

Cython/Compiler/Nodes.py

@@ -928,15 +928,19 @@ class DefNode(FuncDefNode):
     
     assmt = None
     num_kwonly_args = 0
+    num_required_kw_args = 0
     reqd_kw_flags_cname = "0"
     
     def __init__(self, pos, **kwds):
         FuncDefNode.__init__(self, pos, **kwds)
-        n = 0
+        n = r = 0
         for arg in self.args:
             if arg.kw_only:
                 n += 1
+                if not arg.default:
+                    r += 1
         self.num_kwonly_args = n
+        self.num_required_kw_args = r
     
     def analyse_declarations(self, env):
         for arg in self.args:
@@ -958,9 +962,13 @@ class DefNode(FuncDefNode):
         self.declare_pyfunction(env)
         self.analyse_signature(env)
         self.return_type = self.entry.signature.return_type()
-        if self.star_arg or self.starstar_arg or self.num_kwonly_args > 0:
-            env.use_utility_code(get_starargs_utility_code)
-    
+        if self.star_arg:
+            env.use_utility_code(get_stararg_utility_code)
+        if self.starstar_arg:
+            env.use_utility_code(get_splitkeywords_utility_code)
+        if self.num_required_kw_args:
+            env.use_utility_code(get_checkkeywords_utility_code)
+
     def analyse_signature(self, env):
         any_type_tests_needed = 0
         # Use the simpler calling signature for zero- and one-argument functions.
@@ -1215,6 +1223,10 @@ class DefNode(FuncDefNode):
                         if not default_seen:
                             arg_formats.append("|")
                         default_seen = 1
+                    elif arg.kw_only:
+                        if not default_seen:
+                            arg_formats.append("|")
+                        default_seen = 1
                     elif default_seen and not arg.kw_only:
                         error(arg.pos, "Non-default argument following default argument")
                     if arg.needs_conversion:
@@ -1241,9 +1253,8 @@ class DefNode(FuncDefNode):
                     pt_argstring)
             if has_star_or_kw_args:
                 code.putln("{")
-                code.put_xdecref(Naming.args_cname, py_object_type)
-                code.put_xdecref(Naming.kwds_cname, py_object_type)
-                self.generate_arg_xdecref(self.star_arg, code)
+                self.put_stararg_decrefs(code)
+                self.generate_arg_decref(self.star_arg, code)
                 self.generate_arg_xdecref(self.starstar_arg, code)
                 code.putln(error_return_code)
                 code.putln("}")
@@ -1251,14 +1262,19 @@ class DefNode(FuncDefNode):
                 code.putln(error_return_code)
 
     def put_stararg_decrefs(self, code):
-        if self.star_arg or self.starstar_arg or self.num_kwonly_args > 0:
-            code.put_xdecref(Naming.args_cname, py_object_type)
+        if self.star_arg:
+            code.put_decref(Naming.args_cname, py_object_type)
+        if self.starstar_arg:
             code.put_xdecref(Naming.kwds_cname, py_object_type)
     
     def generate_arg_xdecref(self, arg, code):
         if arg:
             code.put_var_xdecref(arg.entry)
     
+    def generate_arg_decref(self, arg, code):
+        if arg:
+            code.put_var_decref(arg.entry)
+    
     def arg_address(self, arg):
         if arg:
             return "&%s" % arg.entry.cname
@@ -1267,19 +1283,55 @@ class DefNode(FuncDefNode):
 
     def generate_stararg_getting_code(self, code):
         num_kwonly = self.num_kwonly_args
-        nargs = len(self.args) - num_kwonly - self.entry.signature.num_fixed_args()
-        star_arg_addr = self.arg_address(self.star_arg)
-        starstar_arg_addr = self.arg_address(self.starstar_arg)
-        code.putln(
-            "if (__Pyx_GetStarArgs(&%s, &%s, %s, %s, %s, %s, %s) < 0) return %s;" % (
-                Naming.args_cname,
-                Naming.kwds_cname,
-                Naming.kwdlist_cname,
-                nargs,
-                star_arg_addr,
-                starstar_arg_addr,
-                self.reqd_kw_flags_cname,
-                self.error_value()))
+        fixed_args = self.entry.signature.num_fixed_args()
+        nargs = len(self.args) - num_kwonly - fixed_args
+        error_return = "return %s;" % self.error_value()
+
+        if self.star_arg:
+            star_arg_addr = self.arg_address(self.star_arg)
+            code.putln(
+                "if (unlikely(__Pyx_GetStarArg(&%s, %s, %s) < 0)) return %s;" % (
+                    Naming.args_cname,
+                    nargs,
+                    star_arg_addr,
+                    self.error_value()))
+        elif self.entry.signature.has_generic_args:
+            # make sure supernumerous positional arguments do not run
+            # into keyword-only arguments and provide a more helpful
+            # message than PyArg_ParseTupelAndKeywords()
+            code.putln("if (unlikely(PyTuple_GET_SIZE(%s) > %d)) {" % (
+                    Naming.args_cname, nargs))
+            error_message = "function takes at most %d positional arguments (%d given)"
+            code.putln("PyErr_Format(PyExc_TypeError, \"%s\", %d, PyTuple_GET_SIZE(%s));" % (
+                    error_message, nargs, Naming.args_cname))
+            code.putln(error_return)
+            code.putln("}")
+
+        handle_error = 0
+        if self.starstar_arg:
+            handle_error = 1
+            code.put(
+                "if (unlikely(__Pyx_SplitKeywords(&%s, %s, %s, %s) < 0)) " % (
+                    Naming.kwds_cname,
+                    Naming.kwdlist_cname,
+                    self.arg_address(self.starstar_arg),
+                    self.reqd_kw_flags_cname))
+        elif self.num_required_kw_args:
+            handle_error = 1
+            code.put("if (unlikely(__Pyx_CheckRequiredKeywords(%s, %s, %s) < 0)) " % (
+                    Naming.kwds_cname,
+                    Naming.kwdlist_cname,
+                    self.reqd_kw_flags_cname))
+
+        if handle_error:
+            if self.star_arg:
+                code.putln("{")
+                code.put_decref(Naming.args_cname, py_object_type)
+                code.put_decref(self.star_arg.entry.cname, py_object_type)
+                code.putln(error_return)
+                code.putln("}")
+            else:
+                code.putln(error_return)
 
     def generate_argument_conversion_code(self, code):
         # Generate code to convert arguments from
@@ -3318,98 +3370,92 @@ static int __Pyx_ArgTypeTest(PyObject *obj, PyTypeObject *type, int none_allowed
 
 #------------------------------------------------------------------------------------
 #
-#  __Pyx_GetStarArgs splits the args tuple and kwds dict into two parts
-#  each, one part suitable for passing to PyArg_ParseTupleAndKeywords,
-#  and the other containing any extra arguments. On success, replaces
-#  the borrowed references *args and *kwds with references to a new
-#  tuple and dict, and passes back new references in *args2 and *kwds2.
-#  Does not touch any of its arguments on failure.
+#  __Pyx_GetStarArg splits the args tuple into two parts, one part
+#  suitable for passing to PyArg_ParseTupleAndKeywords, and the other
+#  containing any extra arguments. On success, replaces the borrowed
+#  reference *args with references to a new tuple, and passes back a
+#  new reference in *args2.  Does not touch any of its arguments on
+#  failure.
+
+get_stararg_utility_code = [
+"""
+static INLINE int __Pyx_GetStarArg(PyObject **args, Py_ssize_t nargs, PyObject **args2); /*proto*/
+""","""
+static INLINE int __Pyx_GetStarArg(
+    PyObject **args, 
+    Py_ssize_t nargs,
+    PyObject **args2)
+{
+    PyObject *args1 = 0;
+
+    *args2 = 0;
+    args1 = PyTuple_GetSlice(*args, 0, nargs);
+    if (!args1)
+        return -1;
+    *args2 = PyTuple_GetSlice(*args, nargs, PyTuple_GET_SIZE(*args));
+    if (!*args2) {
+        Py_DECREF(args1);
+        return -1;
+    }
+    *args = args1;
+    return 0;
+}
+"""]
+
+#------------------------------------------------------------------------------------
+#
+#  __Pyx_SplitKeywords splits the kwds dict into two parts one part
+#  suitable for passing to PyArg_ParseTupleAndKeywords, and the other
+#  containing any extra arguments. On success, replaces the borrowed
+#  reference *kwds with references to a new dict, and passes back a
+#  new reference in *kwds2.  Does not touch any of its arguments on
+#  failure.
 #
-#  Any of *kwds, args2 and kwds2 may be 0 (but not args or kwds). If
-#  *kwds == 0, it is not changed. If kwds2 == 0 and *kwds != 0, a new
-#  reference to the same dictionary is passed back in *kwds.
+#  Any of *kwds and kwds2 may be 0 (but not kwds). If *kwds == 0, it
+#  is not changed. If kwds2 == 0 and *kwds != 0, a new reference to
+#  the same dictionary is passed back in *kwds.
 #
-#  If rqd_kwds is not 0, it is an array of booleans corresponding to the
-#  names in kwd_list, indicating required keyword arguments. If any of
-#  these are not present in kwds, an exception is raised.
+#  If rqd_kwds is not 0, it is an array of booleans corresponding to
+#  the names in kwd_list, indicating required keyword arguments. If
+#  any of these are not present in kwds, an exception is raised.
 #
 
-get_starargs_utility_code = [
+get_splitkeywords_utility_code = [
 """
-static int __Pyx_GetStarArgs(PyObject **args, PyObject **kwds, char *kwd_list[], \
-    Py_ssize_t nargs, PyObject **args2, PyObject **kwds2, char rqd_kwds[]); /*proto*/
+static int __Pyx_SplitKeywords(PyObject **kwds, char *kwd_list[], \
+    PyObject **kwds2, char rqd_kwds[]); /*proto*/
 ""","""
-static int __Pyx_GetStarArgs(
-    PyObject **args, 
+static int __Pyx_SplitKeywords(
     PyObject **kwds,
     char *kwd_list[], 
-    Py_ssize_t nargs,
-    PyObject **args2, 
     PyObject **kwds2,
     char rqd_kwds[])
 {
-    PyObject *s = 0, *x = 0, *args1 = 0, *kwds1 = 0;
+    PyObject *s = 0, *x = 0, *kwds1 = 0;
     int i;
     char **p;
     
-    if (args2)
-        *args2 = 0;
-    if (kwds2)
-        *kwds2 = 0;
-    
-    if (args2) {
-        args1 = PyTuple_GetSlice(*args, 0, nargs);
-        if (!args1)
+    if (*kwds) {
+        kwds1 = PyDict_New();
+        if (!kwds1)
             goto bad;
-        *args2 = PyTuple_GetSlice(*args, nargs, PyTuple_GET_SIZE(*args));
-        if (!*args2)
+        *kwds2 = PyDict_Copy(*kwds);
+        if (!*kwds2)
             goto bad;
-    }
-    else if (PyTuple_GET_SIZE(*args) > nargs) {
-        int m = nargs;
-        int n = PyTuple_GET_SIZE(*args);
-        PyErr_Format(PyExc_TypeError,
-            "function takes at most %d positional arguments (%d given)",
-                m, n);
-        goto bad;
-    }
-    else {
-        args1 = *args;
-        Py_INCREF(args1);
-    }
-
-    if (*kwds) {
-        if (kwds2) {
-            kwds1 = PyDict_New();
-            if (!kwds1)
-                goto bad;
-            *kwds2 = PyDict_Copy(*kwds);
-            if (!*kwds2)
-                goto bad;
-            for (i = 0, p = kwd_list; *p; i++, p++) {
-                s = PyString_FromString(*p);
-                x = PyDict_GetItem(*kwds, s);
-                if (x) {
-                    if (PyDict_SetItem(kwds1, s, x) < 0)
-                        goto bad;
-                    if (PyDict_DelItem(*kwds2, s) < 0)
-                        goto bad;
-                }
-                else if (rqd_kwds && rqd_kwds[i])
-                    goto missing_kwarg;
-                Py_DECREF(s);
-            }
-            s = 0;
-        }
-        else {
-            kwds1 = *kwds;
-            Py_INCREF(kwds1);
-            if (rqd_kwds) {
-                for (i = 0, p = kwd_list; *p; i++, p++)
-                    if (rqd_kwds[i] && !PyDict_GetItemString(kwds1, *p))
-                        goto missing_kwarg;
+        for (i = 0, p = kwd_list; *p; i++, p++) {
+            s = PyString_FromString(*p);
+            x = PyDict_GetItem(*kwds, s);
+            if (x) {
+                if (PyDict_SetItem(kwds1, s, x) < 0)
+                    goto bad;
+                if (PyDict_DelItem(*kwds2, s) < 0)
+                    goto bad;
             }
+            else if (rqd_kwds && rqd_kwds[i])
+                goto missing_kwarg;
+            Py_DECREF(s);
         }
+        s = 0;
     }
     else {
         if (rqd_kwds) {
@@ -3417,14 +3463,11 @@ static int __Pyx_GetStarArgs(
                 if (rqd_kwds[i])
                     goto missing_kwarg;
         }
-        if (kwds2) {
-            *kwds2 = PyDict_New();
-            if (!*kwds2)
-                goto bad;
-        }
+        *kwds2 = PyDict_New();
+        if (!*kwds2)
+            goto bad;
     }
-    
-    *args = args1;
+
     *kwds = kwds1;
     return 0;
 missing_kwarg:
@@ -3432,14 +3475,40 @@ missing_kwarg:
         "required keyword argument '%s' is missing", *p);
 bad:
     Py_XDECREF(s);
-    Py_XDECREF(args1);
     Py_XDECREF(kwds1);
-    if (args2) {
-        Py_XDECREF(*args2);
+    Py_XDECREF(*kwds2);
+    return -1;
+}
+"""]
+
+get_checkkeywords_utility_code = [
+"""
+static INLINE int __Pyx_CheckRequiredKeywords(PyObject *kwds, char *kwd_list[],
+    char rqd_kwds[]); /*proto*/
+""","""
+static INLINE int __Pyx_CheckRequiredKeywords(
+    PyObject *kwds,
+    char *kwd_list[],
+    char rqd_kwds[])
+{
+    int i;
+    char **p;
+
+    if (kwds) {
+        for (i = 0, p = kwd_list; *p; i++, p++)
+            if (rqd_kwds[i] && !PyDict_GetItemString(kwds, *p))
+                goto missing_kwarg;
     }
-    if (kwds2) {
-        Py_XDECREF(*kwds2);
+    else {
+        for (i = 0, p = kwd_list; *p; i++, p++)
+            if (rqd_kwds[i])
+                goto missing_kwarg;
     }
+
+    return 0;
+missing_kwarg:
+    PyErr_Format(PyExc_TypeError,
+        "required keyword argument '%s' is missing", *p);
     return -1;
 }
 """]