panda3d-interrogate 0.4.0__tar.gz → 0.6.0__tar.gz

{panda3d_interrogate-0.4.0 → panda3d_interrogate-0.6.0}/PKG-INFO

@@ -1,37 +1,38 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: panda3d-interrogate
-Version: 0.4.0
+Version: 0.6.0
 Summary: Binding generator designed for Panda3D
 License: Copyright (c) 2008, Carnegie Mellon University.
-        All rights reserved.
-        
-        Redistribution and use in source and binary forms, with or without
-        modification, are permitted provided that the following conditions
-        are met:
-        
-        1. Redistributions of source code must retain the above copyright
-           notice, this list of conditions and the following disclaimer.
-        2. Redistributions in binary form must reproduce the above copyright
-           notice, this list of conditions and the following disclaimer in the
-           documentation and/or other materials provided with the distribution.
-        3. Neither the name of Carnegie Mellon University nor the names of
-           other contributors may be used to endorse or promote products
-           derived from this software without specific prior written
-           permission.
-        
-        THIS SOFTWARE IS PROVIDED BY THE AUTHORS "AS IS" AND ANY EXPRESS OR
-        IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-        OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-        IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-        INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-        NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-        DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-        THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-        (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-        THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-        
-        (This is the Modified BSD License.  See also
-        http://www.opensource.org/licenses/bsd-license.php )
+         All rights reserved.
+         
+         Redistribution and use in source and binary forms, with or without
+         modification, are permitted provided that the following conditions
+         are met:
+         
+         1. Redistributions of source code must retain the above copyright
+            notice, this list of conditions and the following disclaimer.
+         2. Redistributions in binary form must reproduce the above copyright
+            notice, this list of conditions and the following disclaimer in the
+            documentation and/or other materials provided with the distribution.
+         3. Neither the name of Carnegie Mellon University nor the names of
+            other contributors may be used to endorse or promote products
+            derived from this software without specific prior written
+            permission.
+         
+         THIS SOFTWARE IS PROVIDED BY THE AUTHORS "AS IS" AND ANY EXPRESS OR
+         IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+         OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+         IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+         INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+         NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+         DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+         THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+         (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+         THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+         
+         (This is the Modified BSD License.  See also
+         http://www.opensource.org/licenses/bsd-license.php )
+         
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: BSD License

panda3d_interrogate-0.6.0/cmake/scripts/CompareCommand.cmake

@@ -0,0 +1,42 @@
+cmake_policy(PUSH)
+cmake_policy(SET CMP0007 NEW)
+cmake_policy(SET CMP0121 NEW)
+
+if(NOT DEFINED OUTPUT_FILE OR NOT DEFINED EXPECTED_FILE OR NOT DEFINED COMMAND)
+  message(FATAL_ERROR "Usage: cmake -DOUTPUT_FILE=... -DEXPECTED_FILE=... -DCOMMAND=\"cmd args\" -P CompareCommand.cmake")
+endif()
+
+# Run the command, capturing output
+separate_arguments(COMMAND_LIST UNIX_COMMAND "${COMMAND}")
+set(ENV{SOURCE_DATE_EPOCH} 0)
+execute_process(COMMAND ${COMMAND_LIST}
+  RESULT_VARIABLE run_result
+  OUTPUT_FILE "${OUTPUT_FILE}"
+)
+if(NOT run_result EQUAL 0)
+  message(FATAL_ERROR "Command failed (${run_result}): ${COMMAND}")
+endif()
+
+# Compare files
+execute_process(
+  COMMAND ${CMAKE_COMMAND} -E compare_files "${OUTPUT_FILE}" "${EXPECTED_FILE}"
+  RESULT_VARIABLE cmp_result
+)
+
+if(NOT cmp_result EQUAL 0)
+  if(WIN32)
+    message(WARNING "Files differ (no diff available on Windows).")
+  else()
+    # Show unified diff on Unix-like systems
+    execute_process(
+      COMMAND diff -u "${EXPECTED_FILE}" "${OUTPUT_FILE}"
+      RESULT_VARIABLE diff_result
+      OUTPUT_VARIABLE diff_out
+      ERROR_VARIABLE diff_err
+    )
+    message("${diff_out}${diff_err}")
+  endif()
+  message(FATAL_ERROR "Test failed: ${OUTPUT_FILE} differs from ${EXPECTED_FILE}")
+endif()
+
+cmake_policy(POP)

{panda3d_interrogate-0.4.0 → panda3d_interrogate-0.6.0}/pyproject.toml

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

{panda3d_interrogate-0.4.0 → panda3d_interrogate-0.6.0}/src/cppparser/cppReferenceType.cxx

@@ -195,7 +195,7 @@ is_copy_constructible() const {
  */
 bool CPPReferenceType::
 is_destructible() const {
-  return false;
+  return true;
 }
 
 /**

{panda3d_interrogate-0.4.0 → panda3d_interrogate-0.6.0}/src/dtoolutil/string_utils.h

@@ -17,6 +17,7 @@
 #include "dtoolbase.h"
 
 #include <string>
+#include <cstdint>
 #include "vector_string.h"
 #include "pdtoa.h"
 

{panda3d_interrogate-0.4.0 → panda3d_interrogate-0.6.0}/src/dtoolutil/textEncoder.cxx

@@ -14,6 +14,7 @@
 #include "textEncoder.h"
 #include "stringDecoder.h"
 #include "unicodeLatinMap.h"
+#include <cstdint>
 
 using std::istream;
 using std::ostream;

{panda3d_interrogate-0.4.0 → panda3d_interrogate-0.6.0}/src/interrogate/interfaceMaker.cxx

@@ -627,6 +627,11 @@ record_function(const InterrogateType &itype, FunctionIndex func_index) {
           func->_flags |= remap->_flags;
           func->_args_type = (ArgsType)((int)func->_args_type | (int)remap->_args_type);
 
+          if (remap->_ForcedVoidReturn) {
+            // We don't generate wrappers if we don't understand the return type.
+            continue;
+          }
+
           // Make a wrapper for the function.
           FunctionWrapperIndex wrapper_index =
             remap->make_wrapper_entry(func_index);

{panda3d_interrogate-0.4.0 → panda3d_interrogate-0.6.0}/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";
 

{panda3d_interrogate-0.4.0 → panda3d_interrogate-0.6.0}/src/interrogate/interrogate_module.cxx

@@ -43,6 +43,7 @@ bool build_python_wrappers = false;
 bool build_python_native_wrappers = false;
 bool track_interpreter = false;
 vector_string imports;
+vector_string init_funcs;
 
 // Short command-line options.
 static const char *short_options = "";
@@ -57,6 +58,7 @@ enum CommandOptions {
   CO_python_native,
   CO_track_interpreter,
   CO_import,
+  CO_init,
 };
 
 static struct option long_options[] = {
@@ -68,6 +70,7 @@ static struct option long_options[] = {
   { "python-native", no_argument, nullptr, CO_python_native },
   { "track-interpreter", no_argument, nullptr, CO_track_interpreter },
   { "import", required_argument, nullptr, CO_import },
+  { "init", required_argument, nullptr, CO_init },
   { nullptr }
 };
 
@@ -286,6 +289,10 @@ int write_python_table_native(std::ostream &out) {
     }
   }
 
+  for (auto &init : init_funcs) {
+    out << "extern \"C\" void " << init << "();\n";
+  }
+
   vector_string::const_iterator ii;
   for (ii = libraries.begin(); ii != libraries.end(); ++ii) {
     printf("Referencing Library %s\n", (*ii).c_str());
@@ -347,6 +354,10 @@ int write_python_table_native(std::ostream &out) {
       << "  PyObject *module = Dtool_PyModuleInitHelper(defs, &py_" << library_name << "_module);\n"
       << "  if (module != nullptr) {\n";
 
+  for (auto &init : init_funcs) {
+    out << "    " << init << "();\n";
+  }
+
   for (ii = libraries.begin(); ii != libraries.end(); ii++) {
     out << "    Dtool_" << *ii << "_BuildInstants(module);\n";
   }
@@ -383,6 +394,10 @@ int write_python_table_native(std::ostream &out) {
       << "  PyObject *module = Dtool_PyModuleInitHelper(defs, \"" << module_name << "\");\n"
       << "  if (module != nullptr) {\n";
 
+  for (auto &init : init_funcs) {
+    out << "    " << init << "();\n";
+  }
+
   for (ii = libraries.begin(); ii != libraries.end(); ii++) {
     out << "    Dtool_" << *ii << "_BuildInstants(module);\n";
   }
@@ -554,6 +569,10 @@ int main(int argc, char *argv[]) {
       imports.push_back(optarg);
       break;
 
+    case CO_init:
+      init_funcs.push_back(optarg);
+      break;
+
     default:
       exit(1);
     }

{panda3d_interrogate-0.4.0 → panda3d_interrogate-0.6.0}/src/interrogatedb/interrogateFunctionWrapper.cxx

@@ -74,6 +74,7 @@ input(istream &in) {
  */
 void InterrogateFunctionWrapper::
 remap_indices(const IndexRemapper &remap) {
+  _function = remap.map_from(_function);
   _return_value_destructor = remap.map_from(_return_value_destructor);
   _return_type = remap.map_from(_return_type);
 

{panda3d_interrogate-0.4.0 → panda3d_interrogate-0.6.0}/src/interrogatedb/py_panda.cxx

@@ -5,7 +5,6 @@
  */
 
 #include "py_panda.h"
-#include "executionEnvironment.h"
 
 #ifdef HAVE_PYTHON
 
@@ -210,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>
  *
@@ -696,66 +713,6 @@ PyObject *Dtool_PyModuleInitHelper(const LibraryDef *defs[], const char *modulen
 #endif
   }
 
-  // MAIN_DIR needs to be set very early; this seems like a convenient place
-  // to do that.  Perhaps we'll find a better place for this in the future.
-  static bool initialized_main_dir = false;
-  if (!initialized_main_dir) {
-    /*if (interrogatedb_cat.is_debug()) {
-      // Good opportunity to print this out once, at startup.
-      interrogatedb_cat.debug()
-        << "Python " << version << "\n";
-    }*/
-
-    if (!ExecutionEnvironment::has_environment_variable("MAIN_DIR")) {
-      // Grab the __main__ module.
-      PyObject *main_module = PyImport_ImportModule("__main__");
-      if (main_module == NULL) {
-        std::cerr << "Warning: unable to import __main__\n";
-      }
-
-      // Extract the __file__ attribute, if present.
-      Filename main_dir;
-      PyObject *file_attr = nullptr;
-      if (main_module != nullptr) {
-        file_attr = PyObject_GetAttrString(main_module, "__file__");
-      }
-      if (file_attr == nullptr) {
-        // Must be running in the interactive interpreter.  Use the CWD.
-        main_dir = ExecutionEnvironment::get_cwd();
-      } else {
-#if PY_MAJOR_VERSION >= 3
-        Py_ssize_t length;
-        wchar_t *buffer = PyUnicode_AsWideCharString(file_attr, &length);
-        if (buffer != nullptr) {
-          main_dir = Filename::from_os_specific_w(std::wstring(buffer, length));
-          main_dir.make_absolute();
-          main_dir = main_dir.get_dirname();
-          PyMem_Free(buffer);
-        }
-#else
-        char *buffer;
-        Py_ssize_t length;
-        if (PyString_AsStringAndSize(file_attr, &buffer, &length) != -1) {
-          main_dir = Filename::from_os_specific(std::string(buffer, length));
-          main_dir.make_absolute();
-          main_dir = main_dir.get_dirname();
-        }
-#endif
-        else {
-          std::cerr << "Invalid string for __main__.__file__\n";
-        }
-      }
-      ExecutionEnvironment::shadow_environment_variable("MAIN_DIR", main_dir.to_os_specific());
-      PyErr_Clear();
-    }
-    initialized_main_dir = true;
-
-    // Also, while we are at it, initialize the thread swap hook.
-#if defined(HAVE_THREADS) && defined(SIMPLE_THREADS)
-    global_thread_state_swap = PyThreadState_Swap;
-#endif
-  }
-
   PyModule_AddIntConstant(module, "Dtool_PyNativeInterface", 1);
   return module;
 }

{panda3d_interrogate-0.4.0 → panda3d_interrogate-0.6.0}/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);