瀏覽代碼

*** empty log message ***

David Rose 25 年之前
父節點
當前提交
7d8b112d6e

+ 31 - 1
dtool/metalibs/dtool/pydtool.cxx

@@ -1,6 +1,6 @@
 /*
 /*
  * This file generated by:
  * This file generated by:
- * interrogate -nodb -python -promiscuous -I /usr/local/dtool/include -module dtool -library libdtool -true-names -do-module -oc pydtool.cc interrogate_interface.h 
+ * interrogate -nodb -python -promiscuous -I /home/drose/player/dtool/include -module dtool -library libdtool -true-names -do-module -oc pydtool.cxx interrogate_interface.h 
  *
  *
  */
  */
 
 
@@ -965,6 +965,34 @@ _inPCPDJR9bU(PyObject *, PyObject *args) {
   return (PyObject *)NULL;
   return (PyObject *)NULL;
 }
 }
 
 
+/*
+ * Python wrapper for
+ * bool interrogate_type_has_module_name(int type);
+ */
+static PyObject *
+_inPCPDJPAqU(PyObject *, PyObject *args) {
+  int param0;
+  if (PyArg_ParseTuple(args, "i", &param0)) {
+    bool return_value = interrogate_type_has_module_name((int)param0);
+    return Py_BuildValue("i", (int)(return_value));
+  }
+  return (PyObject *)NULL;
+}
+
+/*
+ * Python wrapper for
+ * char const *interrogate_type_module_name(int type);
+ */
+static PyObject *
+_inPCPDJg4gH(PyObject *, PyObject *args) {
+  int param0;
+  if (PyArg_ParseTuple(args, "i", &param0)) {
+    char const *return_value = interrogate_type_module_name((int)param0);
+    return Py_BuildValue("s", return_value);
+  }
+  return (PyObject *)NULL;
+}
+
 /*
 /*
  * Python wrapper for
  * Python wrapper for
  * bool interrogate_type_is_atomic(int type);
  * bool interrogate_type_is_atomic(int type);
@@ -1595,6 +1623,7 @@ static PyMethodDef python_methods[] = {
   { "interrogate_number_of_globals", &_inPCPDJNQAC, METH_VARARGS },
   { "interrogate_number_of_globals", &_inPCPDJNQAC, METH_VARARGS },
   { "interrogate_type_derivation_downcast_is_impossible", &_inPCPDJN_Lp, METH_VARARGS },
   { "interrogate_type_derivation_downcast_is_impossible", &_inPCPDJN_Lp, METH_VARARGS },
   { "interrogate_type_get_cast", &_inPCPDJNxR0, METH_VARARGS },
   { "interrogate_type_get_cast", &_inPCPDJNxR0, METH_VARARGS },
+  { "interrogate_type_has_module_name", &_inPCPDJPAqU, METH_VARARGS },
   { "interrogate_type_get_constructor", &_inPCPDJP_f2, METH_VARARGS },
   { "interrogate_type_get_constructor", &_inPCPDJP_f2, METH_VARARGS },
   { "interrogate_type_is_longlong", &_inPCPDJPd3W, METH_VARARGS },
   { "interrogate_type_is_longlong", &_inPCPDJPd3W, METH_VARARGS },
   { "interrogate_wrapper_caller_manages_return_value", &_inPCPDJPhA0, METH_VARARGS },
   { "interrogate_wrapper_caller_manages_return_value", &_inPCPDJPhA0, METH_VARARGS },
@@ -1636,6 +1665,7 @@ static PyMethodDef python_methods[] = {
   { "interrogate_type_is_wrapped", &_inPCPDJeAKS, METH_VARARGS },
   { "interrogate_type_is_wrapped", &_inPCPDJeAKS, METH_VARARGS },
   { "interrogate_get_element_by_scoped_name", &_inPCPDJeISc, METH_VARARGS },
   { "interrogate_get_element_by_scoped_name", &_inPCPDJeISc, METH_VARARGS },
   { "interrogate_function_comment", &_inPCPDJg3TW, METH_VARARGS },
   { "interrogate_function_comment", &_inPCPDJg3TW, METH_VARARGS },
+  { "interrogate_type_module_name", &_inPCPDJg4gH, METH_VARARGS },
   { "interrogate_type_number_of_casts", &_inPCPDJg6iq, METH_VARARGS },
   { "interrogate_type_number_of_casts", &_inPCPDJg6iq, METH_VARARGS },
   { "interrogate_type_derivation_has_upcast", &_inPCPDJgkPe, METH_VARARGS },
   { "interrogate_type_derivation_has_upcast", &_inPCPDJgkPe, METH_VARARGS },
   { "interrogate_type_destructor_is_inherited", &_inPCPDJh1o6, METH_VARARGS },
   { "interrogate_type_destructor_is_inherited", &_inPCPDJh1o6, METH_VARARGS },

+ 10 - 0
dtool/src/interrogatedb/interrogate_interface.cxx

@@ -357,6 +357,16 @@ interrogate_type_comment(TypeIndex type) {
   return InterrogateDatabase::get_ptr()->get_type(type).get_comment().c_str();
   return InterrogateDatabase::get_ptr()->get_type(type).get_comment().c_str();
 }
 }
 
 
+bool
+interrogate_type_has_module_name(TypeIndex type) {
+  return InterrogateDatabase::get_ptr()->get_type(type).has_module_name();
+}
+
+const char *
+interrogate_type_module_name(TypeIndex type) {
+  return InterrogateDatabase::get_ptr()->get_type(type).get_module_name();
+}
+
 bool
 bool
 interrogate_type_is_atomic(TypeIndex type) {
 interrogate_type_is_atomic(TypeIndex type) {
   return InterrogateDatabase::get_ptr()->get_type(type).is_atomic();
   return InterrogateDatabase::get_ptr()->get_type(type).is_atomic();

+ 4 - 0
dtool/src/interrogatedb/interrogate_interface.h

@@ -365,6 +365,10 @@ EXPCL_DTOOL TypeIndex interrogate_type_outer_class(TypeIndex type);
 EXPCL_DTOOL bool interrogate_type_has_comment(TypeIndex type);
 EXPCL_DTOOL bool interrogate_type_has_comment(TypeIndex type);
 EXPCL_DTOOL const char *interrogate_type_comment(TypeIndex type);
 EXPCL_DTOOL const char *interrogate_type_comment(TypeIndex type);
 
 
+// This returns the module name reported for the type, if available.
+EXPCL_DTOOL bool interrogate_type_has_module_name(TypeIndex type);
+EXPCL_DTOOL const char *interrogate_type_module_name(TypeIndex type);
+
 // If interrogate_type_is_atomic() returns true, the type is one of
 // If interrogate_type_is_atomic() returns true, the type is one of
 // the basic C types enumerated in AtomicToken, above.  The type may
 // the basic C types enumerated in AtomicToken, above.  The type may
 // then be further modified by one or more of unsigned, signed, long,
 // then be further modified by one or more of unsigned, signed, long,