Merge pull request #5754 from InsightSoftwareConsortium/swig-generation-minor-refinements

swig generation minor refinements

Author: hjmjohnson

Wrapping/Generators/Python/PyBase/pyBase.i

@@ -34,7 +34,7 @@ from . import _ITKCommonPython
 %include <std_set.i>
 
 // must be included in the end to avoid wrong std::string typemaps
-%include std_iostream.i
+%include <std_iostream.i>
 
 // let str be usable as a template parameter instead of std::string
 %pythoncode {

Wrapping/Generators/SwigInterface/igenerator.py

@@ -492,6 +492,7 @@ def create_idxfile(self, idx_file_path: str, wrappers_namespace):
 class SwigInputGenerator:
     """Generates a swig input .i file for an ITK module."""
 
+    previously_created_constructors_set = set()
     notWrapped = [
         r"std::_Deque_alloc<.+>",
         r"itk::AtomicInt<.+>",
@@ -1070,13 +1071,16 @@ def generate_class(self, typedef, indent=0):
                 w = access not in self.options.access_warnings
 
                 # iterate over the members
-                for member in get_type(typedef).get_members(access=access):
+                all_members = list(get_type(typedef).get_members(access=access))
+                for member in all_members:
                     if isinstance(member, decls.typedef.typedef_t):
                         self.warn(
                             51, f"Member typedef are not supported: {member.name}", w
                         )
                     elif isinstance(member, decls.member_function_t):
-                        self.generate_method(typedef, member, indent, w)
+                        self.generate_method(
+                            typedef, member, indent, w, is_operator=False
+                        )
                     elif isinstance(member, decls.constructor_t):
                         self.generate_constructor(typedef, member, indent, w)
                     elif isinstance(member, decls.member_operator_t):
@@ -1298,6 +1302,14 @@ def generate_constructor(self, typedef, constructor, indent, w):
             #     f"(Perhaps RValueReferenceType argument move constructor): {constructor_declaration_str}"
             # )
             return
+        if constructor_declaration_str in self.previously_created_constructors_set:
+            # print(
+            #     "WARNING: Duplicate constructor attempted to be written: "
+            #     f"{constructor_declaration_str} for {typedef.name}"
+            # )
+            return
+
+        self.previously_created_constructors_set.add(constructor_declaration_str)
         self.outputFile.write("  " * indent)
         self.outputFile.write(constructor_declaration_str)
 
@@ -1333,7 +1345,7 @@ def generate_nested_enum(self, _typedef, enum, indent, _w):
             python_enum_names = [f"{enum.name}_{name.strip()}" for name in content]
             self.classes[self.current_class].enums += python_enum_names
 
-    def generate_method(self, typedef, method, indent, w, is_operator=False):
+    def generate_method(self, typedef, method, indent, w, is_operator):
         self.info(f"Generating interface for method  '{typedef.name}::{method.name}'.")
         # avoid the apply method for the class vnl_c_vector: the signature is
         # quite strange and currently confuse swig :-/