From a6229f1fac5e55fa7d768128e2341d011282373a Mon Sep 17 00:00:00 2001 From: rdb Date: Fri, 19 Sep 2014 23:34:11 +0000 Subject: [PATCH] Support for comments in enums. Improve comment handling in C++ parser. Improve doxygen reference. Update interrogate interface. (Addendum to interrogatedb v2.3.) --- dtool/metalibs/dtoolconfig/pydtool.cxx | 834 ++++++++++-------- dtool/src/cppparser/cppBison.yxx | 40 +- dtool/src/cppparser/cppEnumType.cxx | 6 +- dtool/src/cppparser/cppEnumType.h | 4 +- dtool/src/cppparser/cppPreprocessor.cxx | 52 +- dtool/src/cppparser/cppPreprocessor.h | 3 +- dtool/src/cppparser/cppScope.cxx | 14 +- dtool/src/cppparser/cppScope.h | 4 +- dtool/src/cppparser/cppTemplateScope.cxx | 5 +- dtool/src/cppparser/cppTemplateScope.h | 4 +- .../src/interrogate/interfaceMakerPython.cxx | 3 +- .../interrogate/interfaceMakerPythonObj.cxx | 10 +- .../interfaceMakerPythonSimple.cxx | 12 +- dtool/src/interrogate/interrogateBuilder.cxx | 8 +- dtool/src/interrogatedb/interrogateType.I | 13 + dtool/src/interrogatedb/interrogateType.cxx | 5 + dtool/src/interrogatedb/interrogateType.h | 2 + .../interrogatedb/interrogate_interface.cxx | 18 + .../src/interrogatedb/interrogate_interface.h | 3 + 19 files changed, 600 insertions(+), 440 deletions(-) diff --git a/dtool/metalibs/dtoolconfig/pydtool.cxx b/dtool/metalibs/dtoolconfig/pydtool.cxx index d2e11b31d3..0c4b807bb1 100644 --- a/dtool/metalibs/dtoolconfig/pydtool.cxx +++ b/dtool/metalibs/dtoolconfig/pydtool.cxx @@ -1,6 +1,6 @@ /* * This file generated by: - * interrogate -D EXPCL_DTOOLCONFIG= -nodb -python -promiscuous -I /usr/local/panda/include -module dtoolconfig -library libp3dtoolconfig -true-names -do-module -oc pydtool.cxx ../../src/interrogatedb/interrogate_interface.h + * interrogate -D EXPCL_DTOOLCONFIG= -nodb -python -promiscuous -I~/panda3d/include -module panda3d.dtoolconfig -library dtoolconfig -true-names -do-module -oc pydtool.cxx ../../src/interrogatedb/interrogate_interface.h * */ @@ -9,145 +9,145 @@ #include "../../src/interrogatedb/interrogate_interface.h" #include "dtoolbase.h" -#undef HAVE_LONG_LONG #undef _POSIX_C_SOURCE +#define PY_SSIZE_T_CLEAN 1 #if PYTHON_FRAMEWORK #include "Python/Python.h" #else #include "Python.h" #endif -#ifdef HAVE_LONG_LONG -#undef HAVE_LONG_LONG -#endif -static PyObject *_inPzUjAtbRf(PyObject *self, PyObject *args); -static PyObject *_inPzUjAda_g(PyObject *self, PyObject *args); -static PyObject *_inPzUjA4RgX(PyObject *self, PyObject *args); -static PyObject *_inPzUjA3Gip(PyObject *self, PyObject *args); -static PyObject *_inPzUjARKDz(PyObject *self, PyObject *args); -static PyObject *_inPzUjAgZ9N(PyObject *self, PyObject *args); -static PyObject *_inPzUjARQIx(PyObject *self, PyObject *args); -static PyObject *_inPzUjAGVSj(PyObject *self, PyObject *args); -static PyObject *_inPzUjAznM6(PyObject *self, PyObject *args); -static PyObject *_inPzUjAjiLg(PyObject *self, PyObject *args); -static PyObject *_inPzUjA_yjE(PyObject *self, PyObject *args); -static PyObject *_inPzUjAzK9F(PyObject *self, PyObject *args); -static PyObject *_inPzUjAJju_(PyObject *self, PyObject *args); -static PyObject *_inPzUjAZktk(PyObject *self, PyObject *args); -static PyObject *_inPzUjAG71J(PyObject *self, PyObject *args); -static PyObject *_inPzUjAgeUs(PyObject *self, PyObject *args); -static PyObject *_inPzUjAkg95(PyObject *self, PyObject *args); -static PyObject *_inPzUjAluRc(PyObject *self, PyObject *args); -static PyObject *_inPzUjAwtTf(PyObject *self, PyObject *args); -static PyObject *_inPzUjArfao(PyObject *self, PyObject *args); -static PyObject *_inPzUjAcedk(PyObject *self, PyObject *args); -static PyObject *_inPzUjAXmoo(PyObject *self, PyObject *args); -static PyObject *_inPzUjAclIo(PyObject *self, PyObject *args); -static PyObject *_inPzUjAU2_B(PyObject *self, PyObject *args); -static PyObject *_inPzUjAHFO2(PyObject *self, PyObject *args); -static PyObject *_inPzUjAcfjm(PyObject *self, PyObject *args); -static PyObject *_inPzUjA3Sjw(PyObject *self, PyObject *args); -static PyObject *_inPzUjAgJcX(PyObject *self, PyObject *args); -static PyObject *_inPzUjAYlw6(PyObject *self, PyObject *args); -static PyObject *_inPzUjA3gns(PyObject *self, PyObject *args); -static PyObject *_inPzUjAN968(PyObject *self, PyObject *args); -static PyObject *_inPzUjAFJVJ(PyObject *self, PyObject *args); -static PyObject *_inPzUjAndTW(PyObject *self, PyObject *args); -static PyObject *_inPzUjApjWj(PyObject *self, PyObject *args); -static PyObject *_inPzUjANcQW(PyObject *self, PyObject *args); -static PyObject *_inPzUjAP_SX(PyObject *self, PyObject *args); -static PyObject *_inPzUjA1iRq(PyObject *self, PyObject *args); -static PyObject *_inPzUjAEmel(PyObject *self, PyObject *args); -static PyObject *_inPzUjA20Vx(PyObject *self, PyObject *args); -static PyObject *_inPzUjAKcdW(PyObject *self, PyObject *args); -static PyObject *_inPzUjAhUs9(PyObject *self, PyObject *args); -static PyObject *_inPzUjAhF25(PyObject *self, PyObject *args); -static PyObject *_inPzUjAu1qB(PyObject *self, PyObject *args); -static PyObject *_inPzUjAKMkY(PyObject *self, PyObject *args); -static PyObject *_inPzUjARx9W(PyObject *self, PyObject *args); -static PyObject *_inPzUjA0C9G(PyObject *self, PyObject *args); -static PyObject *_inPzUjAhaPp(PyObject *self, PyObject *args); -static PyObject *_inPzUjAt_1v(PyObject *self, PyObject *args); -static PyObject *_inPzUjA8KQG(PyObject *self, PyObject *args); -static PyObject *_inPzUjAEtIl(PyObject *self, PyObject *args); -static PyObject *_inPzUjARFmo(PyObject *self, PyObject *args); -static PyObject *_inPzUjAWHA0(PyObject *self, PyObject *args); -static PyObject *_inPzUjAcyIl(PyObject *self, PyObject *args); -static PyObject *_inPzUjABnBv(PyObject *self, PyObject *args); -static PyObject *_inPzUjAUvW7(PyObject *self, PyObject *args); -static PyObject *_inPzUjAPdXf(PyObject *self, PyObject *args); -static PyObject *_inPzUjAd0dl(PyObject *self, PyObject *args); -static PyObject *_inPzUjAdVbH(PyObject *self, PyObject *args); -static PyObject *_inPzUjABwF0(PyObject *self, PyObject *args); -static PyObject *_inPzUjA9dPK(PyObject *self, PyObject *args); -static PyObject *_inPzUjAhUwR(PyObject *self, PyObject *args); -static PyObject *_inPzUjAA1eF(PyObject *self, PyObject *args); -static PyObject *_inPzUjA8pBy(PyObject *self, PyObject *args); -static PyObject *_inPzUjA85oW(PyObject *self, PyObject *args); -static PyObject *_inPzUjAYZz0(PyObject *self, PyObject *args); -static PyObject *_inPzUjAzKCA(PyObject *self, PyObject *args); -static PyObject *_inPzUjAsxxs(PyObject *self, PyObject *args); -static PyObject *_inPzUjAMT0z(PyObject *self, PyObject *args); -static PyObject *_inPzUjAiW3v(PyObject *self, PyObject *args); -static PyObject *_inPzUjA4Px8(PyObject *self, PyObject *args); -static PyObject *_inPzUjANHcs(PyObject *self, PyObject *args); -static PyObject *_inPzUjAqHrb(PyObject *self, PyObject *args); -static PyObject *_inPzUjAaOqq(PyObject *self, PyObject *args); -static PyObject *_inPzUjAvue5(PyObject *self, PyObject *args); -static PyObject *_inPzUjAB_n_(PyObject *self, PyObject *args); -static PyObject *_inPzUjADFET(PyObject *self, PyObject *args); -static PyObject *_inPzUjAUyNE(PyObject *self, PyObject *args); -static PyObject *_inPzUjApDlm(PyObject *self, PyObject *args); -static PyObject *_inPzUjAAscF(PyObject *self, PyObject *args); -static PyObject *_inPzUjAYjbU(PyObject *self, PyObject *args); -static PyObject *_inPzUjAWmpU(PyObject *self, PyObject *args); -static PyObject *_inPzUjAnegH(PyObject *self, PyObject *args); -static PyObject *_inPzUjArrnF(PyObject *self, PyObject *args); -static PyObject *_inPzUjA7ShX(PyObject *self, PyObject *args); -static PyObject *_inPzUjAx_aO(PyObject *self, PyObject *args); -static PyObject *_inPzUjApofZ(PyObject *self, PyObject *args); -static PyObject *_inPzUjA2J9C(PyObject *self, PyObject *args); -static PyObject *_inPzUjAA6iz(PyObject *self, PyObject *args); -static PyObject *_inPzUjAa78E(PyObject *self, PyObject *args); -static PyObject *_inPzUjAWD3W(PyObject *self, PyObject *args); -static PyObject *_inPzUjAYuud(PyObject *self, PyObject *args); -static PyObject *_inPzUjAlmJS(PyObject *self, PyObject *args); -static PyObject *_inPzUjALlrr(PyObject *self, PyObject *args); -static PyObject *_inPzUjAw_wy(PyObject *self, PyObject *args); -static PyObject *_inPzUjAgk_l(PyObject *self, PyObject *args); -static PyObject *_inPzUjAXpHY(PyObject *self, PyObject *args); -static PyObject *_inPzUjAHhIg(PyObject *self, PyObject *args); -static PyObject *_inPzUjAff0T(PyObject *self, PyObject *args); -static PyObject *_inPzUjA5PPX(PyObject *self, PyObject *args); -static PyObject *_inPzUjAPww5(PyObject *self, PyObject *args); -static PyObject *_inPzUjAPke3(PyObject *self, PyObject *args); -static PyObject *_inPzUjAJmw3(PyObject *self, PyObject *args); -static PyObject *_inPzUjAR0Lc(PyObject *self, PyObject *args); -static PyObject *_inPzUjAc6gE(PyObject *self, PyObject *args); -static PyObject *_inPzUjA1iT0(PyObject *self, PyObject *args); -static PyObject *_inPzUjAz1Mn(PyObject *self, PyObject *args); -static PyObject *_inPzUjAWlf2(PyObject *self, PyObject *args); -static PyObject *_inPzUjA1q8q(PyObject *self, PyObject *args); -static PyObject *_inPzUjAobo6(PyObject *self, PyObject *args); -static PyObject *_inPzUjAjevK(PyObject *self, PyObject *args); -static PyObject *_inPzUjAeBpM(PyObject *self, PyObject *args); -static PyObject *_inPzUjAfmeN(PyObject *self, PyObject *args); -static PyObject *_inPzUjAKBCl(PyObject *self, PyObject *args); -static PyObject *_inPzUjA936K(PyObject *self, PyObject *args); -static PyObject *_inPzUjAPPXQ(PyObject *self, PyObject *args); -static PyObject *_inPzUjAnu86(PyObject *self, PyObject *args); -static PyObject *_inPzUjAngiq(PyObject *self, PyObject *args); -static PyObject *_inPzUjAUXR0(PyObject *self, PyObject *args); -static PyObject *_inPzUjADO7D(PyObject *self, PyObject *args); -static PyObject *_inPzUjAhZFz(PyObject *self, PyObject *args); -static PyObject *_inPzUjAnKPe(PyObject *self, PyObject *args); -static PyObject *_inPzUjAP3lS(PyObject *self, PyObject *args); -static PyObject *_inPzUjAUlLp(PyObject *self, PyObject *args); -static PyObject *_inPzUjA9Xei(PyObject *self, PyObject *args); -static PyObject *_inPzUjAaGkE(PyObject *self, PyObject *args); -static PyObject *_inPzUjAoe_l(PyObject *self, PyObject *args); -static PyObject *_inPzUjAuEdH(PyObject *self, PyObject *args); +static PyObject *_inPU7VHtbRf(PyObject *self, PyObject *args); +static PyObject *_inPU7VHda_g(PyObject *self, PyObject *args); +static PyObject *_inPU7VH4RgX(PyObject *self, PyObject *args); +static PyObject *_inPU7VH3Gip(PyObject *self, PyObject *args); +static PyObject *_inPU7VHRKDz(PyObject *self, PyObject *args); +static PyObject *_inPU7VHgZ9N(PyObject *self, PyObject *args); +static PyObject *_inPU7VHRQIx(PyObject *self, PyObject *args); +static PyObject *_inPU7VHGVSj(PyObject *self, PyObject *args); +static PyObject *_inPU7VHznM6(PyObject *self, PyObject *args); +static PyObject *_inPU7VHjiLg(PyObject *self, PyObject *args); +static PyObject *_inPU7VH_yjE(PyObject *self, PyObject *args); +static PyObject *_inPU7VHzK9F(PyObject *self, PyObject *args); +static PyObject *_inPU7VHJju_(PyObject *self, PyObject *args); +static PyObject *_inPU7VHZktk(PyObject *self, PyObject *args); +static PyObject *_inPU7VHG71J(PyObject *self, PyObject *args); +static PyObject *_inPU7VHgeUs(PyObject *self, PyObject *args); +static PyObject *_inPU7VH5Gsy(PyObject *self, PyObject *args); +static PyObject *_inPU7VHCSJJ(PyObject *self, PyObject *args); +static PyObject *_inPU7VHkg95(PyObject *self, PyObject *args); +static PyObject *_inPU7VHluRc(PyObject *self, PyObject *args); +static PyObject *_inPU7VHwtTf(PyObject *self, PyObject *args); +static PyObject *_inPU7VHrfao(PyObject *self, PyObject *args); +static PyObject *_inPU7VHcedk(PyObject *self, PyObject *args); +static PyObject *_inPU7VHXmoo(PyObject *self, PyObject *args); +static PyObject *_inPU7VHclIo(PyObject *self, PyObject *args); +static PyObject *_inPU7VHU2_B(PyObject *self, PyObject *args); +static PyObject *_inPU7VHHFO2(PyObject *self, PyObject *args); +static PyObject *_inPU7VHcfjm(PyObject *self, PyObject *args); +static PyObject *_inPU7VH3Sjw(PyObject *self, PyObject *args); +static PyObject *_inPU7VHgJcX(PyObject *self, PyObject *args); +static PyObject *_inPU7VHYlw6(PyObject *self, PyObject *args); +static PyObject *_inPU7VH3gns(PyObject *self, PyObject *args); +static PyObject *_inPU7VHN968(PyObject *self, PyObject *args); +static PyObject *_inPU7VHFJVJ(PyObject *self, PyObject *args); +static PyObject *_inPU7VHndTW(PyObject *self, PyObject *args); +static PyObject *_inPU7VHpjWj(PyObject *self, PyObject *args); +static PyObject *_inPU7VHNcQW(PyObject *self, PyObject *args); +static PyObject *_inPU7VHP_SX(PyObject *self, PyObject *args); +static PyObject *_inPU7VH1iRq(PyObject *self, PyObject *args); +static PyObject *_inPU7VHEmel(PyObject *self, PyObject *args); +static PyObject *_inPU7VH20Vx(PyObject *self, PyObject *args); +static PyObject *_inPU7VHKcdW(PyObject *self, PyObject *args); +static PyObject *_inPU7VHhUs9(PyObject *self, PyObject *args); +static PyObject *_inPU7VHhF25(PyObject *self, PyObject *args); +static PyObject *_inPU7VHu1qB(PyObject *self, PyObject *args); +static PyObject *_inPU7VHKMkY(PyObject *self, PyObject *args); +static PyObject *_inPU7VHRx9W(PyObject *self, PyObject *args); +static PyObject *_inPU7VH0C9G(PyObject *self, PyObject *args); +static PyObject *_inPU7VHhaPp(PyObject *self, PyObject *args); +static PyObject *_inPU7VHt_1v(PyObject *self, PyObject *args); +static PyObject *_inPU7VH8KQG(PyObject *self, PyObject *args); +static PyObject *_inPU7VHEtIl(PyObject *self, PyObject *args); +static PyObject *_inPU7VHRFmo(PyObject *self, PyObject *args); +static PyObject *_inPU7VHWHA0(PyObject *self, PyObject *args); +static PyObject *_inPU7VHcyIl(PyObject *self, PyObject *args); +static PyObject *_inPU7VHBnBv(PyObject *self, PyObject *args); +static PyObject *_inPU7VHUvW7(PyObject *self, PyObject *args); +static PyObject *_inPU7VHPdXf(PyObject *self, PyObject *args); +static PyObject *_inPU7VHd0dl(PyObject *self, PyObject *args); +static PyObject *_inPU7VHdVbH(PyObject *self, PyObject *args); +static PyObject *_inPU7VHBwF0(PyObject *self, PyObject *args); +static PyObject *_inPU7VH9dPK(PyObject *self, PyObject *args); +static PyObject *_inPU7VHhUwR(PyObject *self, PyObject *args); +static PyObject *_inPU7VHA1eF(PyObject *self, PyObject *args); +static PyObject *_inPU7VH8pBy(PyObject *self, PyObject *args); +static PyObject *_inPU7VH85oW(PyObject *self, PyObject *args); +static PyObject *_inPU7VHYZz0(PyObject *self, PyObject *args); +static PyObject *_inPU7VHzKCA(PyObject *self, PyObject *args); +static PyObject *_inPU7VHsxxs(PyObject *self, PyObject *args); +static PyObject *_inPU7VHMT0z(PyObject *self, PyObject *args); +static PyObject *_inPU7VHiW3v(PyObject *self, PyObject *args); +static PyObject *_inPU7VH4Px8(PyObject *self, PyObject *args); +static PyObject *_inPU7VHNHcs(PyObject *self, PyObject *args); +static PyObject *_inPU7VHqHrb(PyObject *self, PyObject *args); +static PyObject *_inPU7VHaOqq(PyObject *self, PyObject *args); +static PyObject *_inPU7VHvue5(PyObject *self, PyObject *args); +static PyObject *_inPU7VHB_n_(PyObject *self, PyObject *args); +static PyObject *_inPU7VHDFET(PyObject *self, PyObject *args); +static PyObject *_inPU7VHUyNE(PyObject *self, PyObject *args); +static PyObject *_inPU7VHpDlm(PyObject *self, PyObject *args); +static PyObject *_inPU7VHAscF(PyObject *self, PyObject *args); +static PyObject *_inPU7VHYjbU(PyObject *self, PyObject *args); +static PyObject *_inPU7VHWmpU(PyObject *self, PyObject *args); +static PyObject *_inPU7VHnegH(PyObject *self, PyObject *args); +static PyObject *_inPU7VHrrnF(PyObject *self, PyObject *args); +static PyObject *_inPU7VH7ShX(PyObject *self, PyObject *args); +static PyObject *_inPU7VHx_aO(PyObject *self, PyObject *args); +static PyObject *_inPU7VHpofZ(PyObject *self, PyObject *args); +static PyObject *_inPU7VH2J9C(PyObject *self, PyObject *args); +static PyObject *_inPU7VHA6iz(PyObject *self, PyObject *args); +static PyObject *_inPU7VHa78E(PyObject *self, PyObject *args); +static PyObject *_inPU7VHWD3W(PyObject *self, PyObject *args); +static PyObject *_inPU7VHYuud(PyObject *self, PyObject *args); +static PyObject *_inPU7VHlmJS(PyObject *self, PyObject *args); +static PyObject *_inPU7VHLlrr(PyObject *self, PyObject *args); +static PyObject *_inPU7VHw_wy(PyObject *self, PyObject *args); +static PyObject *_inPU7VHgk_l(PyObject *self, PyObject *args); +static PyObject *_inPU7VHXpHY(PyObject *self, PyObject *args); +static PyObject *_inPU7VHHhIg(PyObject *self, PyObject *args); +static PyObject *_inPU7VHff0T(PyObject *self, PyObject *args); +static PyObject *_inPU7VH5PPX(PyObject *self, PyObject *args); +static PyObject *_inPU7VHCIt5(PyObject *self, PyObject *args); +static PyObject *_inPU7VHPww5(PyObject *self, PyObject *args); +static PyObject *_inPU7VHPke3(PyObject *self, PyObject *args); +static PyObject *_inPU7VHJmw3(PyObject *self, PyObject *args); +static PyObject *_inPU7VHR0Lc(PyObject *self, PyObject *args); +static PyObject *_inPU7VHc6gE(PyObject *self, PyObject *args); +static PyObject *_inPU7VH1iT0(PyObject *self, PyObject *args); +static PyObject *_inPU7VHz1Mn(PyObject *self, PyObject *args); +static PyObject *_inPU7VHWlf2(PyObject *self, PyObject *args); +static PyObject *_inPU7VH1q8q(PyObject *self, PyObject *args); +static PyObject *_inPU7VHobo6(PyObject *self, PyObject *args); +static PyObject *_inPU7VHjevK(PyObject *self, PyObject *args); +static PyObject *_inPU7VHeBpM(PyObject *self, PyObject *args); +static PyObject *_inPU7VHfmeN(PyObject *self, PyObject *args); +static PyObject *_inPU7VHKBCl(PyObject *self, PyObject *args); +static PyObject *_inPU7VH936K(PyObject *self, PyObject *args); +static PyObject *_inPU7VHPPXQ(PyObject *self, PyObject *args); +static PyObject *_inPU7VHnu86(PyObject *self, PyObject *args); +static PyObject *_inPU7VHngiq(PyObject *self, PyObject *args); +static PyObject *_inPU7VHUXR0(PyObject *self, PyObject *args); +static PyObject *_inPU7VHDO7D(PyObject *self, PyObject *args); +static PyObject *_inPU7VHhZFz(PyObject *self, PyObject *args); +static PyObject *_inPU7VHnKPe(PyObject *self, PyObject *args); +static PyObject *_inPU7VHP3lS(PyObject *self, PyObject *args); +static PyObject *_inPU7VHUlLp(PyObject *self, PyObject *args); +static PyObject *_inPU7VH9Xei(PyObject *self, PyObject *args); +static PyObject *_inPU7VHaGkE(PyObject *self, PyObject *args); +static PyObject *_inPU7VHoe_l(PyObject *self, PyObject *args); +static PyObject *_inPU7VHuEdH(PyObject *self, PyObject *args); /* @@ -155,7 +155,7 @@ static PyObject *_inPzUjAuEdH(PyObject *self, PyObject *args); * void interrogate_add_search_directory(char const *dirname) */ static PyObject * -_inPzUjAtbRf(PyObject *, PyObject *args) { +_inPU7VHtbRf(PyObject *, PyObject *args) { char *param0; if (PyArg_ParseTuple(args, "s", ¶m0)) { interrogate_add_search_directory((char const *)param0); @@ -169,7 +169,7 @@ _inPzUjAtbRf(PyObject *, PyObject *args) { * void interrogate_add_search_path(char const *pathstring) */ static PyObject * -_inPzUjAda_g(PyObject *, PyObject *args) { +_inPU7VHda_g(PyObject *, PyObject *args) { char *param0; if (PyArg_ParseTuple(args, "s", ¶m0)) { interrogate_add_search_path((char const *)param0); @@ -183,7 +183,7 @@ _inPzUjAda_g(PyObject *, PyObject *args) { * bool interrogate_error_flag(void) */ static PyObject * -_inPzUjA4RgX(PyObject *, PyObject *args) { +_inPU7VH4RgX(PyObject *, PyObject *args) { if (PyArg_ParseTuple(args, "")) { bool return_value = interrogate_error_flag(); return PyBool_FromLong(return_value); @@ -196,7 +196,7 @@ _inPzUjA4RgX(PyObject *, PyObject *args) { * int interrogate_number_of_manifests(void) */ static PyObject * -_inPzUjA3Gip(PyObject *, PyObject *args) { +_inPU7VH3Gip(PyObject *, PyObject *args) { if (PyArg_ParseTuple(args, "")) { int return_value = interrogate_number_of_manifests(); #if PY_MAJOR_VERSION >= 3 @@ -213,7 +213,7 @@ _inPzUjA3Gip(PyObject *, PyObject *args) { * int interrogate_get_manifest(int n) */ static PyObject * -_inPzUjARKDz(PyObject *, PyObject *args) { +_inPU7VHRKDz(PyObject *, PyObject *args) { int param0; if (PyArg_ParseTuple(args, "i", ¶m0)) { int return_value = interrogate_get_manifest((int)param0); @@ -231,7 +231,7 @@ _inPzUjARKDz(PyObject *, PyObject *args) { * int interrogate_get_manifest_by_name(char const *manifest_name) */ static PyObject * -_inPzUjAgZ9N(PyObject *, PyObject *args) { +_inPU7VHgZ9N(PyObject *, PyObject *args) { char *param0; if (PyArg_ParseTuple(args, "s", ¶m0)) { int return_value = interrogate_get_manifest_by_name((char const *)param0); @@ -249,7 +249,7 @@ _inPzUjAgZ9N(PyObject *, PyObject *args) { * char const *interrogate_manifest_name(int manifest) */ static PyObject * -_inPzUjARQIx(PyObject *, PyObject *args) { +_inPU7VHRQIx(PyObject *, PyObject *args) { int param0; if (PyArg_ParseTuple(args, "i", ¶m0)) { char const *return_value = interrogate_manifest_name((int)param0); @@ -267,7 +267,7 @@ _inPzUjARQIx(PyObject *, PyObject *args) { * char const *interrogate_manifest_definition(int manifest) */ static PyObject * -_inPzUjAGVSj(PyObject *, PyObject *args) { +_inPU7VHGVSj(PyObject *, PyObject *args) { int param0; if (PyArg_ParseTuple(args, "i", ¶m0)) { char const *return_value = interrogate_manifest_definition((int)param0); @@ -285,7 +285,7 @@ _inPzUjAGVSj(PyObject *, PyObject *args) { * bool interrogate_manifest_has_type(int manifest) */ static PyObject * -_inPzUjAznM6(PyObject *, PyObject *args) { +_inPU7VHznM6(PyObject *, PyObject *args) { int param0; if (PyArg_ParseTuple(args, "i", ¶m0)) { bool return_value = interrogate_manifest_has_type((int)param0); @@ -299,7 +299,7 @@ _inPzUjAznM6(PyObject *, PyObject *args) { * int interrogate_manifest_get_type(int manifest) */ static PyObject * -_inPzUjAjiLg(PyObject *, PyObject *args) { +_inPU7VHjiLg(PyObject *, PyObject *args) { int param0; if (PyArg_ParseTuple(args, "i", ¶m0)) { int return_value = interrogate_manifest_get_type((int)param0); @@ -317,7 +317,7 @@ _inPzUjAjiLg(PyObject *, PyObject *args) { * bool interrogate_manifest_has_getter(int manifest) */ static PyObject * -_inPzUjA_yjE(PyObject *, PyObject *args) { +_inPU7VH_yjE(PyObject *, PyObject *args) { int param0; if (PyArg_ParseTuple(args, "i", ¶m0)) { bool return_value = interrogate_manifest_has_getter((int)param0); @@ -331,7 +331,7 @@ _inPzUjA_yjE(PyObject *, PyObject *args) { * int interrogate_manifest_getter(int manifest) */ static PyObject * -_inPzUjAzK9F(PyObject *, PyObject *args) { +_inPU7VHzK9F(PyObject *, PyObject *args) { int param0; if (PyArg_ParseTuple(args, "i", ¶m0)) { int return_value = interrogate_manifest_getter((int)param0); @@ -349,7 +349,7 @@ _inPzUjAzK9F(PyObject *, PyObject *args) { * bool interrogate_manifest_has_int_value(int manifest) */ static PyObject * -_inPzUjAJju_(PyObject *, PyObject *args) { +_inPU7VHJju_(PyObject *, PyObject *args) { int param0; if (PyArg_ParseTuple(args, "i", ¶m0)) { bool return_value = interrogate_manifest_has_int_value((int)param0); @@ -363,7 +363,7 @@ _inPzUjAJju_(PyObject *, PyObject *args) { * int interrogate_manifest_get_int_value(int manifest) */ static PyObject * -_inPzUjAZktk(PyObject *, PyObject *args) { +_inPU7VHZktk(PyObject *, PyObject *args) { int param0; if (PyArg_ParseTuple(args, "i", ¶m0)) { int return_value = interrogate_manifest_get_int_value((int)param0); @@ -381,7 +381,7 @@ _inPzUjAZktk(PyObject *, PyObject *args) { * char const *interrogate_element_name(int element) */ static PyObject * -_inPzUjAG71J(PyObject *, PyObject *args) { +_inPU7VHG71J(PyObject *, PyObject *args) { int param0; if (PyArg_ParseTuple(args, "i", ¶m0)) { char const *return_value = interrogate_element_name((int)param0); @@ -399,7 +399,7 @@ _inPzUjAG71J(PyObject *, PyObject *args) { * char const *interrogate_element_scoped_name(int element) */ static PyObject * -_inPzUjAgeUs(PyObject *, PyObject *args) { +_inPU7VHgeUs(PyObject *, PyObject *args) { int param0; if (PyArg_ParseTuple(args, "i", ¶m0)) { char const *return_value = interrogate_element_scoped_name((int)param0); @@ -412,12 +412,44 @@ _inPzUjAgeUs(PyObject *, PyObject *args) { return (PyObject *)NULL; } +/* + * Python simple wrapper for + * bool interrogate_element_has_comment(int element) + */ +static PyObject * +_inPU7VH5Gsy(PyObject *, PyObject *args) { + int param0; + if (PyArg_ParseTuple(args, "i", ¶m0)) { + bool return_value = interrogate_element_has_comment((int)param0); + return PyBool_FromLong(return_value); + } + return (PyObject *)NULL; +} + +/* + * Python simple wrapper for + * char const *interrogate_element_comment(int element) + */ +static PyObject * +_inPU7VHCSJJ(PyObject *, PyObject *args) { + int param0; + if (PyArg_ParseTuple(args, "i", ¶m0)) { + char const *return_value = interrogate_element_comment((int)param0); +#if PY_MAJOR_VERSION >= 3 + return PyUnicode_FromString(return_value); +#else + return PyString_FromString(return_value); +#endif + } + return (PyObject *)NULL; +} + /* * Python simple wrapper for * int interrogate_get_element_by_name(char const *element_name) */ static PyObject * -_inPzUjAkg95(PyObject *, PyObject *args) { +_inPU7VHkg95(PyObject *, PyObject *args) { char *param0; if (PyArg_ParseTuple(args, "s", ¶m0)) { int return_value = interrogate_get_element_by_name((char const *)param0); @@ -435,7 +467,7 @@ _inPzUjAkg95(PyObject *, PyObject *args) { * int interrogate_get_element_by_scoped_name(char const *element_name) */ static PyObject * -_inPzUjAluRc(PyObject *, PyObject *args) { +_inPU7VHluRc(PyObject *, PyObject *args) { char *param0; if (PyArg_ParseTuple(args, "s", ¶m0)) { int return_value = interrogate_get_element_by_scoped_name((char const *)param0); @@ -453,7 +485,7 @@ _inPzUjAluRc(PyObject *, PyObject *args) { * int interrogate_element_type(int element) */ static PyObject * -_inPzUjAwtTf(PyObject *, PyObject *args) { +_inPU7VHwtTf(PyObject *, PyObject *args) { int param0; if (PyArg_ParseTuple(args, "i", ¶m0)) { int return_value = interrogate_element_type((int)param0); @@ -471,7 +503,7 @@ _inPzUjAwtTf(PyObject *, PyObject *args) { * bool interrogate_element_has_getter(int element) */ static PyObject * -_inPzUjArfao(PyObject *, PyObject *args) { +_inPU7VHrfao(PyObject *, PyObject *args) { int param0; if (PyArg_ParseTuple(args, "i", ¶m0)) { bool return_value = interrogate_element_has_getter((int)param0); @@ -485,7 +517,7 @@ _inPzUjArfao(PyObject *, PyObject *args) { * int interrogate_element_getter(int element) */ static PyObject * -_inPzUjAcedk(PyObject *, PyObject *args) { +_inPU7VHcedk(PyObject *, PyObject *args) { int param0; if (PyArg_ParseTuple(args, "i", ¶m0)) { int return_value = interrogate_element_getter((int)param0); @@ -503,7 +535,7 @@ _inPzUjAcedk(PyObject *, PyObject *args) { * bool interrogate_element_has_setter(int element) */ static PyObject * -_inPzUjAXmoo(PyObject *, PyObject *args) { +_inPU7VHXmoo(PyObject *, PyObject *args) { int param0; if (PyArg_ParseTuple(args, "i", ¶m0)) { bool return_value = interrogate_element_has_setter((int)param0); @@ -517,7 +549,7 @@ _inPzUjAXmoo(PyObject *, PyObject *args) { * int interrogate_element_setter(int element) */ static PyObject * -_inPzUjAclIo(PyObject *, PyObject *args) { +_inPU7VHclIo(PyObject *, PyObject *args) { int param0; if (PyArg_ParseTuple(args, "i", ¶m0)) { int return_value = interrogate_element_setter((int)param0); @@ -535,7 +567,7 @@ _inPzUjAclIo(PyObject *, PyObject *args) { * int interrogate_number_of_globals(void) */ static PyObject * -_inPzUjAU2_B(PyObject *, PyObject *args) { +_inPU7VHU2_B(PyObject *, PyObject *args) { if (PyArg_ParseTuple(args, "")) { int return_value = interrogate_number_of_globals(); #if PY_MAJOR_VERSION >= 3 @@ -552,7 +584,7 @@ _inPzUjAU2_B(PyObject *, PyObject *args) { * int interrogate_get_global(int n) */ static PyObject * -_inPzUjAHFO2(PyObject *, PyObject *args) { +_inPU7VHHFO2(PyObject *, PyObject *args) { int param0; if (PyArg_ParseTuple(args, "i", ¶m0)) { int return_value = interrogate_get_global((int)param0); @@ -570,7 +602,7 @@ _inPzUjAHFO2(PyObject *, PyObject *args) { * int interrogate_number_of_global_functions(void) */ static PyObject * -_inPzUjAcfjm(PyObject *, PyObject *args) { +_inPU7VHcfjm(PyObject *, PyObject *args) { if (PyArg_ParseTuple(args, "")) { int return_value = interrogate_number_of_global_functions(); #if PY_MAJOR_VERSION >= 3 @@ -587,7 +619,7 @@ _inPzUjAcfjm(PyObject *, PyObject *args) { * int interrogate_get_global_function(int n) */ static PyObject * -_inPzUjA3Sjw(PyObject *, PyObject *args) { +_inPU7VH3Sjw(PyObject *, PyObject *args) { int param0; if (PyArg_ParseTuple(args, "i", ¶m0)) { int return_value = interrogate_get_global_function((int)param0); @@ -605,7 +637,7 @@ _inPzUjA3Sjw(PyObject *, PyObject *args) { * int interrogate_number_of_functions(void) */ static PyObject * -_inPzUjAgJcX(PyObject *, PyObject *args) { +_inPU7VHgJcX(PyObject *, PyObject *args) { if (PyArg_ParseTuple(args, "")) { int return_value = interrogate_number_of_functions(); #if PY_MAJOR_VERSION >= 3 @@ -622,7 +654,7 @@ _inPzUjAgJcX(PyObject *, PyObject *args) { * int interrogate_get_function(int n) */ static PyObject * -_inPzUjAYlw6(PyObject *, PyObject *args) { +_inPU7VHYlw6(PyObject *, PyObject *args) { int param0; if (PyArg_ParseTuple(args, "i", ¶m0)) { int return_value = interrogate_get_function((int)param0); @@ -640,7 +672,7 @@ _inPzUjAYlw6(PyObject *, PyObject *args) { * char const *interrogate_function_name(int function) */ static PyObject * -_inPzUjA3gns(PyObject *, PyObject *args) { +_inPU7VH3gns(PyObject *, PyObject *args) { int param0; if (PyArg_ParseTuple(args, "i", ¶m0)) { char const *return_value = interrogate_function_name((int)param0); @@ -658,7 +690,7 @@ _inPzUjA3gns(PyObject *, PyObject *args) { * char const *interrogate_function_scoped_name(int function) */ static PyObject * -_inPzUjAN968(PyObject *, PyObject *args) { +_inPU7VHN968(PyObject *, PyObject *args) { int param0; if (PyArg_ParseTuple(args, "i", ¶m0)) { char const *return_value = interrogate_function_scoped_name((int)param0); @@ -676,7 +708,7 @@ _inPzUjAN968(PyObject *, PyObject *args) { * bool interrogate_function_has_comment(int function) */ static PyObject * -_inPzUjAFJVJ(PyObject *, PyObject *args) { +_inPU7VHFJVJ(PyObject *, PyObject *args) { int param0; if (PyArg_ParseTuple(args, "i", ¶m0)) { bool return_value = interrogate_function_has_comment((int)param0); @@ -690,7 +722,7 @@ _inPzUjAFJVJ(PyObject *, PyObject *args) { * char const *interrogate_function_comment(int function) */ static PyObject * -_inPzUjAndTW(PyObject *, PyObject *args) { +_inPU7VHndTW(PyObject *, PyObject *args) { int param0; if (PyArg_ParseTuple(args, "i", ¶m0)) { char const *return_value = interrogate_function_comment((int)param0); @@ -708,7 +740,7 @@ _inPzUjAndTW(PyObject *, PyObject *args) { * char const *interrogate_function_prototype(int function) */ static PyObject * -_inPzUjApjWj(PyObject *, PyObject *args) { +_inPU7VHpjWj(PyObject *, PyObject *args) { int param0; if (PyArg_ParseTuple(args, "i", ¶m0)) { char const *return_value = interrogate_function_prototype((int)param0); @@ -726,7 +758,7 @@ _inPzUjApjWj(PyObject *, PyObject *args) { * bool interrogate_function_is_method(int function) */ static PyObject * -_inPzUjANcQW(PyObject *, PyObject *args) { +_inPU7VHNcQW(PyObject *, PyObject *args) { int param0; if (PyArg_ParseTuple(args, "i", ¶m0)) { bool return_value = interrogate_function_is_method((int)param0); @@ -740,7 +772,7 @@ _inPzUjANcQW(PyObject *, PyObject *args) { * int interrogate_function_class(int function) */ static PyObject * -_inPzUjAP_SX(PyObject *, PyObject *args) { +_inPU7VHP_SX(PyObject *, PyObject *args) { int param0; if (PyArg_ParseTuple(args, "i", ¶m0)) { int return_value = interrogate_function_class((int)param0); @@ -758,7 +790,7 @@ _inPzUjAP_SX(PyObject *, PyObject *args) { * bool interrogate_function_has_module_name(int function) */ static PyObject * -_inPzUjA1iRq(PyObject *, PyObject *args) { +_inPU7VH1iRq(PyObject *, PyObject *args) { int param0; if (PyArg_ParseTuple(args, "i", ¶m0)) { bool return_value = interrogate_function_has_module_name((int)param0); @@ -772,7 +804,7 @@ _inPzUjA1iRq(PyObject *, PyObject *args) { * char const *interrogate_function_module_name(int function) */ static PyObject * -_inPzUjAEmel(PyObject *, PyObject *args) { +_inPU7VHEmel(PyObject *, PyObject *args) { int param0; if (PyArg_ParseTuple(args, "i", ¶m0)) { char const *return_value = interrogate_function_module_name((int)param0); @@ -790,7 +822,7 @@ _inPzUjAEmel(PyObject *, PyObject *args) { * bool interrogate_function_has_library_name(int function) */ static PyObject * -_inPzUjA20Vx(PyObject *, PyObject *args) { +_inPU7VH20Vx(PyObject *, PyObject *args) { int param0; if (PyArg_ParseTuple(args, "i", ¶m0)) { bool return_value = interrogate_function_has_library_name((int)param0); @@ -804,7 +836,7 @@ _inPzUjA20Vx(PyObject *, PyObject *args) { * char const *interrogate_function_library_name(int function) */ static PyObject * -_inPzUjAKcdW(PyObject *, PyObject *args) { +_inPU7VHKcdW(PyObject *, PyObject *args) { int param0; if (PyArg_ParseTuple(args, "i", ¶m0)) { char const *return_value = interrogate_function_library_name((int)param0); @@ -822,7 +854,7 @@ _inPzUjAKcdW(PyObject *, PyObject *args) { * bool interrogate_function_is_virtual(int function) */ static PyObject * -_inPzUjAhUs9(PyObject *, PyObject *args) { +_inPU7VHhUs9(PyObject *, PyObject *args) { int param0; if (PyArg_ParseTuple(args, "i", ¶m0)) { bool return_value = interrogate_function_is_virtual((int)param0); @@ -836,7 +868,7 @@ _inPzUjAhUs9(PyObject *, PyObject *args) { * int interrogate_function_number_of_c_wrappers(int function) */ static PyObject * -_inPzUjAhF25(PyObject *, PyObject *args) { +_inPU7VHhF25(PyObject *, PyObject *args) { int param0; if (PyArg_ParseTuple(args, "i", ¶m0)) { int return_value = interrogate_function_number_of_c_wrappers((int)param0); @@ -854,7 +886,7 @@ _inPzUjAhF25(PyObject *, PyObject *args) { * int interrogate_function_c_wrapper(int function, int n) */ static PyObject * -_inPzUjAu1qB(PyObject *, PyObject *args) { +_inPU7VHu1qB(PyObject *, PyObject *args) { int param0; int param1; if (PyArg_ParseTuple(args, "ii", ¶m0, ¶m1)) { @@ -873,7 +905,7 @@ _inPzUjAu1qB(PyObject *, PyObject *args) { * int interrogate_function_number_of_python_wrappers(int function) */ static PyObject * -_inPzUjAKMkY(PyObject *, PyObject *args) { +_inPU7VHKMkY(PyObject *, PyObject *args) { int param0; if (PyArg_ParseTuple(args, "i", ¶m0)) { int return_value = interrogate_function_number_of_python_wrappers((int)param0); @@ -891,7 +923,7 @@ _inPzUjAKMkY(PyObject *, PyObject *args) { * int interrogate_function_python_wrapper(int function, int n) */ static PyObject * -_inPzUjARx9W(PyObject *, PyObject *args) { +_inPU7VHRx9W(PyObject *, PyObject *args) { int param0; int param1; if (PyArg_ParseTuple(args, "ii", ¶m0, ¶m1)) { @@ -910,7 +942,7 @@ _inPzUjARx9W(PyObject *, PyObject *args) { * char const *interrogate_wrapper_name(int wrapper) */ static PyObject * -_inPzUjA0C9G(PyObject *, PyObject *args) { +_inPU7VH0C9G(PyObject *, PyObject *args) { int param0; if (PyArg_ParseTuple(args, "i", ¶m0)) { char const *return_value = interrogate_wrapper_name((int)param0); @@ -928,7 +960,7 @@ _inPzUjA0C9G(PyObject *, PyObject *args) { * bool interrogate_wrapper_is_callable_by_name(int wrapper) */ static PyObject * -_inPzUjAhaPp(PyObject *, PyObject *args) { +_inPU7VHhaPp(PyObject *, PyObject *args) { int param0; if (PyArg_ParseTuple(args, "i", ¶m0)) { bool return_value = interrogate_wrapper_is_callable_by_name((int)param0); @@ -942,7 +974,7 @@ _inPzUjAhaPp(PyObject *, PyObject *args) { * bool interrogate_wrapper_has_comment(int wrapper) */ static PyObject * -_inPzUjAt_1v(PyObject *, PyObject *args) { +_inPU7VHt_1v(PyObject *, PyObject *args) { int param0; if (PyArg_ParseTuple(args, "i", ¶m0)) { bool return_value = interrogate_wrapper_has_comment((int)param0); @@ -956,7 +988,7 @@ _inPzUjAt_1v(PyObject *, PyObject *args) { * char const *interrogate_wrapper_comment(int wrapper) */ static PyObject * -_inPzUjA8KQG(PyObject *, PyObject *args) { +_inPU7VH8KQG(PyObject *, PyObject *args) { int param0; if (PyArg_ParseTuple(args, "i", ¶m0)) { char const *return_value = interrogate_wrapper_comment((int)param0); @@ -974,7 +1006,7 @@ _inPzUjA8KQG(PyObject *, PyObject *args) { * bool interrogate_wrapper_has_return_value(int wrapper) */ static PyObject * -_inPzUjAEtIl(PyObject *, PyObject *args) { +_inPU7VHEtIl(PyObject *, PyObject *args) { int param0; if (PyArg_ParseTuple(args, "i", ¶m0)) { bool return_value = interrogate_wrapper_has_return_value((int)param0); @@ -988,7 +1020,7 @@ _inPzUjAEtIl(PyObject *, PyObject *args) { * int interrogate_wrapper_return_type(int wrapper) */ static PyObject * -_inPzUjARFmo(PyObject *, PyObject *args) { +_inPU7VHRFmo(PyObject *, PyObject *args) { int param0; if (PyArg_ParseTuple(args, "i", ¶m0)) { int return_value = interrogate_wrapper_return_type((int)param0); @@ -1006,7 +1038,7 @@ _inPzUjARFmo(PyObject *, PyObject *args) { * bool interrogate_wrapper_caller_manages_return_value(int wrapper) */ static PyObject * -_inPzUjAWHA0(PyObject *, PyObject *args) { +_inPU7VHWHA0(PyObject *, PyObject *args) { int param0; if (PyArg_ParseTuple(args, "i", ¶m0)) { bool return_value = interrogate_wrapper_caller_manages_return_value((int)param0); @@ -1020,7 +1052,7 @@ _inPzUjAWHA0(PyObject *, PyObject *args) { * int interrogate_wrapper_return_value_destructor(int wrapper) */ static PyObject * -_inPzUjAcyIl(PyObject *, PyObject *args) { +_inPU7VHcyIl(PyObject *, PyObject *args) { int param0; if (PyArg_ParseTuple(args, "i", ¶m0)) { int return_value = interrogate_wrapper_return_value_destructor((int)param0); @@ -1038,7 +1070,7 @@ _inPzUjAcyIl(PyObject *, PyObject *args) { * int interrogate_wrapper_number_of_parameters(int wrapper) */ static PyObject * -_inPzUjABnBv(PyObject *, PyObject *args) { +_inPU7VHBnBv(PyObject *, PyObject *args) { int param0; if (PyArg_ParseTuple(args, "i", ¶m0)) { int return_value = interrogate_wrapper_number_of_parameters((int)param0); @@ -1056,7 +1088,7 @@ _inPzUjABnBv(PyObject *, PyObject *args) { * int interrogate_wrapper_parameter_type(int wrapper, int n) */ static PyObject * -_inPzUjAUvW7(PyObject *, PyObject *args) { +_inPU7VHUvW7(PyObject *, PyObject *args) { int param0; int param1; if (PyArg_ParseTuple(args, "ii", ¶m0, ¶m1)) { @@ -1075,7 +1107,7 @@ _inPzUjAUvW7(PyObject *, PyObject *args) { * bool interrogate_wrapper_parameter_has_name(int wrapper, int n) */ static PyObject * -_inPzUjAPdXf(PyObject *, PyObject *args) { +_inPU7VHPdXf(PyObject *, PyObject *args) { int param0; int param1; if (PyArg_ParseTuple(args, "ii", ¶m0, ¶m1)) { @@ -1090,7 +1122,7 @@ _inPzUjAPdXf(PyObject *, PyObject *args) { * char const *interrogate_wrapper_parameter_name(int wrapper, int n) */ static PyObject * -_inPzUjAd0dl(PyObject *, PyObject *args) { +_inPU7VHd0dl(PyObject *, PyObject *args) { int param0; int param1; if (PyArg_ParseTuple(args, "ii", ¶m0, ¶m1)) { @@ -1109,7 +1141,7 @@ _inPzUjAd0dl(PyObject *, PyObject *args) { * bool interrogate_wrapper_parameter_is_this(int wrapper, int n) */ static PyObject * -_inPzUjAdVbH(PyObject *, PyObject *args) { +_inPU7VHdVbH(PyObject *, PyObject *args) { int param0; int param1; if (PyArg_ParseTuple(args, "ii", ¶m0, ¶m1)) { @@ -1124,7 +1156,7 @@ _inPzUjAdVbH(PyObject *, PyObject *args) { * bool interrogate_wrapper_has_pointer(int wrapper) */ static PyObject * -_inPzUjABwF0(PyObject *, PyObject *args) { +_inPU7VHBwF0(PyObject *, PyObject *args) { int param0; if (PyArg_ParseTuple(args, "i", ¶m0)) { bool return_value = interrogate_wrapper_has_pointer((int)param0); @@ -1138,7 +1170,7 @@ _inPzUjABwF0(PyObject *, PyObject *args) { * void *interrogate_wrapper_pointer(int wrapper) */ static PyObject * -_inPzUjA9dPK(PyObject *, PyObject *args) { +_inPU7VH9dPK(PyObject *, PyObject *args) { int param0; if (PyArg_ParseTuple(args, "i", ¶m0)) { interrogate_wrapper_pointer((int)param0); @@ -1152,7 +1184,7 @@ _inPzUjA9dPK(PyObject *, PyObject *args) { * char const *interrogate_wrapper_unique_name(int wrapper) */ static PyObject * -_inPzUjAhUwR(PyObject *, PyObject *args) { +_inPU7VHhUwR(PyObject *, PyObject *args) { int param0; if (PyArg_ParseTuple(args, "i", ¶m0)) { char const *return_value = interrogate_wrapper_unique_name((int)param0); @@ -1170,7 +1202,7 @@ _inPzUjAhUwR(PyObject *, PyObject *args) { * int interrogate_get_wrapper_by_unique_name(char const *unique_name) */ static PyObject * -_inPzUjAA1eF(PyObject *, PyObject *args) { +_inPU7VHA1eF(PyObject *, PyObject *args) { char *param0; if (PyArg_ParseTuple(args, "s", ¶m0)) { int return_value = interrogate_get_wrapper_by_unique_name((char const *)param0); @@ -1188,7 +1220,7 @@ _inPzUjAA1eF(PyObject *, PyObject *args) { * int interrogate_make_seq_class(int make_seq) */ static PyObject * -_inPzUjA8pBy(PyObject *, PyObject *args) { +_inPU7VH8pBy(PyObject *, PyObject *args) { int param0; if (PyArg_ParseTuple(args, "i", ¶m0)) { int return_value = interrogate_make_seq_class((int)param0); @@ -1206,7 +1238,7 @@ _inPzUjA8pBy(PyObject *, PyObject *args) { * char const *interrogate_make_seq_seq_name(int make_seq) */ static PyObject * -_inPzUjA85oW(PyObject *, PyObject *args) { +_inPU7VH85oW(PyObject *, PyObject *args) { int param0; if (PyArg_ParseTuple(args, "i", ¶m0)) { char const *return_value = interrogate_make_seq_seq_name((int)param0); @@ -1224,7 +1256,7 @@ _inPzUjA85oW(PyObject *, PyObject *args) { * char const *interrogate_make_seq_num_name(int make_seq) */ static PyObject * -_inPzUjAYZz0(PyObject *, PyObject *args) { +_inPU7VHYZz0(PyObject *, PyObject *args) { int param0; if (PyArg_ParseTuple(args, "i", ¶m0)) { char const *return_value = interrogate_make_seq_num_name((int)param0); @@ -1242,7 +1274,7 @@ _inPzUjAYZz0(PyObject *, PyObject *args) { * char const *interrogate_make_seq_element_name(int make_seq) */ static PyObject * -_inPzUjAzKCA(PyObject *, PyObject *args) { +_inPU7VHzKCA(PyObject *, PyObject *args) { int param0; if (PyArg_ParseTuple(args, "i", ¶m0)) { char const *return_value = interrogate_make_seq_element_name((int)param0); @@ -1260,7 +1292,7 @@ _inPzUjAzKCA(PyObject *, PyObject *args) { * int interrogate_number_of_global_types(void) */ static PyObject * -_inPzUjAsxxs(PyObject *, PyObject *args) { +_inPU7VHsxxs(PyObject *, PyObject *args) { if (PyArg_ParseTuple(args, "")) { int return_value = interrogate_number_of_global_types(); #if PY_MAJOR_VERSION >= 3 @@ -1277,7 +1309,7 @@ _inPzUjAsxxs(PyObject *, PyObject *args) { * int interrogate_get_global_type(int n) */ static PyObject * -_inPzUjAMT0z(PyObject *, PyObject *args) { +_inPU7VHMT0z(PyObject *, PyObject *args) { int param0; if (PyArg_ParseTuple(args, "i", ¶m0)) { int return_value = interrogate_get_global_type((int)param0); @@ -1295,7 +1327,7 @@ _inPzUjAMT0z(PyObject *, PyObject *args) { * int interrogate_number_of_types(void) */ static PyObject * -_inPzUjAiW3v(PyObject *, PyObject *args) { +_inPU7VHiW3v(PyObject *, PyObject *args) { if (PyArg_ParseTuple(args, "")) { int return_value = interrogate_number_of_types(); #if PY_MAJOR_VERSION >= 3 @@ -1312,7 +1344,7 @@ _inPzUjAiW3v(PyObject *, PyObject *args) { * int interrogate_get_type(int n) */ static PyObject * -_inPzUjA4Px8(PyObject *, PyObject *args) { +_inPU7VH4Px8(PyObject *, PyObject *args) { int param0; if (PyArg_ParseTuple(args, "i", ¶m0)) { int return_value = interrogate_get_type((int)param0); @@ -1330,7 +1362,7 @@ _inPzUjA4Px8(PyObject *, PyObject *args) { * int interrogate_get_type_by_name(char const *type_name) */ static PyObject * -_inPzUjANHcs(PyObject *, PyObject *args) { +_inPU7VHNHcs(PyObject *, PyObject *args) { char *param0; if (PyArg_ParseTuple(args, "s", ¶m0)) { int return_value = interrogate_get_type_by_name((char const *)param0); @@ -1348,7 +1380,7 @@ _inPzUjANHcs(PyObject *, PyObject *args) { * int interrogate_get_type_by_scoped_name(char const *type_name) */ static PyObject * -_inPzUjAqHrb(PyObject *, PyObject *args) { +_inPU7VHqHrb(PyObject *, PyObject *args) { char *param0; if (PyArg_ParseTuple(args, "s", ¶m0)) { int return_value = interrogate_get_type_by_scoped_name((char const *)param0); @@ -1366,7 +1398,7 @@ _inPzUjAqHrb(PyObject *, PyObject *args) { * int interrogate_get_type_by_true_name(char const *type_name) */ static PyObject * -_inPzUjAaOqq(PyObject *, PyObject *args) { +_inPU7VHaOqq(PyObject *, PyObject *args) { char *param0; if (PyArg_ParseTuple(args, "s", ¶m0)) { int return_value = interrogate_get_type_by_true_name((char const *)param0); @@ -1384,7 +1416,7 @@ _inPzUjAaOqq(PyObject *, PyObject *args) { * char const *interrogate_type_name(int type) */ static PyObject * -_inPzUjAvue5(PyObject *, PyObject *args) { +_inPU7VHvue5(PyObject *, PyObject *args) { int param0; if (PyArg_ParseTuple(args, "i", ¶m0)) { char const *return_value = interrogate_type_name((int)param0); @@ -1402,7 +1434,7 @@ _inPzUjAvue5(PyObject *, PyObject *args) { * char const *interrogate_type_scoped_name(int type) */ static PyObject * -_inPzUjAB_n_(PyObject *, PyObject *args) { +_inPU7VHB_n_(PyObject *, PyObject *args) { int param0; if (PyArg_ParseTuple(args, "i", ¶m0)) { char const *return_value = interrogate_type_scoped_name((int)param0); @@ -1420,7 +1452,7 @@ _inPzUjAB_n_(PyObject *, PyObject *args) { * char const *interrogate_type_true_name(int type) */ static PyObject * -_inPzUjADFET(PyObject *, PyObject *args) { +_inPU7VHDFET(PyObject *, PyObject *args) { int param0; if (PyArg_ParseTuple(args, "i", ¶m0)) { char const *return_value = interrogate_type_true_name((int)param0); @@ -1438,7 +1470,7 @@ _inPzUjADFET(PyObject *, PyObject *args) { * bool interrogate_type_is_nested(int type) */ static PyObject * -_inPzUjAUyNE(PyObject *, PyObject *args) { +_inPU7VHUyNE(PyObject *, PyObject *args) { int param0; if (PyArg_ParseTuple(args, "i", ¶m0)) { bool return_value = interrogate_type_is_nested((int)param0); @@ -1452,7 +1484,7 @@ _inPzUjAUyNE(PyObject *, PyObject *args) { * int interrogate_type_outer_class(int type) */ static PyObject * -_inPzUjApDlm(PyObject *, PyObject *args) { +_inPU7VHpDlm(PyObject *, PyObject *args) { int param0; if (PyArg_ParseTuple(args, "i", ¶m0)) { int return_value = interrogate_type_outer_class((int)param0); @@ -1470,7 +1502,7 @@ _inPzUjApDlm(PyObject *, PyObject *args) { * bool interrogate_type_has_comment(int type) */ static PyObject * -_inPzUjAAscF(PyObject *, PyObject *args) { +_inPU7VHAscF(PyObject *, PyObject *args) { int param0; if (PyArg_ParseTuple(args, "i", ¶m0)) { bool return_value = interrogate_type_has_comment((int)param0); @@ -1484,7 +1516,7 @@ _inPzUjAAscF(PyObject *, PyObject *args) { * char const *interrogate_type_comment(int type) */ static PyObject * -_inPzUjAYjbU(PyObject *, PyObject *args) { +_inPU7VHYjbU(PyObject *, PyObject *args) { int param0; if (PyArg_ParseTuple(args, "i", ¶m0)) { char const *return_value = interrogate_type_comment((int)param0); @@ -1502,7 +1534,7 @@ _inPzUjAYjbU(PyObject *, PyObject *args) { * bool interrogate_type_has_module_name(int type) */ static PyObject * -_inPzUjAWmpU(PyObject *, PyObject *args) { +_inPU7VHWmpU(PyObject *, PyObject *args) { int param0; if (PyArg_ParseTuple(args, "i", ¶m0)) { bool return_value = interrogate_type_has_module_name((int)param0); @@ -1516,7 +1548,7 @@ _inPzUjAWmpU(PyObject *, PyObject *args) { * char const *interrogate_type_module_name(int type) */ static PyObject * -_inPzUjAnegH(PyObject *, PyObject *args) { +_inPU7VHnegH(PyObject *, PyObject *args) { int param0; if (PyArg_ParseTuple(args, "i", ¶m0)) { char const *return_value = interrogate_type_module_name((int)param0); @@ -1534,7 +1566,7 @@ _inPzUjAnegH(PyObject *, PyObject *args) { * bool interrogate_type_has_library_name(int type) */ static PyObject * -_inPzUjArrnF(PyObject *, PyObject *args) { +_inPU7VHrrnF(PyObject *, PyObject *args) { int param0; if (PyArg_ParseTuple(args, "i", ¶m0)) { bool return_value = interrogate_type_has_library_name((int)param0); @@ -1548,7 +1580,7 @@ _inPzUjArrnF(PyObject *, PyObject *args) { * char const *interrogate_type_library_name(int type) */ static PyObject * -_inPzUjA7ShX(PyObject *, PyObject *args) { +_inPU7VH7ShX(PyObject *, PyObject *args) { int param0; if (PyArg_ParseTuple(args, "i", ¶m0)) { char const *return_value = interrogate_type_library_name((int)param0); @@ -1566,7 +1598,7 @@ _inPzUjA7ShX(PyObject *, PyObject *args) { * bool interrogate_type_is_atomic(int type) */ static PyObject * -_inPzUjAx_aO(PyObject *, PyObject *args) { +_inPU7VHx_aO(PyObject *, PyObject *args) { int param0; if (PyArg_ParseTuple(args, "i", ¶m0)) { bool return_value = interrogate_type_is_atomic((int)param0); @@ -1580,7 +1612,7 @@ _inPzUjAx_aO(PyObject *, PyObject *args) { * AtomicToken interrogate_type_atomic_token(int type) */ static PyObject * -_inPzUjApofZ(PyObject *, PyObject *args) { +_inPU7VHpofZ(PyObject *, PyObject *args) { int param0; if (PyArg_ParseTuple(args, "i", ¶m0)) { AtomicToken return_value = interrogate_type_atomic_token((int)param0); @@ -1598,7 +1630,7 @@ _inPzUjApofZ(PyObject *, PyObject *args) { * bool interrogate_type_is_unsigned(int type) */ static PyObject * -_inPzUjA2J9C(PyObject *, PyObject *args) { +_inPU7VH2J9C(PyObject *, PyObject *args) { int param0; if (PyArg_ParseTuple(args, "i", ¶m0)) { bool return_value = interrogate_type_is_unsigned((int)param0); @@ -1612,7 +1644,7 @@ _inPzUjA2J9C(PyObject *, PyObject *args) { * bool interrogate_type_is_signed(int type) */ static PyObject * -_inPzUjAA6iz(PyObject *, PyObject *args) { +_inPU7VHA6iz(PyObject *, PyObject *args) { int param0; if (PyArg_ParseTuple(args, "i", ¶m0)) { bool return_value = interrogate_type_is_signed((int)param0); @@ -1626,7 +1658,7 @@ _inPzUjAA6iz(PyObject *, PyObject *args) { * bool interrogate_type_is_long(int type) */ static PyObject * -_inPzUjAa78E(PyObject *, PyObject *args) { +_inPU7VHa78E(PyObject *, PyObject *args) { int param0; if (PyArg_ParseTuple(args, "i", ¶m0)) { bool return_value = interrogate_type_is_long((int)param0); @@ -1640,7 +1672,7 @@ _inPzUjAa78E(PyObject *, PyObject *args) { * bool interrogate_type_is_longlong(int type) */ static PyObject * -_inPzUjAWD3W(PyObject *, PyObject *args) { +_inPU7VHWD3W(PyObject *, PyObject *args) { int param0; if (PyArg_ParseTuple(args, "i", ¶m0)) { bool return_value = interrogate_type_is_longlong((int)param0); @@ -1654,7 +1686,7 @@ _inPzUjAWD3W(PyObject *, PyObject *args) { * bool interrogate_type_is_short(int type) */ static PyObject * -_inPzUjAYuud(PyObject *, PyObject *args) { +_inPU7VHYuud(PyObject *, PyObject *args) { int param0; if (PyArg_ParseTuple(args, "i", ¶m0)) { bool return_value = interrogate_type_is_short((int)param0); @@ -1668,7 +1700,7 @@ _inPzUjAYuud(PyObject *, PyObject *args) { * bool interrogate_type_is_wrapped(int type) */ static PyObject * -_inPzUjAlmJS(PyObject *, PyObject *args) { +_inPU7VHlmJS(PyObject *, PyObject *args) { int param0; if (PyArg_ParseTuple(args, "i", ¶m0)) { bool return_value = interrogate_type_is_wrapped((int)param0); @@ -1682,7 +1714,7 @@ _inPzUjAlmJS(PyObject *, PyObject *args) { * bool interrogate_type_is_pointer(int type) */ static PyObject * -_inPzUjALlrr(PyObject *, PyObject *args) { +_inPU7VHLlrr(PyObject *, PyObject *args) { int param0; if (PyArg_ParseTuple(args, "i", ¶m0)) { bool return_value = interrogate_type_is_pointer((int)param0); @@ -1696,7 +1728,7 @@ _inPzUjALlrr(PyObject *, PyObject *args) { * bool interrogate_type_is_const(int type) */ static PyObject * -_inPzUjAw_wy(PyObject *, PyObject *args) { +_inPU7VHw_wy(PyObject *, PyObject *args) { int param0; if (PyArg_ParseTuple(args, "i", ¶m0)) { bool return_value = interrogate_type_is_const((int)param0); @@ -1710,7 +1742,7 @@ _inPzUjAw_wy(PyObject *, PyObject *args) { * int interrogate_type_wrapped_type(int type) */ static PyObject * -_inPzUjAgk_l(PyObject *, PyObject *args) { +_inPU7VHgk_l(PyObject *, PyObject *args) { int param0; if (PyArg_ParseTuple(args, "i", ¶m0)) { int return_value = interrogate_type_wrapped_type((int)param0); @@ -1728,7 +1760,7 @@ _inPzUjAgk_l(PyObject *, PyObject *args) { * bool interrogate_type_is_enum(int type) */ static PyObject * -_inPzUjAXpHY(PyObject *, PyObject *args) { +_inPU7VHXpHY(PyObject *, PyObject *args) { int param0; if (PyArg_ParseTuple(args, "i", ¶m0)) { bool return_value = interrogate_type_is_enum((int)param0); @@ -1742,7 +1774,7 @@ _inPzUjAXpHY(PyObject *, PyObject *args) { * int interrogate_type_number_of_enum_values(int type) */ static PyObject * -_inPzUjAHhIg(PyObject *, PyObject *args) { +_inPU7VHHhIg(PyObject *, PyObject *args) { int param0; if (PyArg_ParseTuple(args, "i", ¶m0)) { int return_value = interrogate_type_number_of_enum_values((int)param0); @@ -1760,7 +1792,7 @@ _inPzUjAHhIg(PyObject *, PyObject *args) { * char const *interrogate_type_enum_value_name(int type, int n) */ static PyObject * -_inPzUjAff0T(PyObject *, PyObject *args) { +_inPU7VHff0T(PyObject *, PyObject *args) { int param0; int param1; if (PyArg_ParseTuple(args, "ii", ¶m0, ¶m1)) { @@ -1779,7 +1811,7 @@ _inPzUjAff0T(PyObject *, PyObject *args) { * char const *interrogate_type_enum_value_scoped_name(int type, int n) */ static PyObject * -_inPzUjA5PPX(PyObject *, PyObject *args) { +_inPU7VH5PPX(PyObject *, PyObject *args) { int param0; int param1; if (PyArg_ParseTuple(args, "ii", ¶m0, ¶m1)) { @@ -1793,12 +1825,31 @@ _inPzUjA5PPX(PyObject *, PyObject *args) { return (PyObject *)NULL; } +/* + * Python simple wrapper for + * char const *interrogate_type_enum_value_comment(int type, int n) + */ +static PyObject * +_inPU7VHCIt5(PyObject *, PyObject *args) { + int param0; + int param1; + if (PyArg_ParseTuple(args, "ii", ¶m0, ¶m1)) { + char const *return_value = interrogate_type_enum_value_comment((int)param0, (int)param1); +#if PY_MAJOR_VERSION >= 3 + return PyUnicode_FromString(return_value); +#else + return PyString_FromString(return_value); +#endif + } + return (PyObject *)NULL; +} + /* * Python simple wrapper for * int interrogate_type_enum_value(int type, int n) */ static PyObject * -_inPzUjAPww5(PyObject *, PyObject *args) { +_inPU7VHPww5(PyObject *, PyObject *args) { int param0; int param1; if (PyArg_ParseTuple(args, "ii", ¶m0, ¶m1)) { @@ -1817,7 +1868,7 @@ _inPzUjAPww5(PyObject *, PyObject *args) { * bool interrogate_type_is_struct(int type) */ static PyObject * -_inPzUjAPke3(PyObject *, PyObject *args) { +_inPU7VHPke3(PyObject *, PyObject *args) { int param0; if (PyArg_ParseTuple(args, "i", ¶m0)) { bool return_value = interrogate_type_is_struct((int)param0); @@ -1831,7 +1882,7 @@ _inPzUjAPke3(PyObject *, PyObject *args) { * bool interrogate_type_is_class(int type) */ static PyObject * -_inPzUjAJmw3(PyObject *, PyObject *args) { +_inPU7VHJmw3(PyObject *, PyObject *args) { int param0; if (PyArg_ParseTuple(args, "i", ¶m0)) { bool return_value = interrogate_type_is_class((int)param0); @@ -1845,7 +1896,7 @@ _inPzUjAJmw3(PyObject *, PyObject *args) { * bool interrogate_type_is_union(int type) */ static PyObject * -_inPzUjAR0Lc(PyObject *, PyObject *args) { +_inPU7VHR0Lc(PyObject *, PyObject *args) { int param0; if (PyArg_ParseTuple(args, "i", ¶m0)) { bool return_value = interrogate_type_is_union((int)param0); @@ -1859,7 +1910,7 @@ _inPzUjAR0Lc(PyObject *, PyObject *args) { * bool interrogate_type_is_fully_defined(int type) */ static PyObject * -_inPzUjAc6gE(PyObject *, PyObject *args) { +_inPU7VHc6gE(PyObject *, PyObject *args) { int param0; if (PyArg_ParseTuple(args, "i", ¶m0)) { bool return_value = interrogate_type_is_fully_defined((int)param0); @@ -1873,7 +1924,7 @@ _inPzUjAc6gE(PyObject *, PyObject *args) { * bool interrogate_type_is_unpublished(int type) */ static PyObject * -_inPzUjA1iT0(PyObject *, PyObject *args) { +_inPU7VH1iT0(PyObject *, PyObject *args) { int param0; if (PyArg_ParseTuple(args, "i", ¶m0)) { bool return_value = interrogate_type_is_unpublished((int)param0); @@ -1887,7 +1938,7 @@ _inPzUjA1iT0(PyObject *, PyObject *args) { * int interrogate_type_number_of_constructors(int type) */ static PyObject * -_inPzUjAz1Mn(PyObject *, PyObject *args) { +_inPU7VHz1Mn(PyObject *, PyObject *args) { int param0; if (PyArg_ParseTuple(args, "i", ¶m0)) { int return_value = interrogate_type_number_of_constructors((int)param0); @@ -1905,7 +1956,7 @@ _inPzUjAz1Mn(PyObject *, PyObject *args) { * int interrogate_type_get_constructor(int type, int n) */ static PyObject * -_inPzUjAWlf2(PyObject *, PyObject *args) { +_inPU7VHWlf2(PyObject *, PyObject *args) { int param0; int param1; if (PyArg_ParseTuple(args, "ii", ¶m0, ¶m1)) { @@ -1924,7 +1975,7 @@ _inPzUjAWlf2(PyObject *, PyObject *args) { * bool interrogate_type_has_destructor(int type) */ static PyObject * -_inPzUjA1q8q(PyObject *, PyObject *args) { +_inPU7VH1q8q(PyObject *, PyObject *args) { int param0; if (PyArg_ParseTuple(args, "i", ¶m0)) { bool return_value = interrogate_type_has_destructor((int)param0); @@ -1938,7 +1989,7 @@ _inPzUjA1q8q(PyObject *, PyObject *args) { * bool interrogate_type_destructor_is_inherited(int type) */ static PyObject * -_inPzUjAobo6(PyObject *, PyObject *args) { +_inPU7VHobo6(PyObject *, PyObject *args) { int param0; if (PyArg_ParseTuple(args, "i", ¶m0)) { bool return_value = interrogate_type_destructor_is_inherited((int)param0); @@ -1952,7 +2003,7 @@ _inPzUjAobo6(PyObject *, PyObject *args) { * int interrogate_type_get_destructor(int type) */ static PyObject * -_inPzUjAjevK(PyObject *, PyObject *args) { +_inPU7VHjevK(PyObject *, PyObject *args) { int param0; if (PyArg_ParseTuple(args, "i", ¶m0)) { int return_value = interrogate_type_get_destructor((int)param0); @@ -1970,7 +2021,7 @@ _inPzUjAjevK(PyObject *, PyObject *args) { * int interrogate_type_number_of_elements(int type) */ static PyObject * -_inPzUjAeBpM(PyObject *, PyObject *args) { +_inPU7VHeBpM(PyObject *, PyObject *args) { int param0; if (PyArg_ParseTuple(args, "i", ¶m0)) { int return_value = interrogate_type_number_of_elements((int)param0); @@ -1988,7 +2039,7 @@ _inPzUjAeBpM(PyObject *, PyObject *args) { * int interrogate_type_get_element(int type, int n) */ static PyObject * -_inPzUjAfmeN(PyObject *, PyObject *args) { +_inPU7VHfmeN(PyObject *, PyObject *args) { int param0; int param1; if (PyArg_ParseTuple(args, "ii", ¶m0, ¶m1)) { @@ -2007,7 +2058,7 @@ _inPzUjAfmeN(PyObject *, PyObject *args) { * int interrogate_type_number_of_methods(int type) */ static PyObject * -_inPzUjAKBCl(PyObject *, PyObject *args) { +_inPU7VHKBCl(PyObject *, PyObject *args) { int param0; if (PyArg_ParseTuple(args, "i", ¶m0)) { int return_value = interrogate_type_number_of_methods((int)param0); @@ -2025,7 +2076,7 @@ _inPzUjAKBCl(PyObject *, PyObject *args) { * int interrogate_type_get_method(int type, int n) */ static PyObject * -_inPzUjA936K(PyObject *, PyObject *args) { +_inPU7VH936K(PyObject *, PyObject *args) { int param0; int param1; if (PyArg_ParseTuple(args, "ii", ¶m0, ¶m1)) { @@ -2044,7 +2095,7 @@ _inPzUjA936K(PyObject *, PyObject *args) { * int interrogate_type_number_of_make_seqs(int type) */ static PyObject * -_inPzUjAPPXQ(PyObject *, PyObject *args) { +_inPU7VHPPXQ(PyObject *, PyObject *args) { int param0; if (PyArg_ParseTuple(args, "i", ¶m0)) { int return_value = interrogate_type_number_of_make_seqs((int)param0); @@ -2062,7 +2113,7 @@ _inPzUjAPPXQ(PyObject *, PyObject *args) { * int interrogate_type_get_make_seq(int type, int n) */ static PyObject * -_inPzUjAnu86(PyObject *, PyObject *args) { +_inPU7VHnu86(PyObject *, PyObject *args) { int param0; int param1; if (PyArg_ParseTuple(args, "ii", ¶m0, ¶m1)) { @@ -2081,7 +2132,7 @@ _inPzUjAnu86(PyObject *, PyObject *args) { * int interrogate_type_number_of_casts(int type) */ static PyObject * -_inPzUjAngiq(PyObject *, PyObject *args) { +_inPU7VHngiq(PyObject *, PyObject *args) { int param0; if (PyArg_ParseTuple(args, "i", ¶m0)) { int return_value = interrogate_type_number_of_casts((int)param0); @@ -2099,7 +2150,7 @@ _inPzUjAngiq(PyObject *, PyObject *args) { * int interrogate_type_get_cast(int type, int n) */ static PyObject * -_inPzUjAUXR0(PyObject *, PyObject *args) { +_inPU7VHUXR0(PyObject *, PyObject *args) { int param0; int param1; if (PyArg_ParseTuple(args, "ii", ¶m0, ¶m1)) { @@ -2118,7 +2169,7 @@ _inPzUjAUXR0(PyObject *, PyObject *args) { * int interrogate_type_number_of_derivations(int type) */ static PyObject * -_inPzUjADO7D(PyObject *, PyObject *args) { +_inPU7VHDO7D(PyObject *, PyObject *args) { int param0; if (PyArg_ParseTuple(args, "i", ¶m0)) { int return_value = interrogate_type_number_of_derivations((int)param0); @@ -2136,7 +2187,7 @@ _inPzUjADO7D(PyObject *, PyObject *args) { * int interrogate_type_get_derivation(int type, int n) */ static PyObject * -_inPzUjAhZFz(PyObject *, PyObject *args) { +_inPU7VHhZFz(PyObject *, PyObject *args) { int param0; int param1; if (PyArg_ParseTuple(args, "ii", ¶m0, ¶m1)) { @@ -2155,7 +2206,7 @@ _inPzUjAhZFz(PyObject *, PyObject *args) { * bool interrogate_type_derivation_has_upcast(int type, int n) */ static PyObject * -_inPzUjAnKPe(PyObject *, PyObject *args) { +_inPU7VHnKPe(PyObject *, PyObject *args) { int param0; int param1; if (PyArg_ParseTuple(args, "ii", ¶m0, ¶m1)) { @@ -2170,7 +2221,7 @@ _inPzUjAnKPe(PyObject *, PyObject *args) { * int interrogate_type_get_upcast(int type, int n) */ static PyObject * -_inPzUjAP3lS(PyObject *, PyObject *args) { +_inPU7VHP3lS(PyObject *, PyObject *args) { int param0; int param1; if (PyArg_ParseTuple(args, "ii", ¶m0, ¶m1)) { @@ -2189,7 +2240,7 @@ _inPzUjAP3lS(PyObject *, PyObject *args) { * bool interrogate_type_derivation_downcast_is_impossible(int type, int n) */ static PyObject * -_inPzUjAUlLp(PyObject *, PyObject *args) { +_inPU7VHUlLp(PyObject *, PyObject *args) { int param0; int param1; if (PyArg_ParseTuple(args, "ii", ¶m0, ¶m1)) { @@ -2204,7 +2255,7 @@ _inPzUjAUlLp(PyObject *, PyObject *args) { * bool interrogate_type_derivation_has_downcast(int type, int n) */ static PyObject * -_inPzUjA9Xei(PyObject *, PyObject *args) { +_inPU7VH9Xei(PyObject *, PyObject *args) { int param0; int param1; if (PyArg_ParseTuple(args, "ii", ¶m0, ¶m1)) { @@ -2219,7 +2270,7 @@ _inPzUjA9Xei(PyObject *, PyObject *args) { * int interrogate_type_get_downcast(int type, int n) */ static PyObject * -_inPzUjAaGkE(PyObject *, PyObject *args) { +_inPU7VHaGkE(PyObject *, PyObject *args) { int param0; int param1; if (PyArg_ParseTuple(args, "ii", ¶m0, ¶m1)) { @@ -2238,7 +2289,7 @@ _inPzUjAaGkE(PyObject *, PyObject *args) { * int interrogate_type_number_of_nested_types(int type) */ static PyObject * -_inPzUjAoe_l(PyObject *, PyObject *args) { +_inPU7VHoe_l(PyObject *, PyObject *args) { int param0; if (PyArg_ParseTuple(args, "i", ¶m0)) { int return_value = interrogate_type_number_of_nested_types((int)param0); @@ -2256,7 +2307,7 @@ _inPzUjAoe_l(PyObject *, PyObject *args) { * int interrogate_type_get_nested_type(int type, int n) */ static PyObject * -_inPzUjAuEdH(PyObject *, PyObject *args) { +_inPU7VHuEdH(PyObject *, PyObject *args) { int param0; int param1; if (PyArg_ParseTuple(args, "ii", ¶m0, ¶m1)) { @@ -2272,149 +2323,152 @@ _inPzUjAuEdH(PyObject *, PyObject *args) { static PyMethodDef python_simple_funcs[] = { - { "interrogate_add_search_directory", &_inPzUjAtbRf, METH_VARARGS }, - { "interrogate_add_search_path", &_inPzUjAda_g, METH_VARARGS }, - { "interrogate_error_flag", &_inPzUjA4RgX, METH_VARARGS }, - { "interrogate_number_of_manifests", &_inPzUjA3Gip, METH_VARARGS }, - { "interrogate_get_manifest", &_inPzUjARKDz, METH_VARARGS }, - { "interrogate_get_manifest_by_name", &_inPzUjAgZ9N, METH_VARARGS }, - { "interrogate_manifest_name", &_inPzUjARQIx, METH_VARARGS }, - { "interrogate_manifest_definition", &_inPzUjAGVSj, METH_VARARGS }, - { "interrogate_manifest_has_type", &_inPzUjAznM6, METH_VARARGS }, - { "interrogate_manifest_get_type", &_inPzUjAjiLg, METH_VARARGS }, - { "interrogate_manifest_has_getter", &_inPzUjA_yjE, METH_VARARGS }, - { "interrogate_manifest_getter", &_inPzUjAzK9F, METH_VARARGS }, - { "interrogate_manifest_has_int_value", &_inPzUjAJju_, METH_VARARGS }, - { "interrogate_manifest_get_int_value", &_inPzUjAZktk, METH_VARARGS }, - { "interrogate_element_name", &_inPzUjAG71J, METH_VARARGS }, - { "interrogate_element_scoped_name", &_inPzUjAgeUs, METH_VARARGS }, - { "interrogate_get_element_by_name", &_inPzUjAkg95, METH_VARARGS }, - { "interrogate_get_element_by_scoped_name", &_inPzUjAluRc, METH_VARARGS }, - { "interrogate_element_type", &_inPzUjAwtTf, METH_VARARGS }, - { "interrogate_element_has_getter", &_inPzUjArfao, METH_VARARGS }, - { "interrogate_element_getter", &_inPzUjAcedk, METH_VARARGS }, - { "interrogate_element_has_setter", &_inPzUjAXmoo, METH_VARARGS }, - { "interrogate_element_setter", &_inPzUjAclIo, METH_VARARGS }, - { "interrogate_number_of_globals", &_inPzUjAU2_B, METH_VARARGS }, - { "interrogate_get_global", &_inPzUjAHFO2, METH_VARARGS }, - { "interrogate_number_of_global_functions", &_inPzUjAcfjm, METH_VARARGS }, - { "interrogate_get_global_function", &_inPzUjA3Sjw, METH_VARARGS }, - { "interrogate_number_of_functions", &_inPzUjAgJcX, METH_VARARGS }, - { "interrogate_get_function", &_inPzUjAYlw6, METH_VARARGS }, - { "interrogate_function_name", &_inPzUjA3gns, METH_VARARGS }, - { "interrogate_function_scoped_name", &_inPzUjAN968, METH_VARARGS }, - { "interrogate_function_has_comment", &_inPzUjAFJVJ, METH_VARARGS }, - { "interrogate_function_comment", &_inPzUjAndTW, METH_VARARGS }, - { "interrogate_function_prototype", &_inPzUjApjWj, METH_VARARGS }, - { "interrogate_function_is_method", &_inPzUjANcQW, METH_VARARGS }, - { "interrogate_function_class", &_inPzUjAP_SX, METH_VARARGS }, - { "interrogate_function_has_module_name", &_inPzUjA1iRq, METH_VARARGS }, - { "interrogate_function_module_name", &_inPzUjAEmel, METH_VARARGS }, - { "interrogate_function_has_library_name", &_inPzUjA20Vx, METH_VARARGS }, - { "interrogate_function_library_name", &_inPzUjAKcdW, METH_VARARGS }, - { "interrogate_function_is_virtual", &_inPzUjAhUs9, METH_VARARGS }, - { "interrogate_function_number_of_c_wrappers", &_inPzUjAhF25, METH_VARARGS }, - { "interrogate_function_c_wrapper", &_inPzUjAu1qB, METH_VARARGS }, - { "interrogate_function_number_of_python_wrappers", &_inPzUjAKMkY, METH_VARARGS }, - { "interrogate_function_python_wrapper", &_inPzUjARx9W, METH_VARARGS }, - { "interrogate_wrapper_name", &_inPzUjA0C9G, METH_VARARGS }, - { "interrogate_wrapper_is_callable_by_name", &_inPzUjAhaPp, METH_VARARGS }, - { "interrogate_wrapper_has_comment", &_inPzUjAt_1v, METH_VARARGS }, - { "interrogate_wrapper_comment", &_inPzUjA8KQG, METH_VARARGS }, - { "interrogate_wrapper_has_return_value", &_inPzUjAEtIl, METH_VARARGS }, - { "interrogate_wrapper_return_type", &_inPzUjARFmo, METH_VARARGS }, - { "interrogate_wrapper_caller_manages_return_value", &_inPzUjAWHA0, METH_VARARGS }, - { "interrogate_wrapper_return_value_destructor", &_inPzUjAcyIl, METH_VARARGS }, - { "interrogate_wrapper_number_of_parameters", &_inPzUjABnBv, METH_VARARGS }, - { "interrogate_wrapper_parameter_type", &_inPzUjAUvW7, METH_VARARGS }, - { "interrogate_wrapper_parameter_has_name", &_inPzUjAPdXf, METH_VARARGS }, - { "interrogate_wrapper_parameter_name", &_inPzUjAd0dl, METH_VARARGS }, - { "interrogate_wrapper_parameter_is_this", &_inPzUjAdVbH, METH_VARARGS }, - { "interrogate_wrapper_has_pointer", &_inPzUjABwF0, METH_VARARGS }, - { "interrogate_wrapper_pointer", &_inPzUjA9dPK, METH_VARARGS }, - { "interrogate_wrapper_unique_name", &_inPzUjAhUwR, METH_VARARGS }, - { "interrogate_get_wrapper_by_unique_name", &_inPzUjAA1eF, METH_VARARGS }, - { "interrogate_make_seq_class", &_inPzUjA8pBy, METH_VARARGS }, - { "interrogate_make_seq_seq_name", &_inPzUjA85oW, METH_VARARGS }, - { "interrogate_make_seq_num_name", &_inPzUjAYZz0, METH_VARARGS }, - { "interrogate_make_seq_element_name", &_inPzUjAzKCA, METH_VARARGS }, - { "interrogate_number_of_global_types", &_inPzUjAsxxs, METH_VARARGS }, - { "interrogate_get_global_type", &_inPzUjAMT0z, METH_VARARGS }, - { "interrogate_number_of_types", &_inPzUjAiW3v, METH_VARARGS }, - { "interrogate_get_type", &_inPzUjA4Px8, METH_VARARGS }, - { "interrogate_get_type_by_name", &_inPzUjANHcs, METH_VARARGS }, - { "interrogate_get_type_by_scoped_name", &_inPzUjAqHrb, METH_VARARGS }, - { "interrogate_get_type_by_true_name", &_inPzUjAaOqq, METH_VARARGS }, - { "interrogate_type_name", &_inPzUjAvue5, METH_VARARGS }, - { "interrogate_type_scoped_name", &_inPzUjAB_n_, METH_VARARGS }, - { "interrogate_type_true_name", &_inPzUjADFET, METH_VARARGS }, - { "interrogate_type_is_nested", &_inPzUjAUyNE, METH_VARARGS }, - { "interrogate_type_outer_class", &_inPzUjApDlm, METH_VARARGS }, - { "interrogate_type_has_comment", &_inPzUjAAscF, METH_VARARGS }, - { "interrogate_type_comment", &_inPzUjAYjbU, METH_VARARGS }, - { "interrogate_type_has_module_name", &_inPzUjAWmpU, METH_VARARGS }, - { "interrogate_type_module_name", &_inPzUjAnegH, METH_VARARGS }, - { "interrogate_type_has_library_name", &_inPzUjArrnF, METH_VARARGS }, - { "interrogate_type_library_name", &_inPzUjA7ShX, METH_VARARGS }, - { "interrogate_type_is_atomic", &_inPzUjAx_aO, METH_VARARGS }, - { "interrogate_type_atomic_token", &_inPzUjApofZ, METH_VARARGS }, - { "interrogate_type_is_unsigned", &_inPzUjA2J9C, METH_VARARGS }, - { "interrogate_type_is_signed", &_inPzUjAA6iz, METH_VARARGS }, - { "interrogate_type_is_long", &_inPzUjAa78E, METH_VARARGS }, - { "interrogate_type_is_longlong", &_inPzUjAWD3W, METH_VARARGS }, - { "interrogate_type_is_short", &_inPzUjAYuud, METH_VARARGS }, - { "interrogate_type_is_wrapped", &_inPzUjAlmJS, METH_VARARGS }, - { "interrogate_type_is_pointer", &_inPzUjALlrr, METH_VARARGS }, - { "interrogate_type_is_const", &_inPzUjAw_wy, METH_VARARGS }, - { "interrogate_type_wrapped_type", &_inPzUjAgk_l, METH_VARARGS }, - { "interrogate_type_is_enum", &_inPzUjAXpHY, METH_VARARGS }, - { "interrogate_type_number_of_enum_values", &_inPzUjAHhIg, METH_VARARGS }, - { "interrogate_type_enum_value_name", &_inPzUjAff0T, METH_VARARGS }, - { "interrogate_type_enum_value_scoped_name", &_inPzUjA5PPX, METH_VARARGS }, - { "interrogate_type_enum_value", &_inPzUjAPww5, METH_VARARGS }, - { "interrogate_type_is_struct", &_inPzUjAPke3, METH_VARARGS }, - { "interrogate_type_is_class", &_inPzUjAJmw3, METH_VARARGS }, - { "interrogate_type_is_union", &_inPzUjAR0Lc, METH_VARARGS }, - { "interrogate_type_is_fully_defined", &_inPzUjAc6gE, METH_VARARGS }, - { "interrogate_type_is_unpublished", &_inPzUjA1iT0, METH_VARARGS }, - { "interrogate_type_number_of_constructors", &_inPzUjAz1Mn, METH_VARARGS }, - { "interrogate_type_get_constructor", &_inPzUjAWlf2, METH_VARARGS }, - { "interrogate_type_has_destructor", &_inPzUjA1q8q, METH_VARARGS }, - { "interrogate_type_destructor_is_inherited", &_inPzUjAobo6, METH_VARARGS }, - { "interrogate_type_get_destructor", &_inPzUjAjevK, METH_VARARGS }, - { "interrogate_type_number_of_elements", &_inPzUjAeBpM, METH_VARARGS }, - { "interrogate_type_get_element", &_inPzUjAfmeN, METH_VARARGS }, - { "interrogate_type_number_of_methods", &_inPzUjAKBCl, METH_VARARGS }, - { "interrogate_type_get_method", &_inPzUjA936K, METH_VARARGS }, - { "interrogate_type_number_of_make_seqs", &_inPzUjAPPXQ, METH_VARARGS }, - { "interrogate_type_get_make_seq", &_inPzUjAnu86, METH_VARARGS }, - { "interrogate_type_number_of_casts", &_inPzUjAngiq, METH_VARARGS }, - { "interrogate_type_get_cast", &_inPzUjAUXR0, METH_VARARGS }, - { "interrogate_type_number_of_derivations", &_inPzUjADO7D, METH_VARARGS }, - { "interrogate_type_get_derivation", &_inPzUjAhZFz, METH_VARARGS }, - { "interrogate_type_derivation_has_upcast", &_inPzUjAnKPe, METH_VARARGS }, - { "interrogate_type_get_upcast", &_inPzUjAP3lS, METH_VARARGS }, - { "interrogate_type_derivation_downcast_is_impossible", &_inPzUjAUlLp, METH_VARARGS }, - { "interrogate_type_derivation_has_downcast", &_inPzUjA9Xei, METH_VARARGS }, - { "interrogate_type_get_downcast", &_inPzUjAaGkE, METH_VARARGS }, - { "interrogate_type_number_of_nested_types", &_inPzUjAoe_l, METH_VARARGS }, - { "interrogate_type_get_nested_type", &_inPzUjAuEdH, METH_VARARGS }, + { "interrogate_add_search_directory", &_inPU7VHtbRf, METH_VARARGS }, + { "interrogate_add_search_path", &_inPU7VHda_g, METH_VARARGS }, + { "interrogate_error_flag", &_inPU7VH4RgX, METH_VARARGS }, + { "interrogate_number_of_manifests", &_inPU7VH3Gip, METH_VARARGS }, + { "interrogate_get_manifest", &_inPU7VHRKDz, METH_VARARGS }, + { "interrogate_get_manifest_by_name", &_inPU7VHgZ9N, METH_VARARGS }, + { "interrogate_manifest_name", &_inPU7VHRQIx, METH_VARARGS }, + { "interrogate_manifest_definition", &_inPU7VHGVSj, METH_VARARGS }, + { "interrogate_manifest_has_type", &_inPU7VHznM6, METH_VARARGS }, + { "interrogate_manifest_get_type", &_inPU7VHjiLg, METH_VARARGS }, + { "interrogate_manifest_has_getter", &_inPU7VH_yjE, METH_VARARGS }, + { "interrogate_manifest_getter", &_inPU7VHzK9F, METH_VARARGS }, + { "interrogate_manifest_has_int_value", &_inPU7VHJju_, METH_VARARGS }, + { "interrogate_manifest_get_int_value", &_inPU7VHZktk, METH_VARARGS }, + { "interrogate_element_name", &_inPU7VHG71J, METH_VARARGS }, + { "interrogate_element_scoped_name", &_inPU7VHgeUs, METH_VARARGS }, + { "interrogate_element_has_comment", &_inPU7VH5Gsy, METH_VARARGS }, + { "interrogate_element_comment", &_inPU7VHCSJJ, METH_VARARGS }, + { "interrogate_get_element_by_name", &_inPU7VHkg95, METH_VARARGS }, + { "interrogate_get_element_by_scoped_name", &_inPU7VHluRc, METH_VARARGS }, + { "interrogate_element_type", &_inPU7VHwtTf, METH_VARARGS }, + { "interrogate_element_has_getter", &_inPU7VHrfao, METH_VARARGS }, + { "interrogate_element_getter", &_inPU7VHcedk, METH_VARARGS }, + { "interrogate_element_has_setter", &_inPU7VHXmoo, METH_VARARGS }, + { "interrogate_element_setter", &_inPU7VHclIo, METH_VARARGS }, + { "interrogate_number_of_globals", &_inPU7VHU2_B, METH_VARARGS }, + { "interrogate_get_global", &_inPU7VHHFO2, METH_VARARGS }, + { "interrogate_number_of_global_functions", &_inPU7VHcfjm, METH_VARARGS }, + { "interrogate_get_global_function", &_inPU7VH3Sjw, METH_VARARGS }, + { "interrogate_number_of_functions", &_inPU7VHgJcX, METH_VARARGS }, + { "interrogate_get_function", &_inPU7VHYlw6, METH_VARARGS }, + { "interrogate_function_name", &_inPU7VH3gns, METH_VARARGS }, + { "interrogate_function_scoped_name", &_inPU7VHN968, METH_VARARGS }, + { "interrogate_function_has_comment", &_inPU7VHFJVJ, METH_VARARGS }, + { "interrogate_function_comment", &_inPU7VHndTW, METH_VARARGS }, + { "interrogate_function_prototype", &_inPU7VHpjWj, METH_VARARGS }, + { "interrogate_function_is_method", &_inPU7VHNcQW, METH_VARARGS }, + { "interrogate_function_class", &_inPU7VHP_SX, METH_VARARGS }, + { "interrogate_function_has_module_name", &_inPU7VH1iRq, METH_VARARGS }, + { "interrogate_function_module_name", &_inPU7VHEmel, METH_VARARGS }, + { "interrogate_function_has_library_name", &_inPU7VH20Vx, METH_VARARGS }, + { "interrogate_function_library_name", &_inPU7VHKcdW, METH_VARARGS }, + { "interrogate_function_is_virtual", &_inPU7VHhUs9, METH_VARARGS }, + { "interrogate_function_number_of_c_wrappers", &_inPU7VHhF25, METH_VARARGS }, + { "interrogate_function_c_wrapper", &_inPU7VHu1qB, METH_VARARGS }, + { "interrogate_function_number_of_python_wrappers", &_inPU7VHKMkY, METH_VARARGS }, + { "interrogate_function_python_wrapper", &_inPU7VHRx9W, METH_VARARGS }, + { "interrogate_wrapper_name", &_inPU7VH0C9G, METH_VARARGS }, + { "interrogate_wrapper_is_callable_by_name", &_inPU7VHhaPp, METH_VARARGS }, + { "interrogate_wrapper_has_comment", &_inPU7VHt_1v, METH_VARARGS }, + { "interrogate_wrapper_comment", &_inPU7VH8KQG, METH_VARARGS }, + { "interrogate_wrapper_has_return_value", &_inPU7VHEtIl, METH_VARARGS }, + { "interrogate_wrapper_return_type", &_inPU7VHRFmo, METH_VARARGS }, + { "interrogate_wrapper_caller_manages_return_value", &_inPU7VHWHA0, METH_VARARGS }, + { "interrogate_wrapper_return_value_destructor", &_inPU7VHcyIl, METH_VARARGS }, + { "interrogate_wrapper_number_of_parameters", &_inPU7VHBnBv, METH_VARARGS }, + { "interrogate_wrapper_parameter_type", &_inPU7VHUvW7, METH_VARARGS }, + { "interrogate_wrapper_parameter_has_name", &_inPU7VHPdXf, METH_VARARGS }, + { "interrogate_wrapper_parameter_name", &_inPU7VHd0dl, METH_VARARGS }, + { "interrogate_wrapper_parameter_is_this", &_inPU7VHdVbH, METH_VARARGS }, + { "interrogate_wrapper_has_pointer", &_inPU7VHBwF0, METH_VARARGS }, + { "interrogate_wrapper_pointer", &_inPU7VH9dPK, METH_VARARGS }, + { "interrogate_wrapper_unique_name", &_inPU7VHhUwR, METH_VARARGS }, + { "interrogate_get_wrapper_by_unique_name", &_inPU7VHA1eF, METH_VARARGS }, + { "interrogate_make_seq_class", &_inPU7VH8pBy, METH_VARARGS }, + { "interrogate_make_seq_seq_name", &_inPU7VH85oW, METH_VARARGS }, + { "interrogate_make_seq_num_name", &_inPU7VHYZz0, METH_VARARGS }, + { "interrogate_make_seq_element_name", &_inPU7VHzKCA, METH_VARARGS }, + { "interrogate_number_of_global_types", &_inPU7VHsxxs, METH_VARARGS }, + { "interrogate_get_global_type", &_inPU7VHMT0z, METH_VARARGS }, + { "interrogate_number_of_types", &_inPU7VHiW3v, METH_VARARGS }, + { "interrogate_get_type", &_inPU7VH4Px8, METH_VARARGS }, + { "interrogate_get_type_by_name", &_inPU7VHNHcs, METH_VARARGS }, + { "interrogate_get_type_by_scoped_name", &_inPU7VHqHrb, METH_VARARGS }, + { "interrogate_get_type_by_true_name", &_inPU7VHaOqq, METH_VARARGS }, + { "interrogate_type_name", &_inPU7VHvue5, METH_VARARGS }, + { "interrogate_type_scoped_name", &_inPU7VHB_n_, METH_VARARGS }, + { "interrogate_type_true_name", &_inPU7VHDFET, METH_VARARGS }, + { "interrogate_type_is_nested", &_inPU7VHUyNE, METH_VARARGS }, + { "interrogate_type_outer_class", &_inPU7VHpDlm, METH_VARARGS }, + { "interrogate_type_has_comment", &_inPU7VHAscF, METH_VARARGS }, + { "interrogate_type_comment", &_inPU7VHYjbU, METH_VARARGS }, + { "interrogate_type_has_module_name", &_inPU7VHWmpU, METH_VARARGS }, + { "interrogate_type_module_name", &_inPU7VHnegH, METH_VARARGS }, + { "interrogate_type_has_library_name", &_inPU7VHrrnF, METH_VARARGS }, + { "interrogate_type_library_name", &_inPU7VH7ShX, METH_VARARGS }, + { "interrogate_type_is_atomic", &_inPU7VHx_aO, METH_VARARGS }, + { "interrogate_type_atomic_token", &_inPU7VHpofZ, METH_VARARGS }, + { "interrogate_type_is_unsigned", &_inPU7VH2J9C, METH_VARARGS }, + { "interrogate_type_is_signed", &_inPU7VHA6iz, METH_VARARGS }, + { "interrogate_type_is_long", &_inPU7VHa78E, METH_VARARGS }, + { "interrogate_type_is_longlong", &_inPU7VHWD3W, METH_VARARGS }, + { "interrogate_type_is_short", &_inPU7VHYuud, METH_VARARGS }, + { "interrogate_type_is_wrapped", &_inPU7VHlmJS, METH_VARARGS }, + { "interrogate_type_is_pointer", &_inPU7VHLlrr, METH_VARARGS }, + { "interrogate_type_is_const", &_inPU7VHw_wy, METH_VARARGS }, + { "interrogate_type_wrapped_type", &_inPU7VHgk_l, METH_VARARGS }, + { "interrogate_type_is_enum", &_inPU7VHXpHY, METH_VARARGS }, + { "interrogate_type_number_of_enum_values", &_inPU7VHHhIg, METH_VARARGS }, + { "interrogate_type_enum_value_name", &_inPU7VHff0T, METH_VARARGS }, + { "interrogate_type_enum_value_scoped_name", &_inPU7VH5PPX, METH_VARARGS }, + { "interrogate_type_enum_value_comment", &_inPU7VHCIt5, METH_VARARGS }, + { "interrogate_type_enum_value", &_inPU7VHPww5, METH_VARARGS }, + { "interrogate_type_is_struct", &_inPU7VHPke3, METH_VARARGS }, + { "interrogate_type_is_class", &_inPU7VHJmw3, METH_VARARGS }, + { "interrogate_type_is_union", &_inPU7VHR0Lc, METH_VARARGS }, + { "interrogate_type_is_fully_defined", &_inPU7VHc6gE, METH_VARARGS }, + { "interrogate_type_is_unpublished", &_inPU7VH1iT0, METH_VARARGS }, + { "interrogate_type_number_of_constructors", &_inPU7VHz1Mn, METH_VARARGS }, + { "interrogate_type_get_constructor", &_inPU7VHWlf2, METH_VARARGS }, + { "interrogate_type_has_destructor", &_inPU7VH1q8q, METH_VARARGS }, + { "interrogate_type_destructor_is_inherited", &_inPU7VHobo6, METH_VARARGS }, + { "interrogate_type_get_destructor", &_inPU7VHjevK, METH_VARARGS }, + { "interrogate_type_number_of_elements", &_inPU7VHeBpM, METH_VARARGS }, + { "interrogate_type_get_element", &_inPU7VHfmeN, METH_VARARGS }, + { "interrogate_type_number_of_methods", &_inPU7VHKBCl, METH_VARARGS }, + { "interrogate_type_get_method", &_inPU7VH936K, METH_VARARGS }, + { "interrogate_type_number_of_make_seqs", &_inPU7VHPPXQ, METH_VARARGS }, + { "interrogate_type_get_make_seq", &_inPU7VHnu86, METH_VARARGS }, + { "interrogate_type_number_of_casts", &_inPU7VHngiq, METH_VARARGS }, + { "interrogate_type_get_cast", &_inPU7VHUXR0, METH_VARARGS }, + { "interrogate_type_number_of_derivations", &_inPU7VHDO7D, METH_VARARGS }, + { "interrogate_type_get_derivation", &_inPU7VHhZFz, METH_VARARGS }, + { "interrogate_type_derivation_has_upcast", &_inPU7VHnKPe, METH_VARARGS }, + { "interrogate_type_get_upcast", &_inPU7VHP3lS, METH_VARARGS }, + { "interrogate_type_derivation_downcast_is_impossible", &_inPU7VHUlLp, METH_VARARGS }, + { "interrogate_type_derivation_has_downcast", &_inPU7VH9Xei, METH_VARARGS }, + { "interrogate_type_get_downcast", &_inPU7VHaGkE, METH_VARARGS }, + { "interrogate_type_number_of_nested_types", &_inPU7VHoe_l, METH_VARARGS }, + { "interrogate_type_get_nested_type", &_inPU7VHuEdH, METH_VARARGS }, { NULL, NULL } }; #if PY_MAJOR_VERSION >= 3 static struct PyModuleDef python_simple_module = { PyModuleDef_HEAD_INIT, - "libp3dtoolconfig", + "dtoolconfig", NULL, -1, python_simple_funcs, NULL, NULL, NULL, NULL }; -#define INIT_FUNC PyObject *PyInit_libp3dtoolconfig +#define INIT_FUNC PyObject *PyInit_dtoolconfig #else -#define INIT_FUNC void initlibp3dtoolconfig +#define INIT_FUNC void initdtoolconfig #endif #ifdef _WIN32 @@ -2427,7 +2481,7 @@ INIT_FUNC() { #if PY_MAJOR_VERSION >= 3 return PyModule_Create(&python_simple_module); #else - Py_InitModule("libp3dtoolconfig", python_simple_funcs); + Py_InitModule("dtoolconfig", python_simple_funcs); #endif } diff --git a/dtool/src/cppparser/cppBison.yxx b/dtool/src/cppparser/cppBison.yxx index 5a166ad8ae..238c4f578b 100644 --- a/dtool/src/cppparser/cppBison.yxx +++ b/dtool/src/cppparser/cppBison.yxx @@ -1857,32 +1857,34 @@ named_enum: } ; -enum_body: +enum_body_trailing_comma: empty - | enum_body_no_trailing_comma - | enum_body_no_trailing_comma ',' - ; + | enum_body_trailing_comma name ',' +{ + assert(current_enum != NULL); + CPPInstance *inst = current_enum->add_element($2->get_simple_name()); + current_scope->add_enum_value(inst, current_lexer, @2); +} + | enum_body_trailing_comma name '=' const_expr ',' +{ + assert(current_enum != NULL); + CPPInstance *inst = current_enum->add_element($2->get_simple_name(), $4); + current_scope->add_enum_value(inst, current_lexer, @2); +}; -enum_body_no_trailing_comma: - name +enum_body: + enum_body_trailing_comma + | enum_body_trailing_comma name { assert(current_enum != NULL); - current_enum->add_element($1->get_simple_name(), current_scope); + CPPInstance *inst = current_enum->add_element($2->get_simple_name()); + current_scope->add_enum_value(inst, current_lexer, @2); } - | name '=' const_expr + | enum_body_trailing_comma name '=' const_expr { assert(current_enum != NULL); - current_enum->add_element($1->get_simple_name(), current_scope, $3); -} - | enum_body_no_trailing_comma ',' name -{ - assert(current_enum != NULL); - current_enum->add_element($3->get_simple_name(), current_scope); -} - | enum_body_no_trailing_comma ',' name '=' const_expr -{ - assert(current_enum != NULL); - current_enum->add_element($3->get_simple_name(), current_scope, $5); + CPPInstance *inst = current_enum->add_element($2->get_simple_name(), $4); + current_scope->add_enum_value(inst, current_lexer, @2); } ; diff --git a/dtool/src/cppparser/cppEnumType.cxx b/dtool/src/cppparser/cppEnumType.cxx index 35b24ab4b3..216d8a7abb 100644 --- a/dtool/src/cppparser/cppEnumType.cxx +++ b/dtool/src/cppparser/cppEnumType.cxx @@ -38,8 +38,8 @@ CPPEnumType(CPPIdentifier *ident, CPPScope *current_scope, // Access: Public // Description: //////////////////////////////////////////////////////////////////// -void CPPEnumType:: -add_element(const string &name, CPPScope *scope, CPPExpression *value) { +CPPInstance *CPPEnumType:: +add_element(const string &name, CPPExpression *value) { CPPType *type = CPPType::new_type(new CPPSimpleType(CPPSimpleType::T_int, CPPSimpleType::F_unsigned)); @@ -47,7 +47,7 @@ add_element(const string &name, CPPScope *scope, CPPExpression *value) { CPPInstance *inst = new CPPInstance(type, ident); inst->_initializer = value; _elements.push_back(inst); - scope->add_enum_value(inst); + return inst; } //////////////////////////////////////////////////////////////////// diff --git a/dtool/src/cppparser/cppEnumType.h b/dtool/src/cppparser/cppEnumType.h index 207b25342e..e559eb7b53 100644 --- a/dtool/src/cppparser/cppEnumType.h +++ b/dtool/src/cppparser/cppEnumType.h @@ -35,8 +35,8 @@ public: CPPEnumType(CPPIdentifier *ident, CPPScope *current_scope, const CPPFile &file); - void add_element(const string &name, CPPScope *scope, - CPPExpression *value = (CPPExpression *)NULL); + CPPInstance *add_element(const string &name, + CPPExpression *value = (CPPExpression *)NULL); virtual bool is_incomplete() const; diff --git a/dtool/src/cppparser/cppPreprocessor.cxx b/dtool/src/cppparser/cppPreprocessor.cxx index d0ed51f9b9..474063e4a7 100644 --- a/dtool/src/cppparser/cppPreprocessor.cxx +++ b/dtool/src/cppparser/cppPreprocessor.cxx @@ -528,6 +528,34 @@ get_comment_before(int line, CPPFile file) { return (CPPCommentBlock *)NULL; } +//////////////////////////////////////////////////////////////////// +// Function: CPPPreprocessor::get_comment_on +// Access: Public +// Description: Returns the CPPCommentBlock that starts on the +// indicated line, if any. If there is no such +// comment, returns NULL. +//////////////////////////////////////////////////////////////////// +CPPCommentBlock *CPPPreprocessor:: +get_comment_on(int line, CPPFile file) { + CPPComments::reverse_iterator ci; + ci = _comments.rbegin(); + + while (ci != _comments.rend()) { + CPPCommentBlock *comment = (*ci); + if (comment->_file == file) { + if (comment->_line_number == line) { + return comment; + } else if (comment->_line_number < line) { + return (CPPCommentBlock *)NULL; + } + } + + ++ci; + } + + return (CPPCommentBlock *)NULL; +} + //////////////////////////////////////////////////////////////////// // Function: CPPPreprocessor::init_cpp // Access: Protected @@ -891,6 +919,10 @@ internal_get_next_token() { } } + // We skip whitespace here again, so that we can read any comments + // after this point before we parse this line. + _last_c = skip_whitespace(_last_c); + return CPPToken(c, first_line, first_col, first_file); } @@ -1019,11 +1051,19 @@ skip_cpp_comment(int c) { if (_save_comments) { CPPCommentBlock *comment; - if (_last_cpp_comment) { + int line_number = get_line_number(); + if (c == '\n') { + // We have to subtract one from the line number as we just + // fetched a newline. + --line_number; + } + + if (_last_cpp_comment && !_comments.empty() && + _comments.back()->_last_line >= line_number - 1) { // If the last non-whitespace character read was also part of a // C++ comment, then this is just a continuation of that comment - // block. - assert(!_comments.empty()); + // block. However, if there was a line without comment in between, + // it starts a new block anyway. comment = _comments.back(); assert(!comment->_c_style); comment->_comment += "//"; @@ -1033,8 +1073,8 @@ skip_cpp_comment(int c) { comment = new CPPCommentBlock; comment->_file = get_file(); - comment->_line_number = get_line_number(); - comment->_last_line = get_line_number(); + comment->_line_number = line_number; + comment->_last_line = line_number; comment->_col_number = get_col_number() - 2; comment->_c_style = false; comment->_comment = "//"; @@ -1048,7 +1088,7 @@ skip_cpp_comment(int c) { } comment->_comment += '\n'; - comment->_last_line = get_line_number(); + comment->_last_line = line_number; _last_cpp_comment = true; diff --git a/dtool/src/cppparser/cppPreprocessor.h b/dtool/src/cppparser/cppPreprocessor.h index 48a9dafa0b..34647193c8 100644 --- a/dtool/src/cppparser/cppPreprocessor.h +++ b/dtool/src/cppparser/cppPreprocessor.h @@ -64,6 +64,7 @@ public: CPPFile file = CPPFile()); CPPCommentBlock *get_comment_before(int line, CPPFile file); + CPPCommentBlock *get_comment_on(int line, CPPFile file); int get_warning_count() const; int get_error_count() const; @@ -75,7 +76,7 @@ public: DSearchPath _quote_include_path; DSearchPath _angle_include_path; bool _noangles; - + CPPComments _comments; typedef set ParsedFiles; diff --git a/dtool/src/cppparser/cppScope.cxx b/dtool/src/cppparser/cppScope.cxx index 802c7dfafe..eb8008583b 100644 --- a/dtool/src/cppparser/cppScope.cxx +++ b/dtool/src/cppparser/cppScope.cxx @@ -145,9 +145,21 @@ add_declaration(CPPDeclaration *decl, CPPScope *global_scope, // Description: //////////////////////////////////////////////////////////////////// void CPPScope:: -add_enum_value(CPPInstance *inst) { +add_enum_value(CPPInstance *inst, CPPPreprocessor *preprocessor, + const cppyyltype &pos) { inst->_vis = _current_vis; + if (inst->_leading_comment == (CPPCommentBlock *)NULL) { + // Same-line comment? + inst->_leading_comment = + preprocessor->get_comment_on(pos.first_line, pos.file); + + if (inst->_leading_comment == (CPPCommentBlock *)NULL) { + inst->_leading_comment = + preprocessor->get_comment_before(pos.first_line, pos.file); + } + } + string name = inst->get_simple_name(); if (!name.empty()) { _enum_values[name] = inst; diff --git a/dtool/src/cppparser/cppScope.h b/dtool/src/cppparser/cppScope.h index 850972a5e4..324eb91766 100644 --- a/dtool/src/cppparser/cppScope.h +++ b/dtool/src/cppparser/cppScope.h @@ -63,7 +63,9 @@ public: virtual void add_declaration(CPPDeclaration *decl, CPPScope *global_scope, CPPPreprocessor *preprocessor, const cppyyltype &pos); - virtual void add_enum_value(CPPInstance *inst); + virtual void add_enum_value(CPPInstance *inst, + CPPPreprocessor *preprocessor, + const cppyyltype &pos); virtual void define_extension_type(CPPExtensionType *type); virtual void define_namespace(CPPNamespace *scope); virtual void add_using(CPPUsing *using_decl, CPPScope *global_scope, diff --git a/dtool/src/cppparser/cppTemplateScope.cxx b/dtool/src/cppparser/cppTemplateScope.cxx index 24ed3818b1..e4b6f5a922 100644 --- a/dtool/src/cppparser/cppTemplateScope.cxx +++ b/dtool/src/cppparser/cppTemplateScope.cxx @@ -51,10 +51,11 @@ add_declaration(CPPDeclaration *decl, CPPScope *global_scope, // Description: //////////////////////////////////////////////////////////////////// void CPPTemplateScope:: -add_enum_value(CPPInstance *inst) { +add_enum_value(CPPInstance *inst, CPPPreprocessor *preprocessor, + const cppyyltype &pos) { inst->_template_scope = this; assert(_parent_scope != NULL); - _parent_scope->add_enum_value(inst); + _parent_scope->add_enum_value(inst, preprocessor, pos); } //////////////////////////////////////////////////////////////////// diff --git a/dtool/src/cppparser/cppTemplateScope.h b/dtool/src/cppparser/cppTemplateScope.h index b504aece1e..40a7feb74c 100644 --- a/dtool/src/cppparser/cppTemplateScope.h +++ b/dtool/src/cppparser/cppTemplateScope.h @@ -36,7 +36,9 @@ public: virtual void add_declaration(CPPDeclaration *decl, CPPScope *global_scope, CPPPreprocessor *preprocessor, const cppyyltype &pos); - virtual void add_enum_value(CPPInstance *inst); + virtual void add_enum_value(CPPInstance *inst, + CPPPreprocessor *preprocessor, + const cppyyltype &pos); virtual void define_extension_type(CPPExtensionType *type); virtual void define_namespace(CPPNamespace *scope); virtual void add_using(CPPUsing *using_decl, CPPScope *global_scope, diff --git a/dtool/src/interrogate/interfaceMakerPython.cxx b/dtool/src/interrogate/interfaceMakerPython.cxx index 213966c900..a9f8227dce 100644 --- a/dtool/src/interrogate/interfaceMakerPython.cxx +++ b/dtool/src/interrogate/interfaceMakerPython.cxx @@ -36,7 +36,8 @@ InterfaceMakerPython(InterrogateModuleDef *def) : void InterfaceMakerPython:: write_includes(ostream &out) { InterfaceMaker::write_includes(out); - out << "#undef _POSIX_C_SOURCE\n\n" + out << "#undef _POSIX_C_SOURCE\n" + << "#define PY_SSIZE_T_CLEAN 1\n\n" << "#if PYTHON_FRAMEWORK\n" << " #include \"Python/Python.h\"\n" << "#else\n" diff --git a/dtool/src/interrogate/interfaceMakerPythonObj.cxx b/dtool/src/interrogate/interfaceMakerPythonObj.cxx index 497d506cdc..9081c435bd 100644 --- a/dtool/src/interrogate/interfaceMakerPythonObj.cxx +++ b/dtool/src/interrogate/interfaceMakerPythonObj.cxx @@ -360,21 +360,21 @@ write_function_instance(ostream &out, int indent_level, CPPType *orig_type = remap->_parameters[pn]._remap->get_orig_type(); CPPType *type = remap->_parameters[pn]._remap->get_new_type(); string param_name = remap->get_parameter_name(pn); - + // This is the string to convert our local variable to the // appropriate C++ type. Normally this is just a cast. string pexpr_string = "(" + type->get_local_name(&parser) + ")" + param_name; - + if (remap->_parameters[pn]._remap->new_type_is_atomic_string()) { if (TypeManager::is_char_pointer(orig_type)) { out << "char *" << param_name; format_specifiers += "s"; parameter_list += ", &" + param_name; - + } else { out << "char *" << param_name - << "_str; int " << param_name << "_len"; + << "_str; Py_ssize_t " << param_name << "_len"; format_specifiers += "s#"; parameter_list += ", &" + param_name + "_str, &" + param_name + "_len"; @@ -383,7 +383,7 @@ write_function_instance(ostream &out, int indent_level, param_name + "_len)"; } expected_params += "string"; - + } else if (TypeManager::is_bool(type)) { out << "PyObject *" << param_name; format_specifiers += "O"; diff --git a/dtool/src/interrogate/interfaceMakerPythonSimple.cxx b/dtool/src/interrogate/interfaceMakerPythonSimple.cxx index 6709c8e399..d6e0684db7 100644 --- a/dtool/src/interrogate/interfaceMakerPythonSimple.cxx +++ b/dtool/src/interrogate/interfaceMakerPythonSimple.cxx @@ -270,21 +270,21 @@ void InterfaceMakerPythonSimple::write_function_instance(ostream &out, Interface CPPType *orig_type = remap->_parameters[pn]._remap->get_orig_type(); CPPType *type = remap->_parameters[pn]._remap->get_new_type(); string param_name = remap->get_parameter_name(pn); - + // This is the string to convert our local variable to the // appropriate C++ type. Normally this is just a cast. string pexpr_string = "(" + type->get_local_name(&parser) + ")" + param_name; - + if (remap->_parameters[pn]._remap->new_type_is_atomic_string()) { if (TypeManager::is_char_pointer(orig_type)) { out << "char *" << param_name; format_specifiers += "s"; parameter_list += ", &" + param_name; - + } else if (TypeManager::is_wstring(orig_type)) { out << "Py_UNICODE *" << param_name - << "_str; int " << param_name << "_len"; + << "_str; Py_ssize_t " << param_name << "_len"; format_specifiers += "u#"; parameter_list += ", &" + param_name + "_str, &" + param_name + "_len"; @@ -294,7 +294,7 @@ void InterfaceMakerPythonSimple::write_function_instance(ostream &out, Interface } else { out << "char *" << param_name - << "_str; int " << param_name << "_len"; + << "_str; Py_ssize_t " << param_name << "_len"; format_specifiers += "s#"; parameter_list += ", &" + param_name + "_str, &" + param_name + "_len"; @@ -302,7 +302,7 @@ void InterfaceMakerPythonSimple::write_function_instance(ostream &out, Interface param_name + "_str, " + param_name + "_len)"; } - + } else if (TypeManager::is_bool(type)) { out << "PyObject *" << param_name; format_specifiers += "O"; diff --git a/dtool/src/interrogate/interrogateBuilder.cxx b/dtool/src/interrogate/interrogateBuilder.cxx index a064c00590..a752e2b67c 100644 --- a/dtool/src/interrogate/interrogateBuilder.cxx +++ b/dtool/src/interrogate/interrogateBuilder.cxx @@ -1358,7 +1358,7 @@ scan_element(CPPInstance *element, CPPStructType *struct_type, ielement._name = element->get_local_name(scope); ielement._scoped_name = descope(element->get_local_name(&parser)); - // See if there happens to be a comment before the MAKE_PROPERTY macro. + // See if there happens to be a comment before the element. if (element->_leading_comment != (CPPCommentBlock *)NULL) { ielement._comment = trim_blanks(element->_leading_comment->_comment); } @@ -1838,7 +1838,7 @@ get_make_property(CPPMakeProperty *make_property, CPPStructType *struct_type) { iproperty._getter = get_function(getter, "", struct_type, struct_type->get_scope(), 0); - // See if there happens to be a comment before the element. + // See if there happens to be a comment before the MAKE_PROPERTY macro. if (make_property->_leading_comment != (CPPCommentBlock *)NULL) { iproperty._comment = trim_blanks(make_property->_leading_comment->_comment); } @@ -2661,6 +2661,10 @@ define_enum_type(InterrogateType &itype, CPPEnumType *cpptype) { evalue._name = element->get_simple_name(); evalue._scoped_name = descope(element->get_local_name(&parser)); + if (element->_leading_comment != (CPPCommentBlock *)NULL) { + evalue._comment = trim_blanks(element->_leading_comment->_comment); + } + if (element->_initializer != (CPPExpression *)NULL) { CPPExpression::Result result = element->_initializer->evaluate(); next_value = result.as_integer(); diff --git a/dtool/src/interrogatedb/interrogateType.I b/dtool/src/interrogatedb/interrogateType.I index 4c31cd18b7..681efc39e9 100644 --- a/dtool/src/interrogatedb/interrogateType.I +++ b/dtool/src/interrogatedb/interrogateType.I @@ -263,6 +263,19 @@ get_enum_value_scoped_name(int n) const { return _empty_string; } +//////////////////////////////////////////////////////////////////// +// Function: InterrogateType::get_enum_value_comment +// Access: Public +// Description: +//////////////////////////////////////////////////////////////////// +INLINE const string &InterrogateType:: +get_enum_value_comment(int n) const { + if (n >= 0 && n < (int)_enum_values.size()) { + return _enum_values[n]._comment; + } + return _empty_string; +} + //////////////////////////////////////////////////////////////////// // Function: InterrogateType::get_enum_value // Access: Public diff --git a/dtool/src/interrogatedb/interrogateType.cxx b/dtool/src/interrogatedb/interrogateType.cxx index 2e31feb884..2f79dddce2 100644 --- a/dtool/src/interrogatedb/interrogateType.cxx +++ b/dtool/src/interrogatedb/interrogateType.cxx @@ -15,6 +15,7 @@ #include "interrogateType.h" #include "indexRemapper.h" #include "interrogate_datafile.h" +#include "interrogateDatabase.h" #include @@ -76,6 +77,7 @@ void InterrogateType::EnumValue:: output(ostream &out) const { idf_output_string(out, _name); idf_output_string(out, _scoped_name); + idf_output_string(out, _comment, '\n'); out << _value; } @@ -88,6 +90,9 @@ void InterrogateType::EnumValue:: input(istream &in) { idf_input_string(in, _name); idf_input_string(in, _scoped_name); + if (InterrogateDatabase::get_file_minor_version() >= 3) { + idf_input_string(in, _comment); + } in >> _value; } diff --git a/dtool/src/interrogatedb/interrogateType.h b/dtool/src/interrogatedb/interrogateType.h index a96f6e7d37..bcdd6ce2bb 100644 --- a/dtool/src/interrogatedb/interrogateType.h +++ b/dtool/src/interrogatedb/interrogateType.h @@ -66,6 +66,7 @@ public: INLINE int number_of_enum_values() const; INLINE const string &get_enum_value_name(int n) const; INLINE const string &get_enum_value_scoped_name(int n) const; + INLINE const string &get_enum_value_comment(int n) const; INLINE int get_enum_value(int n) const; INLINE bool is_struct() const; @@ -189,6 +190,7 @@ public: string _name; string _scoped_name; + string _comment; int _value; }; diff --git a/dtool/src/interrogatedb/interrogate_interface.cxx b/dtool/src/interrogatedb/interrogate_interface.cxx index cfa6639a92..2595a2a751 100644 --- a/dtool/src/interrogatedb/interrogate_interface.cxx +++ b/dtool/src/interrogatedb/interrogate_interface.cxx @@ -120,6 +120,18 @@ interrogate_element_scoped_name(ElementIndex element) { return InterrogateDatabase::get_ptr()->get_element(element).get_scoped_name().c_str(); } +bool +interrogate_element_has_comment(ElementIndex element) { + //cerr << "interrogate_element_has_comment(" << element << ")\n"; + return InterrogateDatabase::get_ptr()->get_element(element).has_comment(); +} + +const char * +interrogate_element_comment(ElementIndex element) { + //cerr << "interrogate_element_comment(" << element << ")\n"; + return InterrogateDatabase::get_ptr()->get_element(element).get_comment().c_str(); +} + ElementIndex interrogate_get_element_by_name(const char *element_name) { //cerr << "interrogate_get_element_by_name(" << element_name << ")\n"; @@ -631,6 +643,12 @@ interrogate_type_enum_value_scoped_name(TypeIndex type, int n) { return InterrogateDatabase::get_ptr()->get_type(type).get_enum_value_scoped_name(n).c_str(); } +const char * +interrogate_type_enum_value_comment(TypeIndex type, int n) { + //cerr << "interrogate_type_enum_value_comment(" << type << ", " << n << ")\n"; + return InterrogateDatabase::get_ptr()->get_type(type).get_enum_value_comment(n).c_str(); +} + int interrogate_type_enum_value(TypeIndex type, int n) { //cerr << "interrogate_type_enum_value(" << type << ", " << n << ")\n"; diff --git a/dtool/src/interrogatedb/interrogate_interface.h b/dtool/src/interrogatedb/interrogate_interface.h index 148eb71bc9..5d5352721a 100644 --- a/dtool/src/interrogatedb/interrogate_interface.h +++ b/dtool/src/interrogatedb/interrogate_interface.h @@ -138,6 +138,8 @@ EXPCL_DTOOLCONFIG int interrogate_manifest_get_int_value(ManifestIndex manifest) EXPCL_DTOOLCONFIG const char *interrogate_element_name(ElementIndex element); EXPCL_DTOOLCONFIG const char *interrogate_element_scoped_name(ElementIndex element); +EXPCL_DTOOLCONFIG bool interrogate_element_has_comment(ElementIndex element); +EXPCL_DTOOLCONFIG const char *interrogate_element_comment(ElementIndex element); EXPCL_DTOOLCONFIG ElementIndex interrogate_get_element_by_name(const char *element_name); EXPCL_DTOOLCONFIG ElementIndex interrogate_get_element_by_scoped_name(const char *element_name); @@ -454,6 +456,7 @@ EXPCL_DTOOLCONFIG bool interrogate_type_is_enum(TypeIndex type); EXPCL_DTOOLCONFIG int interrogate_type_number_of_enum_values(TypeIndex type); EXPCL_DTOOLCONFIG const char *interrogate_type_enum_value_name(TypeIndex type, int n); EXPCL_DTOOLCONFIG const char *interrogate_type_enum_value_scoped_name(TypeIndex type, int n); +EXPCL_DTOOLCONFIG const char *interrogate_type_enum_value_comment(TypeIndex type, int n); EXPCL_DTOOLCONFIG int interrogate_type_enum_value(TypeIndex type, int n); // If none of the above is true, the type is some extension type. It