[sourcegen] Implement default constructors

include/cantera/equil/MultiPhase.h

@@ -677,9 +677,6 @@ private:
     mutable vector<double> m_elemAbundances;
 };
 
-//! Create a new empty MultiPhase object
-shared_ptr<MultiPhase> newMultiPhase();
-
 //! Function to output a MultiPhase description to a stream
 /*!
  *  Writes out a description of the contents of each phase of the

interfaces/sourcegen/sourcegen/_data/ctmix_auto.yaml

@@ -10,7 +10,6 @@ parents: []  # List of parent classes
 derived: []  # List of specializations
 recipes:
 - name: new
-  implements: newMultiPhase
 - name: addPhase
   implements: MultiPhase::addPhase(shared_ptr<ThermoPhase>, double)
 - name: init

interfaces/sourcegen/sourcegen/_data/ctrxn_auto.yaml

@@ -9,7 +9,7 @@ base: Reaction
 parents: []  # List of parent classes
 derived: []  # List of specializations
 recipes:
-#- name: new
+- name: new
 - name: equation  # previously: ctkin_getReactionString
 - name: type  # previously: ctkin_getReactionType
 - name: del

interfaces/sourcegen/sourcegen/clib/_CLibSourceGenerator.py

@@ -182,7 +182,10 @@ class CLibSourceGenerator(SourceGenerator):
         c_args = c_func.arglist
         cxx_func = c_func.implements
         if not cxx_func:
-            if len(c_args) and "char*" in c_args[-1].p_type:
+            if c_func.name.endswith("new"):
+                # Default constructor
+                cxx_func = CFunc("auto", f"make_shared<{base}>", ArgList([]), "", None)
+            elif len(c_args) and "char*" in c_args[-1].p_type:
                 cxx_func = CFunc("string", "dummy", ArgList([]), "", None, "", "base")
             else:
                 cxx_func = CFunc("void", "dummy", ArgList([]), "", None, "", "base")
@@ -199,7 +202,7 @@ class CLibSourceGenerator(SourceGenerator):
                 cxx_type = cxx_func.ret_type
 
                 # Handle output buffer
-                if "string" in cxx_type: # or cxx_func.name == "dummy":
+                if "string" in cxx_type:
                     buffer = ["string out",
                               f"copyString(out, {c_args[c_ix+1].name}, "
                               f"{c_args[c_ix].name});",
@@ -417,7 +420,11 @@ class CLibSourceGenerator(SourceGenerator):
             brief = cxx_func.brief
             args = prop_params + buffer_params
 
-        if cxx_func and not recipe.what:
+        if recipe.what and cxx_func:
+            # Recipe type and corresponding C++ function are known
+            pass
+
+        elif cxx_func:
             # Autodetection of CLib function purpose ("what")
             cxx_arglen = len(cxx_func.arglist)
             if not cxx_func.base:
@@ -441,27 +448,40 @@ class CLibSourceGenerator(SourceGenerator):
                      for base in [recipe.base] + recipe.parents + recipe.derived):
                 recipe.what = "method"
             else:
-                _LOGGER.critical("Unable to auto-detect function type.")
+                msg = f"Unable to auto-detect function type for recipe {recipe.name!r}."
+                _LOGGER.critical(msg)
                 exit(1)
 
-        elif recipe.name == "del" and not recipe.what:
-            recipe.what = "destructor"
-
-        if recipe.what in ["destructor", "noop"]:
-            # these function types don't have direct C++ equivalents
-            msg = f"   generating {func_name!r} -> {recipe.what}"
+        elif recipe.what == "noop":
+            # No operation
+            msg = f"   generating {func_name!r} -> no-operation"
             _LOGGER.debug(msg)
-            if recipe.what == "noop":
-                args = []
-                brief= "No operation."
-                ret_param = Param(
-                    "int", "", "Always zero.")
-            else:
-                args = [Param("int", "handle", f"Handle to {recipe.base} object.")]
-                brief= f"Delete {recipe.base} object."
-                ret_param = Param(
-                    "int", "", "Zero for success and -1 for exception handling.")
-            buffer_params = []
+            brief = "No operation."
+            ret_param = Param("int", "", "Always zero.")
+
+        elif recipe.name == "new":
+            # Default constructor
+            recipe.what = "constructor"
+            msg = f"   generating {func_name!r} -> default constructor"
+            _LOGGER.debug(msg)
+            brief= f"Instantiate {recipe.base} object using default constructor."
+            ret_param = Param(
+                "int", "", "Object handle if successful and -1 for exception handling.")
+
+        elif recipe.name == "del":
+            # Default destructor
+            recipe.what = "destructor"
+            msg = f"   generating {func_name!r} -> default destructor"
+            _LOGGER.debug(msg)
+            args = [Param("int", "handle", f"Handle to {recipe.base} object.")]
+            brief= f"Delete {recipe.base} object."
+            ret_param = Param(
+                "int", "", "Zero for success and -1 for exception handling.")
+
+        else:
+            msg = f"Unable to resolve recipe type for {recipe.name!r}"
+            _LOGGER.critical(msg)
+            exit(1)
 
         if recipe.brief:
             brief = recipe.brief

src/equil/MultiPhase.cpp

@@ -839,11 +839,6 @@ void MultiPhase::updatePhases() const
     }
 }
 
-shared_ptr<MultiPhase> newMultiPhase()
-{
-    return make_shared<MultiPhase>();
-}
-
 std::ostream& operator<<(std::ostream& s, MultiPhase& x)
 {
     x.updatePhases();