From 7d8b112d6ee86a6725a1efd4fa43d9d4bcd54335 Mon Sep 17 00:00:00 2001 From: David Rose Date: Wed, 15 Nov 2000 00:46:16 +0000 Subject: [PATCH] *** empty log message *** --- dtool/metalibs/dtool/pydtool.cxx | 32 ++++++++++++++++++- .../interrogatedb/interrogate_interface.cxx | 10 ++++++ .../src/interrogatedb/interrogate_interface.h | 4 +++ 3 files changed, 45 insertions(+), 1 deletion(-) diff --git a/dtool/metalibs/dtool/pydtool.cxx b/dtool/metalibs/dtool/pydtool.cxx index 02e2f8ebed..0d4c1650d2 100644 --- a/dtool/metalibs/dtool/pydtool.cxx +++ b/dtool/metalibs/dtool/pydtool.cxx @@ -1,6 +1,6 @@ /* * 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; } +/* + * Python wrapper for + * bool interrogate_type_has_module_name(int type); + */ +static PyObject * +_inPCPDJPAqU(PyObject *, PyObject *args) { + int param0; + if (PyArg_ParseTuple(args, "i", ¶m0)) { + 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", ¶m0)) { + char const *return_value = interrogate_type_module_name((int)param0); + return Py_BuildValue("s", return_value); + } + return (PyObject *)NULL; +} + /* * Python wrapper for * bool interrogate_type_is_atomic(int type); @@ -1595,6 +1623,7 @@ static PyMethodDef python_methods[] = { { "interrogate_number_of_globals", &_inPCPDJNQAC, METH_VARARGS }, { "interrogate_type_derivation_downcast_is_impossible", &_inPCPDJN_Lp, 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_is_longlong", &_inPCPDJPd3W, 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_get_element_by_scoped_name", &_inPCPDJeISc, 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_derivation_has_upcast", &_inPCPDJgkPe, METH_VARARGS }, { "interrogate_type_destructor_is_inherited", &_inPCPDJh1o6, METH_VARARGS }, diff --git a/dtool/src/interrogatedb/interrogate_interface.cxx b/dtool/src/interrogatedb/interrogate_interface.cxx index 07da22463e..2e8c633977 100644 --- a/dtool/src/interrogatedb/interrogate_interface.cxx +++ b/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(); } +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 interrogate_type_is_atomic(TypeIndex type) { return InterrogateDatabase::get_ptr()->get_type(type).is_atomic(); diff --git a/dtool/src/interrogatedb/interrogate_interface.h b/dtool/src/interrogatedb/interrogate_interface.h index 82ec1fdac2..cec3825cd1 100644 --- a/dtool/src/interrogatedb/interrogate_interface.h +++ b/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 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 // the basic C types enumerated in AtomicToken, above. The type may // then be further modified by one or more of unsigned, signed, long,