Cpp: Allow c++ classes to have multiple constructors

Cython/Compiler/ModuleNode.py

@@ -993,7 +993,8 @@ class ModuleNode(Nodes.Node, Nodes.BlockNode):
                 if attr.type.is_cfunction and attr.type.is_static_method:
                     code.put("static ")
                 elif attr.name == "<init>":
-                    constructor = attr
+                    #constructor = attr
+                    constructor = scope.lookup_here("<init>")
                 elif attr.name == "<del>":
                     destructor = attr
                 elif attr.type.is_cfunction:
@@ -1001,28 +1002,14 @@ class ModuleNode(Nodes.Node, Nodes.BlockNode):
                     has_virtual_methods = True
                 code.putln("%s;" % attr.type.declaration_code(attr.cname))
             is_implementing = 'init_module' in code.globalstate.parts
-            if constructor or py_attrs:
-                if constructor:
-                    arg_decls = []
-                    arg_names = []
-                    for arg in constructor.type.original_args[
-                            :len(constructor.type.args)-constructor.type.optional_arg_count]:
-                        arg_decls.append(arg.declaration_code())
-                        arg_names.append(arg.cname)
-                    if constructor.type.optional_arg_count:
-                        arg_decls.append(constructor.type.op_arg_struct.declaration_code(Naming.optional_args_cname))
-                        arg_names.append(Naming.optional_args_cname)
-                    if not arg_decls:
-                        arg_decls = ["void"]
-                else:
-                    arg_decls = ["void"]
-                    arg_names = []
+
+            def generate_cpp_constructor_code(arg_decls, arg_names, is_implementing, py_attrs, constructor):
                 if is_implementing:
                     code.putln("%s(%s) {" % (type.cname, ", ".join(arg_decls)))
                     if py_attrs:
                         code.put_ensure_gil()
                         for attr in py_attrs:
-                            code.put_init_var_to_py_none(attr, nanny=False)
+                            code.put_init_var_to_py_none(attr, nanny=False);
                     if constructor:
                         code.putln("%s(%s);" % (constructor.cname, ", ".join(arg_names)))
                     if py_attrs:
@@ -1030,6 +1017,28 @@ class ModuleNode(Nodes.Node, Nodes.BlockNode):
                     code.putln("}")
                 else:
                     code.putln("%s(%s);" % (type.cname, ", ".join(arg_decls)))
+
+            if constructor or py_attrs:
+                if constructor:
+                    for constructor_alternative in constructor.all_alternatives():
+                        arg_decls = []
+                        arg_names = []
+                        for arg in constructor_alternative.type.original_args[
+                                :len(constructor_alternative.type.args)-constructor_alternative.type.optional_arg_count]:
+                            arg_decls.append(arg.declaration_code())
+                            arg_names.append(arg.cname)
+                        if constructor_alternative.type.optional_arg_count:
+                            arg_decls.append(constructor_alternative.type.op_arg_struct.declaration_code(Naming.optional_args_cname))
+                            arg_names.append(Naming.optional_args_cname)
+                        if not arg_decls:
+                            default_constructor = True
+                            arg_decls = ["void"]
+                        generate_cpp_constructor_code(arg_decls, arg_names, is_implementing, py_attrs, constructor_alternative)
+                else:
+                    arg_decls = ["void"]
+                    arg_names = []
+                    generate_cpp_constructor_code(arg_decls, arg_names, is_implementing, py_attrs, constructor)
+
             if destructor or py_attrs or has_virtual_methods:
                 if has_virtual_methods:
                     code.put("virtual ")