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

{panda3d_interrogate-0.2.0 → panda3d_interrogate-0.4.0}/.github/workflows/release.yml

@@ -29,7 +29,7 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install build cibuildwheel==2.20.0
+        pip install build cibuildwheel==2.21.3
 
     - name: Build wheels
       run: python -m cibuildwheel

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: panda3d-interrogate
-Version: 0.2.0
+Version: 0.4.0
 Summary: Binding generator designed for Panda3D
 License: Copyright (c) 2008, Carnegie Mellon University.
         All rights reserved.

{panda3d_interrogate-0.2.0 → panda3d_interrogate-0.4.0}/cmake/macros/Python.cmake

@@ -58,9 +58,9 @@ function(add_python_target target)
 
   if(CMAKE_VERSION VERSION_LESS "3.26")
     add_library(${target} ${MODULE_TYPE} ${sources})
-    target_link_libraries(${target} PKG::PYTHON)
+    target_link_libraries(${target} PUBLIC PKG::PYTHON)
   else()
-    if(MODULE_TYPE STREQUAL "MODULE")
+    if(MODULE_TYPE STREQUAL "MODULE" AND NOT PYTHON_FREETHREADED)
       Python_add_library(${target} MODULE USE_SABI 3.3 ${sources})
     else()
       Python_add_library(${target} ${MODULE_TYPE} ${sources})
@@ -85,6 +85,7 @@ function(add_python_target target)
 
     if(PYTHON_ARCH_INSTALL_DIR)
       install(TARGETS ${target} EXPORT "${export}" COMPONENT "${component}" DESTINATION "${PYTHON_ARCH_INSTALL_DIR}${slash_namespace}")
+      install(FILES "${basename}.pyi" OPTIONAL COMPONENT "${component}" DESTINATION "${PYTHON_ARCH_INSTALL_DIR}${slash_namespace}")
     endif()
 
   else()

{panda3d_interrogate-0.2.0 → panda3d_interrogate-0.4.0}/cmake/scripts/ConcatenateToCXX.cmake

@@ -51,6 +51,9 @@ foreach(infile ${INPUT_FILES})
       break()
     endif()
 
+    # Replace newlines
+    string(REPLACE "0d0a" "0a" data "${data}")
+
     # Count the bytes we're adding
     string(LENGTH "${data}" strlen)
     math(EXPR byte_count "${byte_count} + (${strlen} / 2)")

{panda3d_interrogate-0.2.0 → panda3d_interrogate-0.4.0}/parser-inc/algorithm

@@ -25,7 +25,11 @@ namespace std {
   constexpr const T &min(const T &a, const T &b);
   template<class T>
   constexpr const T &max(const T &a, const T &b);
+
+  template<class RandomIt>
+  void sort(RandomIt first, RandomIt last);
+  template<class RandomIt, class Compare>
+  void sort(RandomIt first, RandomIt last, Compare comp);
 }
 
 #endif
-

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

@@ -6,7 +6,7 @@ build-backend = "scikit_build_core.build"
 
 [project]
 name = "panda3d-interrogate"
-version = "0.2.0"
+version = "0.4.0"
 description = "Binding generator designed for Panda3D"
 readme = "README.md"
 requires-python = ">=3.2"
@@ -39,26 +39,26 @@ interrogate = "python/interrogate"
 interrogate_module = "python/interrogate_module"
 
 [tool.cibuildwheel]
-build = "cp38-*"
+build = "cp38-* cp313t-*"
+free-threaded-support = true
 
 [tool.cibuildwheel.linux]
 repair-wheel-command = [
   "auditwheel repair -w {dest_dir} {wheel}",
-  "pip install -U abi3audit",
-  "abi3audit --strict --report {wheel}",
 ]
 
 [tool.cibuildwheel.macos]
 archs = ["universal2"]
 repair-wheel-command = [
   "cp {wheel} {dest_dir}",
-  "pip install -U abi3audit",
-  "abi3audit --strict --report {wheel}",
 ]
 
 [tool.cibuildwheel.windows]
 repair-wheel-command = [
   "copy {wheel} {dest_dir}",
-  "pip install -U abi3audit",
-  "pipx run abi3audit --strict --report {wheel}",
 ]
+
+[[tool.cibuildwheel.overrides]]
+select = "cp38-*"
+inherit.repair-wheel-command = "append"
+repair-wheel-command = "pipx run abi3audit --strict --report {wheel}"

{panda3d_interrogate-0.2.0 → panda3d_interrogate-0.4.0}/src/Config.cmake

@@ -83,6 +83,15 @@ if(Python_FOUND)
   set(PYTHON_INCLUDE_DIRS ${Python_INCLUDE_DIRS})
   set(PYTHON_LIBRARY_DIRS ${Python_LIBRARY_DIRS})
   set(PYTHON_VERSION_STRING ${Python_VERSION})
+
+  execute_process(COMMAND ${Python_EXECUTABLE}
+    -c "import sysconfig;print(sysconfig.get_config_var('Py_GIL_DISABLED') or 0)"
+    OUTPUT_VARIABLE PYTHON_FREETHREADED
+    OUTPUT_STRIP_TRAILING_WHITESPACE)
+  if(PYTHON_FREETHREADED)
+    # The free-threaded build has no stable ABI (yet).
+    set(_IMPORTED_AS Python::Module)
+  endif()
 endif()
 
 if(CMAKE_VERSION VERSION_LESS "3.15")
@@ -162,7 +171,15 @@ if(HAVE_PYTHON)
 
   endif()
 
-  if(CYGWIN)
+  if(PYTHON_FREETHREADED)
+    if(CYGWIN)
+      set(_EXT_SUFFIX ".${Python_SOABI}.dll")
+    elseif(WIN32)
+      set(_EXT_SUFFIX ".${Python_SOABI}.pyd")
+    else()
+      set(_EXT_SUFFIX ".${Python_SOABI}.so")
+    endif()
+  elseif(CYGWIN)
     set(_EXT_SUFFIX ".dll")
   elseif(WIN32)
     set(_EXT_SUFFIX ".pyd")

{panda3d_interrogate-0.2.0 → panda3d_interrogate-0.4.0}/src/interrogate/CMakeLists.txt

@@ -124,5 +124,5 @@ if(SKBUILD)
   install(TARGETS interrogate_module COMPONENT tools DESTINATION interrogate_module)
 else()
   install(TARGETS interrogate interrogate_module COMPONENT tools DESTINATION ${CMAKE_INSTALL_BINDIR})
-  install(FILES ${INTERROGATE_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d)
+  #install(FILES ${INTERROGATE_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/interrogate)
 endif()

{panda3d_interrogate-0.2.0 → panda3d_interrogate-0.4.0}/src/interrogate/interfaceMakerPythonNative.cxx

@@ -1760,14 +1760,38 @@ write_module_support(ostream &out, ostream *out_h, InterrogateModuleDef *def) {
 
   out << "  {nullptr, nullptr, 0, nullptr}\n" << "};\n\n";
 
+  if (!no_database) {
+    out << "static const InterrogateModuleDef _in_module_def = {\n"
+        << "  " << def->file_identifier << ",  /* file_identifier */\n"
+        << "  \"" << def->library_name << "\",  /* library_name */\n"
+        << "  \"" << def->library_hash_name << "\",  /* library_hash_name */\n"
+        << "  \"" << def->module_name << "\",  /* module_name */\n";
+    if (def->database_filename != nullptr) {
+      out << "  \"" << def->database_filename
+          << "\",  /* database_filename */\n";
+    } else {
+      out << "  (const char *)0,  /* database_filename */\n";
+    }
+
+    out << "  nullptr,  /* unique_names */\n"
+        << "  0,  /* num_unique_names */\n";
+    out << "  nullptr,  /* fptrs */\n"
+        << "  0,  /* num_fptrs */\n";
+    out << "  1,  /* first_index */\n"
+        << "  " << InterrogateDatabase::get_ptr()->get_next_index()
+        << "  /* next_index */\n"
+        << "};\n\n";
+  }
+
+  const char *def_ptr = no_database ? "nullptr" : "&_in_module_def";
   if (_external_imports.empty()) {
-    out << "extern const struct LibraryDef " << def->library_name << "_moddef = {python_simple_funcs, exports, nullptr};\n";
+    out << "extern const struct LibraryDef " << def->library_name << "_moddef = {python_simple_funcs, exports, nullptr, " << def_ptr << "};\n";
   } else {
     out <<
       "#ifdef LINK_ALL_STATIC\n"
-      "extern const struct LibraryDef " << def->library_name << "_moddef = {python_simple_funcs, exports, nullptr};\n"
+      "extern const struct LibraryDef " << def->library_name << "_moddef = {python_simple_funcs, exports, nullptr, " << def_ptr << "};\n"
       "#else\n"
-      "extern const struct LibraryDef " << def->library_name << "_moddef = {python_simple_funcs, exports, imports};\n"
+      "extern const struct LibraryDef " << def->library_name << "_moddef = {python_simple_funcs, exports, imports, " << def_ptr << "};\n"
       "#endif\n";
   }
   if (out_h != nullptr) {

{panda3d_interrogate-0.2.0 → panda3d_interrogate-0.4.0}/src/interrogate/interfaceMakerPythonSimple.cxx

@@ -48,10 +48,13 @@ InterfaceMakerPythonSimple::
  */
 void InterfaceMakerPythonSimple::
 write_includes(std::ostream &out) {
-  out << "#if PY_VERSION_HEX >= 0x30300000\n";
+  out << "#if PY_VERSION_HEX >= 0x30300000 && !defined(Py_GIL_DISABLED)\n";
   out << "#define Py_LIMITED_API 0x30300000\n";
   out << "#endif\n\n";
   InterfaceMakerPython::write_includes(out);
+  out << "\n#ifdef Py_GIL_DISABLED\n";
+  out << "static PyMutex mutex;\n";
+  out << "#endif\n\n";
 }
 
 /**
@@ -132,7 +135,11 @@ write_module(ostream &out,ostream *out_h, InterrogateModuleDef *def) {
 
       << "INIT_FUNC() {\n"
       << "#if PY_MAJOR_VERSION >= 3\n"
-      << "  return PyModule_Create(&python_simple_module);\n"
+      << "  PyObject *module = PyModule_Create(&python_simple_module);\n"
+      << "#ifdef Py_GIL_DISABLED\n"
+      << "  PyUnstable_Module_SetGIL(module, Py_MOD_GIL_NOT_USED);\n"
+      << "#endif\n"
+      << "  return module;\n"
       << "#else\n"
       << "  Py_InitModule(\"" << def->library_name << "\", python_simple_funcs);\n"
       << "#endif\n"
@@ -380,6 +387,9 @@ void InterfaceMakerPythonSimple::write_function_instance(ostream &out, Interface
         << "    }\n";
   }
 
+  out << "#ifdef Py_GIL_DISABLED\n";
+  out << "    PyMutex_Lock(&mutex);\n";
+  out << "#endif\n";
   if (track_interpreter) {
     out << "    in_interpreter = 0;\n";
   }
@@ -397,6 +407,9 @@ void InterfaceMakerPythonSimple::write_function_instance(ostream &out, Interface
     if (track_interpreter) {
       out << "    in_interpreter = 1;\n";
     }
+    out << "#ifdef Py_GIL_DISABLED\n";
+    out << "    PyMutex_Unlock(&mutex);\n";
+    out << "#endif\n";
     if (!extra_cleanup.empty()) {
       out << "   " << extra_cleanup << "\n";
     }
@@ -411,6 +424,9 @@ void InterfaceMakerPythonSimple::write_function_instance(ostream &out, Interface
       if (track_interpreter) {
         out << "    in_interpreter = 1;\n";
       }
+      out << "#ifdef Py_GIL_DISABLED\n";
+      out << "    PyMutex_Unlock(&mutex);\n";
+      out << "#endif\n";
       if (!extra_cleanup.empty()) {
         out << "   " << extra_cleanup << "\n";
       }
@@ -425,6 +441,9 @@ void InterfaceMakerPythonSimple::write_function_instance(ostream &out, Interface
       if (track_interpreter) {
         out << "    in_interpreter = 1;\n";
       }
+      out << "#ifdef Py_GIL_DISABLED\n";
+      out << "    PyMutex_Unlock(&mutex);\n";
+      out << "#endif\n";
       if (!extra_cleanup.empty()) {
         out << "   " << extra_cleanup << "\n";
       }

{panda3d_interrogate-0.2.0 → panda3d_interrogate-0.4.0}/src/interrogate/interrogateBuilder.cxx

@@ -508,6 +508,7 @@ write_code(ostream &out_code,ostream * out_include, InterrogateModuleDef *def) {
     out_code << "};\n\n";
   }
 
+#if 0
   if (!no_database) {
     // Now build the module definition structure to add ourselves to the
     // global interrogate database.
@@ -551,6 +552,7 @@ write_code(ostream &out_code,ostream * out_include, InterrogateModuleDef *def) {
         << "  interrogate_request_module(&_in_module_def);\n"
         << "}\n\n";
   }
+#endif
 }
 
 /**

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

@@ -158,9 +158,7 @@ static bool print_dependent_types(const string &lib1, const string &lib2) {
 }
 
 int write_python_table_native(std::ostream &out) {
-  out << "\n#include \"dtoolbase.h\"\n"
-      << "#include \"interrogate_request.h\"\n\n"
-      << "#include \"py_panda.h\"\n\n";
+  out << "#include \"py_panda.h\"\n\n";
 
   int count = 0;
 
@@ -298,10 +296,18 @@ int write_python_table_native(std::ostream &out) {
 
   out.put('\n');
 
+  out << "#if defined(_WIN32) && !defined(CPPPARSER) && !defined(LINK_ALL_STATIC)\n"
+      << "#define EXPORT_INIT_FUNC __declspec(dllexport)\n"
+      << "#elif __GNUC__ >= 4 && !defined(CPPPARSER) && !defined(LINK_ALL_STATIC)\n"
+      << "#define EXPORT_INIT_FUNC __attribute__((visibility(\"default\")))\n"
+      << "#else\n"
+      << "#define EXPORT_INIT_FUNC\n"
+      << "#endif\n\n";
+
   out << "#if PY_MAJOR_VERSION >= 3\n"
-      << "extern \"C\" EXPORT_CLASS PyObject *PyInit_" << library_name << "();\n"
+      << "extern \"C\" EXPORT_INIT_FUNC PyObject *PyInit_" << library_name << "();\n"
       << "#else\n"
-      << "extern \"C\" EXPORT_CLASS void init" << library_name << "();\n"
+      << "extern \"C\" EXPORT_INIT_FUNC void init" << library_name << "();\n"
       << "#endif\n";
 
   out << "\n"

{panda3d_interrogate-0.2.0 → panda3d_interrogate-0.4.0}/src/interrogatedb/CMakeLists.txt

@@ -42,9 +42,9 @@ target_link_libraries(interrogatedb dtoolutil)
 install(TARGETS interrogatedb
   DESTINATION ${CMAKE_INSTALL_LIBDIR}
   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-  INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d)
-install(FILES ${INTERROGATEDB_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d)
-install(FILES ${IGATERUNTIME_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d)
+  INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/interrogatedb)
+install(FILES ${INTERROGATEDB_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/interrogatedb)
+install(FILES ${IGATERUNTIME_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/interrogatedb)
 
 # ALSO: This has an Interrogate binding! Take care of that if we want it.
 # Note we don't use the regular Interrogate macros; this has some custom flags

panda3d_interrogate-0.4.0/src/interrogatedb/interrogatedb.pyi

@@ -0,0 +1,180 @@
+def interrogate_request_database(database_filename: str) -> None: ...
+def interrogate_request_module(def_: int) -> None: ...
+def interrogate_add_search_directory(dirname: str) -> None: ...
+def interrogate_add_search_path(pathstring: str) -> None: ...
+def interrogate_error_flag() -> bool: ...
+
+# Manifest Symbols
+def interrogate_number_of_manifests() -> int: ...
+def interrogate_get_manifest(n: int) -> int: ...
+def interrogate_get_manifest_by_name(manifest_name: str) -> int: ...
+def interrogate_manifest_name(manifest: int) -> str: ...
+def interrogate_manifest_definition(manifest: int) -> str: ...
+def interrogate_manifest_has_type(manifest: int) -> bool: ...
+def interrogate_manifest_get_type(manifest: int) -> int: ...
+def interrogate_manifest_has_getter(manifest: int) -> bool: ...
+def interrogate_manifest_getter(manifest: int) -> int: ...
+def interrogate_manifest_has_int_value(manifest: int) -> bool: ...
+def interrogate_manifest_get_int_value(manifest: int) -> int: ...
+
+# Data Elements
+def interrogate_element_name(element: int) -> str: ...
+def interrogate_element_scoped_name(element: int) -> str: ...
+def interrogate_element_has_comment(element: int) -> bool: ...
+def interrogate_element_comment(element: int) -> str: ...
+def interrogate_get_element_by_name(element_name: str) -> int: ...
+def interrogate_get_element_by_scoped_name(element_name: str) -> int: ...
+def interrogate_element_type(element: int) -> int: ...
+def interrogate_element_has_getter(element: int) -> bool: ...
+def interrogate_element_getter(element: int) -> int: ...
+def interrogate_element_has_setter(element: int) -> bool: ...
+def interrogate_element_setter(element: int) -> int: ...
+def interrogate_element_has_has_function(element: int) -> bool: ...
+def interrogate_element_has_function(element: int) -> int: ...
+def interrogate_element_has_clear_function(element: int) -> bool: ...
+def interrogate_element_clear_function(element: int) -> int: ...
+def interrogate_element_has_del_function(element: int) -> bool: ...
+def interrogate_element_del_function(element: int) -> int: ...
+def interrogate_element_has_insert_function(element: int) -> bool: ...
+def interrogate_element_insert_function(element: int) -> int: ...
+def interrogate_element_has_getkey_function(element: int) -> bool: ...
+def interrogate_element_getkey_function(element: int) -> int: ...
+def interrogate_element_length_function(element: int) -> int: ...
+def interrogate_element_is_sequence(element: int) -> bool: ...
+def interrogate_element_is_mapping(element: int) -> bool: ...
+
+# Global Data
+def interrogate_number_of_globals() -> int: ...
+def interrogate_get_global(n: int) -> int: ...
+
+# Functions
+def interrogate_number_of_global_functions() -> int: ...
+def interrogate_get_global_function(n: int) -> int: ...
+def interrogate_number_of_functions() -> int: ...
+def interrogate_get_function(n: int) -> int: ...
+def interrogate_function_name(function: int) -> str: ...
+def interrogate_function_scoped_name(function: int) -> str: ...
+def interrogate_function_has_comment(function: int) -> bool: ...
+def interrogate_function_comment(function: int) -> str: ...
+def interrogate_function_prototype(function: int) -> str: ...
+def interrogate_function_is_method(function: int) -> bool: ...
+def interrogate_function_class(function: int) -> int: ...
+def interrogate_function_is_unary_op(function: int) -> bool: ...
+def interrogate_function_is_operator_typecast(function: int) -> bool: ...
+def interrogate_function_is_constructor(function: int) -> bool: ...
+def interrogate_function_is_destructor(function: int) -> bool: ...
+def interrogate_function_has_module_name(function: int) -> bool: ...
+def interrogate_function_module_name(function: int) -> str: ...
+def interrogate_function_has_library_name(function: int) -> bool: ...
+def interrogate_function_library_name(function: int) -> str: ...
+def interrogate_function_is_virtual(function: int) -> bool: ...
+def interrogate_function_number_of_c_wrappers(function: int) -> int: ...
+def interrogate_function_c_wrapper(function: int, n: int) -> int: ...
+def interrogate_function_number_of_python_wrappers(function: int) -> int: ...
+def interrogate_function_python_wrapper(function: int, n: int) -> int: ...
+
+# Function Wrappers
+def interrogate_wrapper_name(wrapper: int) -> str: ...
+def interrogate_wrapper_function(wrapper: int) -> int: ...
+def interrogate_wrapper_is_callable_by_name(wrapper: int) -> bool: ...
+def interrogate_wrapper_is_copy_constructor(wrapper: int) -> bool: ...
+def interrogate_wrapper_is_coerce_constructor(wrapper: int) -> bool: ...
+def interrogate_wrapper_is_extension(wrapper: int) -> bool: ...
+def interrogate_wrapper_is_deprecated(wrapper: int) -> bool: ...
+def interrogate_wrapper_has_comment(wrapper: int) -> bool: ...
+def interrogate_wrapper_comment(wrapper: int) -> str: ...
+def interrogate_wrapper_has_return_value(wrapper: int) -> bool: ...
+def interrogate_wrapper_return_type(wrapper: int) -> int: ...
+def interrogate_wrapper_caller_manages_return_value(wrapper: int) -> bool: ...
+def interrogate_wrapper_return_value_destructor(wrapper: int) -> int: ...
+def interrogate_wrapper_number_of_parameters(wrapper: int) -> int: ...
+def interrogate_wrapper_parameter_type(wrapper: int, n: int) -> int: ...
+def interrogate_wrapper_parameter_has_name(wrapper: int, n: int) -> bool: ...
+def interrogate_wrapper_parameter_name(wrapper: int, n: int) -> str: ...
+def interrogate_wrapper_parameter_is_this(wrapper: int, n: int) -> bool: ...
+def interrogate_wrapper_parameter_is_optional(wrapper: int, n: int) -> bool: ...
+def interrogate_wrapper_has_pointer(wrapper: int) -> bool: ...
+def interrogate_wrapper_pointer(wrapper: int) -> None: ...
+def interrogate_wrapper_unique_name(wrapper: int) -> str: ...
+def interrogate_get_wrapper_by_unique_name(unique_name: str) -> int: ...
+
+# MakeSeqs
+def interrogate_make_seq_seq_name(make_seq: int) -> str: ...
+def interrogate_make_seq_scoped_name(make_seq: int) -> str: ...
+def interrogate_make_seq_has_comment(make_seq: int) -> bool: ...
+def interrogate_make_seq_comment(make_seq: int) -> str: ...
+def interrogate_make_seq_num_name(make_seq: int) -> str: ...
+def interrogate_make_seq_element_name(make_seq: int) -> str: ...
+def interrogate_make_seq_num_getter(make_seq: int) -> int: ...
+def interrogate_make_seq_element_getter(make_seq: int) -> int: ...
+
+# Types
+def interrogate_number_of_global_types() -> int: ...
+def interrogate_get_global_type(n: int) -> int: ...
+def interrogate_number_of_types() -> int: ...
+def interrogate_get_type(n: int) -> int: ...
+def interrogate_get_type_by_name(type_name: str) -> int: ...
+def interrogate_get_type_by_scoped_name(type_name: str) -> int: ...
+def interrogate_get_type_by_true_name(type_name: str) -> int: ...
+def interrogate_type_is_global(type: int) -> bool: ...
+def interrogate_type_is_deprecated(type: int) -> bool: ...
+def interrogate_type_name(type: int) -> str: ...
+def interrogate_type_scoped_name(type: int) -> str: ...
+def interrogate_type_true_name(type: int) -> str: ...
+def interrogate_type_is_nested(type: int) -> bool: ...
+def interrogate_type_outer_class(type: int) -> int: ...
+def interrogate_type_has_comment(type: int) -> bool: ...
+def interrogate_type_comment(type: int) -> str: ...
+def interrogate_type_has_module_name(type: int) -> bool: ...
+def interrogate_type_module_name(type: int) -> str: ...
+def interrogate_type_has_library_name(type: int) -> bool: ...
+def interrogate_type_library_name(type: int) -> str: ...
+def interrogate_type_is_atomic(type: int) -> bool: ...
+def interrogate_type_atomic_token(type: int) -> int: ...
+def interrogate_type_is_unsigned(type: int) -> bool: ...
+def interrogate_type_is_signed(type: int) -> bool: ...
+def interrogate_type_is_long(type: int) -> bool: ...
+def interrogate_type_is_longlong(type: int) -> bool: ...
+def interrogate_type_is_short(type: int) -> bool: ...
+def interrogate_type_is_wrapped(type: int) -> bool: ...
+def interrogate_type_is_pointer(type: int) -> bool: ...
+def interrogate_type_is_const(type: int) -> bool: ...
+def interrogate_type_is_typedef(type: int) -> bool: ...
+def interrogate_type_wrapped_type(type: int) -> int: ...
+def interrogate_type_is_array(type: int) -> bool: ...
+def interrogate_type_array_size(type: int) -> int: ...
+def interrogate_type_is_enum(type: int) -> bool: ...
+def interrogate_type_is_scoped_enum(type: int) -> bool: ...
+def interrogate_type_number_of_enum_values(type: int) -> int: ...
+def interrogate_type_enum_value_name(type: int, n: int) -> str: ...
+def interrogate_type_enum_value_scoped_name(type: int, n: int) -> str: ...
+def interrogate_type_enum_value_comment(type: int, n: int) -> str: ...
+def interrogate_type_enum_value(type: int, n: int) -> int: ...
+def interrogate_type_is_struct(type: int) -> bool: ...
+def interrogate_type_is_class(type: int) -> bool: ...
+def interrogate_type_is_union(type: int) -> bool: ...
+def interrogate_type_is_fully_defined(type: int) -> bool: ...
+def interrogate_type_is_unpublished(type: int) -> bool: ...
+def interrogate_type_number_of_constructors(type: int) -> int: ...
+def interrogate_type_get_constructor(type: int, n: int) -> int: ...
+def interrogate_type_has_destructor(type: int) -> bool: ...
+def interrogate_type_destructor_is_inherited(type: int) -> bool: ...
+def interrogate_type_get_destructor(type: int) -> int: ...
+def interrogate_type_number_of_elements(type: int) -> int: ...
+def interrogate_type_get_element(type: int, n: int) -> int: ...
+def interrogate_type_number_of_methods(type: int) -> int: ...
+def interrogate_type_get_method(type: int, n: int) -> int: ...
+def interrogate_type_number_of_make_seqs(type: int) -> int: ...
+def interrogate_type_get_make_seq(type: int, n: int) -> int: ...
+def interrogate_type_number_of_casts(type: int) -> int: ...
+def interrogate_type_get_cast(type: int, n: int) -> int: ...
+def interrogate_type_number_of_derivations(type: int) -> int: ...
+def interrogate_type_get_derivation(type: int, n: int) -> int: ...
+def interrogate_type_is_final(type: int) -> bool: ...
+def interrogate_type_derivation_has_upcast(type: int, n: int) -> bool: ...
+def interrogate_type_get_upcast(type: int, n: int) -> int: ...
+def interrogate_type_derivation_downcast_is_impossible(type: int, n: int) -> bool: ...
+def interrogate_type_derivation_has_downcast(type: int, n: int) -> bool: ...
+def interrogate_type_get_downcast(type: int, n: int) -> int: ...
+def interrogate_type_number_of_nested_types(type: int) -> int: ...
+def interrogate_type_get_nested_type(type: int, n: int) -> int: ...

{panda3d_interrogate-0.2.0 → panda3d_interrogate-0.4.0}/src/interrogatedb/py_compat.h

@@ -65,7 +65,7 @@ typedef int Py_ssize_t;
 
 /* Python 2.6 */
 
-#ifndef Py_TYPE
+#if PY_VERSION_HEX < 0x02060000
 #  define Py_TYPE(ob) (((PyObject*)(ob))->ob_type)
 #endif
 
@@ -221,8 +221,12 @@ INLINE PyObject *_PyLong_Lshift(PyObject *a, size_t shiftby) {
 
 /* Python 3.9 */
 
+#if PY_VERSION_HEX < 0x030900A4 && !defined(Py_IS_TYPE)
+#  define Py_IS_TYPE(ob, type) (Py_TYPE((PyObject *)ob) == type)
+#endif
+
 #ifndef PyCFunction_CheckExact
-#  define PyCFunction_CheckExact(op) (Py_TYPE(op) == &PyCFunction_Type)
+#  define PyCFunction_CheckExact(op) (Py_IS_TYPE(op, &PyCFunction_Type))
 #endif
 
 #if PY_VERSION_HEX < 0x03090000

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

@@ -5,7 +5,6 @@
  */
 
 #include "py_panda.h"
-#include "config_interrogatedb.h"
 #include "executionEnvironment.h"
 
 #ifdef HAVE_PYTHON
@@ -321,7 +320,7 @@ static PyObject *Dtool_EnumType_New(PyTypeObject *subtype, PyObject *args, PyObj
                         subtype->tp_name);
   }
 
-  if (Py_TYPE(arg) == subtype) {
+  if (Py_IS_TYPE(arg, subtype)) {
     return Py_NewRef(arg);
   }
 
@@ -701,17 +700,17 @@ PyObject *Dtool_PyModuleInitHelper(const LibraryDef *defs[], const char *modulen
   // 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()) {
+    /*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) {
-        interrogatedb_cat.warning() << "Unable to import __main__\n";
+        std::cerr << "Warning: unable to import __main__\n";
       }
 
       // Extract the __file__ attribute, if present.
@@ -743,7 +742,7 @@ PyObject *Dtool_PyModuleInitHelper(const LibraryDef *defs[], const char *modulen
         }
 #endif
         else {
-          interrogatedb_cat.warning() << "Invalid string for __main__.__file__\n";
+          std::cerr << "Invalid string for __main__.__file__\n";
         }
       }
       ExecutionEnvironment::shadow_environment_variable("MAIN_DIR", main_dir.to_os_specific());

{panda3d_interrogate-0.2.0 → panda3d_interrogate-0.4.0}/src/interrogatedb/py_panda.h

@@ -12,6 +12,7 @@
 #include "pnotify.h"
 #include "vector_uchar.h"
 #include "register_type.h"
+#include "interrogate_request.h"
 
 #if defined(HAVE_PYTHON) && !defined(CPPPARSER)
 
@@ -338,6 +339,7 @@ struct LibraryDef {
   PyMethodDef *const _methods;
   const Dtool_TypeDef *const _types;
   Dtool_TypeDef *const _external_types;
+  const InterrogateModuleDef *const _module_def;
 };
 
 #if PY_MAJOR_VERSION >= 3