Slight optimization in code size / string table size

Use tail call and string formatting for "can't delete attribute"
exception

Author: rdb

pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "scikit_build_core.build"
 
 [project]
 name = "panda3d-interrogate"
-version = "0.5.0"
+version = "0.5.1"
 description = "Binding generator designed for Panda3D"
 readme = "README.md"
 requires-python = ">=3.2"

src/interrogate/interfaceMakerPythonNative.cxx

@@ -7355,12 +7355,7 @@ write_getset(ostream &out, Object *obj, Property *property) {
         }
         out << "    return 0;\n";
       } else {
-        out << "#ifdef NDEBUG\n"
-               "    Dtool_Raise_TypeError(\"can't delete attribute\");\n"
-               "#else\n"
-               "    Dtool_Raise_TypeError(\"can't delete " << ielem.get_name() << "[] attribute\");\n"
-               "#endif\n"
-               "    return -1;\n";
+        out << "    return Dtool_Raise_CantDeleteAttributeError(\"" << ielem.get_name() << "[]\");\n";
       }
       out << "  }\n";
 
@@ -7525,12 +7520,7 @@ write_getset(ostream &out, Object *obj, Property *property) {
           out << "    return -1;\n";
         }
       } else {
-        out << "#ifdef NDEBUG\n"
-               "    Dtool_Raise_TypeError(\"can't delete attribute\");\n"
-               "#else\n"
-               "    Dtool_Raise_TypeError(\"can't delete " << ielem.get_name() << "[] attribute\");\n"
-               "#endif\n"
-               "    return -1;\n";
+        out << "    return Dtool_Raise_CantDeleteAttributeError(\"" << ielem.get_name() << "[]\");\n";
       }
       out << "  }\n";
 
@@ -7763,12 +7753,7 @@ write_getset(ostream &out, Object *obj, Property *property) {
         out << "    " << cClassName << "::" << property->_deleter->_ifunc.get_name() << "();\n"
             << "    return 0;\n";
       } else {
-        out << "#ifdef NDEBUG\n"
-               "    Dtool_Raise_TypeError(\"can't delete attribute\");\n"
-               "#else\n"
-               "    Dtool_Raise_TypeError(\"can't delete " << ielem.get_name() << " attribute\");\n"
-               "#endif\n"
-               "    return -1;\n";
+        out << "    return Dtool_Raise_CantDeleteAttributeError(\"" << ielem.get_name() << "\");\n";
       }
       out << "  }\n";
 

src/interrogatedb/py_panda.cxx

@@ -209,6 +209,24 @@ PyObject *Dtool_Raise_AttributeError(PyObject *obj, const char *attribute) {
   return nullptr;
 }
 
+/**
+ * Raises a TypeError of the form: can't delete attr attribute
+ *
+ * Always returns -1 so that it can be conveniently used as a return
+ * expression for wrapper functions that return an int.
+ */
+int Dtool_Raise_CantDeleteAttributeError(const char *attribute) {
+#if PY_MAJOR_VERSION >= 3
+  PyObject *message = PyUnicode_FromFormat(
+#else
+  PyObject *message = PyString_FromFormat(
+#endif
+    "can't delete %s attribute", attribute);
+
+  PyErr_SetObject(PyExc_TypeError, message);
+  return -1;
+}
+
 /**
  * Raises a TypeError of the form: Arguments must match: <list of overloads>
  *

src/interrogatedb/py_panda.h

@@ -228,6 +228,7 @@ EXPCL_PYPANDA PyObject *Dtool_Raise_AssertionError();
 EXPCL_PYPANDA PyObject *Dtool_Raise_TypeError(const char *message);
 EXPCL_PYPANDA PyObject *Dtool_Raise_ArgTypeError(PyObject *obj, int param, const char *function_name, const char *type_name);
 EXPCL_PYPANDA PyObject *Dtool_Raise_AttributeError(PyObject *obj, const char *attribute);
+EXPCL_PYPANDA int Dtool_Raise_CantDeleteAttributeError(const char *attribute);
 
 EXPCL_PYPANDA PyObject *_Dtool_Raise_BadArgumentsError();
 EXPCL_PYPANDA PyObject *_Dtool_Raise_BadArgumentsError(const char *message);