Fix directed method returning class without default ctor

This wasn't working for Go, Ocaml, Octave, PHP, Python or Ruby. Fixes #1145
swig · Jun 19, 2024 · 7424c0f · 7424c0f
1 parent 1e2b0b8
commit 7424c0f
Show file tree

Hide file tree

Showing 8 changed files with 57 additions and 8 deletions.
diff --git a/Examples/test-suite/director_classes.i b/Examples/test-suite/director_classes.i
@@ -33,7 +33,7 @@ bool PrintDebug = false;
 
 struct DoubleHolder
 {
-  DoubleHolder(double v = 0.0) : val(v) {}
+  DoubleHolder(double v) : val(v) {}
   double val;
 };
 

diff --git a/Source/Modules/go.cxx b/Source/Modules/go.cxx
@@ -4017,7 +4017,14 @@ class GO:public Language {
 	    Wrapper_add_localv(w, "c_result", SwigType_lstr(result, "c_result"), "= 0", NIL);
 	  }
 	} else {
-	  String *cres = SwigType_lstr(result, "c_result");
+	  String *cres;
+	  SwigType *vt = cplus_value_type(result);
+	  if (!vt) {
+	    cres = SwigType_lstr(result, "c_result");
+	  } else {
+	    cres = SwigType_lstr(vt, "c_result");
+	    Delete(vt);
+	  }
 	  Printf(w->code, "%s;\n", cres);
 	  Delete(cres);
 	}

diff --git a/Source/Modules/ocaml.cxx b/Source/Modules/ocaml.cxx
@@ -1450,7 +1450,14 @@ class OCAML:public Language {
 	  Wrapper_add_localv(w, "c_result", SwigType_lstr(returntype, "c_result"), "= 0", NIL);
 	}
       } else {
-	String *cres = SwigType_lstr(returntype, "c_result");
+	String *cres;
+	SwigType *vt = cplus_value_type(returntype);
+	if (!vt) {
+	  cres = SwigType_lstr(returntype, "c_result");
+	} else {
+	  cres = SwigType_lstr(vt, "c_result");
+	  Delete(vt);
+	}
 	Printf(w->code, "%s;\n", cres);
 	Delete(cres);
       }

diff --git a/Source/Modules/octave.cxx b/Source/Modules/octave.cxx
@@ -1368,7 +1368,14 @@ class OCTAVE:public Language {
 	  Wrapper_add_localv(w, "c_result", SwigType_lstr(returntype, "c_result"), "= 0", NIL);
 	}
       } else {
-	String *cres = SwigType_lstr(returntype, "c_result");
+	String *cres;
+	SwigType *vt = cplus_value_type(returntype);
+	if (!vt) {
+	  cres = SwigType_lstr(returntype, "c_result");
+	} else {
+	  cres = SwigType_lstr(vt, "c_result");
+	  Delete(vt);
+	}
 	Printf(w->code, "%s;\n", cres);
 	Delete(cres);
       }

diff --git a/Source/Modules/perl5.cxx b/Source/Modules/perl5.cxx
@@ -2121,7 +2121,14 @@ class PERL5:public Language {
 	  Wrapper_add_localv(w, "c_result", SwigType_lstr(returntype, "c_result"), "= 0", NIL);
 	}
       } else {
-	String *cres = SwigType_lstr(returntype, "c_result");
+	String *cres;
+	SwigType *vt = cplus_value_type(returntype);
+	if (!vt) {
+	  cres = SwigType_lstr(returntype, "c_result");
+	} else {
+	  cres = SwigType_lstr(vt, "c_result");
+	  Delete(vt);
+	}
 	Printf(w->code, "%s;\n", cres);
 	Delete(cres);
       }

diff --git a/Source/Modules/php.cxx b/Source/Modules/php.cxx
@@ -2327,7 +2327,14 @@ class PHP : public Language {
 	  Wrapper_add_localv(w, "c_result", SwigType_lstr(returntype, "c_result"), "= 0", NIL);
 	}
       } else {
-	String *cres = SwigType_lstr(returntype, "c_result");
+	String *cres;
+	SwigType *vt = cplus_value_type(returntype);
+	if (!vt) {
+	  cres = SwigType_lstr(returntype, "c_result");
+	} else {
+	  cres = SwigType_lstr(vt, "c_result");
+	  Delete(vt);
+	}
 	Printf(w->code, "%s;\n", cres);
 	Delete(cres);
       }

diff --git a/Source/Modules/python.cxx b/Source/Modules/python.cxx
@@ -5403,7 +5403,14 @@ int PYTHON::classDirectorMethod(Node *n, Node *parent, String *super) {
 	Wrapper_add_localv(w, "c_result", SwigType_lstr(returntype, "c_result"), "= 0", NIL);
       }
     } else {
-      String *cres = SwigType_lstr(returntype, "c_result");
+      String *cres;
+      SwigType *vt = cplus_value_type(returntype);
+      if (!vt) {
+	cres = SwigType_lstr(returntype, "c_result");
+      } else {
+	cres = SwigType_lstr(vt, "c_result");
+	Delete(vt);
+      }
       Printf(w->code, "%s;\n", cres);
       Delete(cres);
     }

diff --git a/Source/Modules/ruby.cxx b/Source/Modules/ruby.cxx
@@ -3115,7 +3115,14 @@ class RUBY:public Language {
 	  Wrapper_add_localv(w, "c_result", SwigType_lstr(returntype, "c_result"), "= 0", NIL);
 	}
       } else {
-	String *cres = SwigType_lstr(returntype, "c_result");
+	String *cres;
+	SwigType *vt = cplus_value_type(returntype);
+	if (!vt) {
+	  cres = SwigType_lstr(returntype, "c_result");
+	} else {
+	  cres = SwigType_lstr(vt, "c_result");
+	  Delete(vt);
+	}
 	Printf(w->code, "%s;\n", cres);
 	Delete(cres);
       }