Merge remote-tracking branch 'remotes/origin/0.17'

Cython/Compiler/Nodes.py

@@ -726,7 +726,13 @@ class CArgDeclNode(Node):
             # We fix that here.
             if isinstance(self.declarator, CNameDeclaratorNode) and self.declarator.name == '':
                 if nonempty:
-                    self.declarator.name = self.base_type.name
+                    if self.base_type.is_basic_c_type:
+                        # char, short, long called "int"
+                        type = self.base_type.analyse(env, could_be_name = True)
+                        arg_name = type.declaration_code("")
+                    else:
+                        arg_name = self.base_type.name
+                    self.declarator.name = EncodedString(arg_name)
                     self.base_type.name = None
                     self.base_type.is_basic_c_type = False
                 could_be_name = True
@@ -870,7 +876,7 @@ class CSimpleBaseTypeNode(CBaseTypeNode):
                     ##     type = Builtin.type_type
                     else:
                         type = py_object_type
-                    self.arg_name = self.name
+                    self.arg_name = EncodedString(self.name)
                 else:
                     if self.templates:
                         if not self.name in self.templates:

tests/run/cpp_nested_classes.pyx

 # tag: cpp
 
-cdef extern from "cpp_nested_classes_support.cpp":
+cdef extern from "cpp_nested_classes_support.h":
     cdef cppclass A:
         cppclass B:
             int square(int)

tests/run/empty_declarators.pyx

+cpdef zed(short, long, complex, x):
+    """
+    >>> zed(short=1, long=2, complex=3, x=4)
+    (1, 2, 3, 4)
+    """
+    return short, long, complex, x