TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-30 08:44:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

interrogate: use range for in various places for code cleanliness

Browse Source
This commit is contained in:
rdb 2018-06-30 17:18:14 +02:00
parent 371e60c768
commit c03a75d755
1 changed files with 53 additions and 146 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

199
dtool/src/interrogate/interfaceMakerPythonNative.cxx
View File

@ -673,12 +673,7 @@ get_valid_child_classes(std::map<std::string, CastDetails> &answer, CPPStructTyp
return; return;
} }
CPPStructType::Derivation::const_iterator bi; for (const CPPStructType::Base &base : inclass->_derivation) {
for (bi = inclass->_derivation.begin();
bi != inclass->_derivation.end();
++bi) {
const CPPStructType::Base &base = (*bi);
// if (base._vis <= V_public) can_downcast = false; // if (base._vis <= V_public) can_downcast = false;
CPPStructType *base_type = TypeManager::resolve_type(base._base)->as_struct_type(); CPPStructType *base_type = TypeManager::resolve_type(base._base)->as_struct_type();
if (base_type != nullptr) { if (base_type != nullptr) {
@ -801,11 +796,10 @@ write_prototypes(ostream &out_code, ostream *out_h) {
} }
/* /*
for (fi = _functions.begin(); fi != _functions.end(); ++fi) for (Function *func : _functions) {
{ if (!func->_itype.is_global() && is_function_legal(func)) {
Function *func = (*fi); write_prototype_for(out_code, func);
if (!func->_itype.is_global() && is_function_legal(func)) }
write_prototype_for (out_code, func);
} }
*/ */
@ -828,8 +822,7 @@ write_prototypes(ostream &out_code, ostream *out_h) {
out_code << " * Extern declarations for imported classes\n"; out_code << " * Extern declarations for imported classes\n";
out_code << " */\n"; out_code << " */\n";
for (std::set<CPPType *>::iterator ii = _external_imports.begin(); ii != _external_imports.end(); ii++) { for (CPPType *type : _external_imports) {
CPPType *type = (*ii);
string class_name = type->get_local_name(&parser); string class_name = type->get_local_name(&parser);
string safe_name = make_safe_name(class_name); string safe_name = make_safe_name(class_name);
@ -926,15 +919,13 @@ write_prototypes_class(ostream &out_code, ostream *out_h, Object *obj) {
out_code << " */\n"; out_code << " */\n";
/* /*
for (fi = obj->_methods.begin(); fi != obj->_methods.end(); ++fi) { for (Function *func : obj->_methods) {
Function *func = (*fi);
write_prototype_for(out_code, func); write_prototype_for(out_code, func);
} }
*/ */
/* /*
for (fi = obj->_constructors.begin(); fi != obj->_constructors.end(); ++fi) { for (Function *func : obj->_constructors) {
Function *func = (*fi);
std::string fname = "int Dtool_Init_" + ClassName + "(PyObject *self, PyObject *args, PyObject *kwds)"; std::string fname = "int Dtool_Init_" + ClassName + "(PyObject *self, PyObject *args, PyObject *kwds)";
write_prototype_for_name(out_code, obj, func, fname); write_prototype_for_name(out_code, obj, func, fname);
} }
@ -993,9 +984,6 @@ write_functions(ostream &out) {
*/ */
void InterfaceMakerPythonNative:: void InterfaceMakerPythonNative::
write_class_details(ostream &out, Object *obj) { write_class_details(ostream &out, Object *obj) {
Functions::iterator fi;
Function::Remaps::const_iterator ri;
// std::string cClassName = obj->_itype.get_scoped_name(); // std::string cClassName = obj->_itype.get_scoped_name();
std::string ClassName = make_safe_name(obj->_itype.get_scoped_name()); std::string ClassName = make_safe_name(obj->_itype.get_scoped_name());
std::string cClassName = obj->_itype.get_true_name(); std::string cClassName = obj->_itype.get_true_name();
@ -1005,8 +993,7 @@ write_class_details(ostream &out, Object *obj) {
out << " */\n"; out << " */\n";
// First write out all the wrapper functions for the methods. // First write out all the wrapper functions for the methods.
for (fi = obj->_methods.begin(); fi != obj->_methods.end(); ++fi) { for (Function *func : obj->_methods) {
Function *func = (*fi);
if (func) { if (func) {
// Write the definition of the generic wrapper function for this // Write the definition of the generic wrapper function for this
// function. // function.
@ -1015,18 +1002,13 @@ write_class_details(ostream &out, Object *obj) {
} }
// Now write out generated getters and setters for the properties. // Now write out generated getters and setters for the properties.
Properties::const_iterator pit; for (Property *property : obj->_properties) {
for (pit = obj->_properties.begin(); pit != obj->_properties.end(); ++pit) {
Property *property = (*pit);
write_getset(out, obj, property); write_getset(out, obj, property);
} }
// Write the constructors. // Write the constructors.
std::string fname = "static int Dtool_Init_" + ClassName + "(PyObject *self, PyObject *args, PyObject *kwds)"; std::string fname = "static int Dtool_Init_" + ClassName + "(PyObject *self, PyObject *args, PyObject *kwds)";
for (fi = obj->_constructors.begin(); fi != obj->_constructors.end(); ++fi) { for (Function *func : obj->_constructors) {
Function *func = (*fi);
string expected_params; string expected_params;
write_function_for_name(out, obj, func->_remaps, fname, expected_params, true, AT_keyword_args, RF_int); write_function_for_name(out, obj, func->_remaps, fname, expected_params, true, AT_keyword_args, RF_int);
} }
@ -1052,17 +1034,16 @@ write_class_details(ostream &out, Object *obj) {
} }
// Write make seqs: generated methods that return a sequence of items. // Write make seqs: generated methods that return a sequence of items.
MakeSeqs::iterator msi; for (MakeSeq *make_seq : obj->_make_seqs) {
for (msi = obj->_make_seqs.begin(); msi != obj->_make_seqs.end(); ++msi) { if (is_function_legal(make_seq->_length_getter) &&
if (is_function_legal((*msi)->_length_getter) && is_function_legal(make_seq->_element_getter)) {
is_function_legal((*msi)->_element_getter)) { write_make_seq(out, obj, ClassName, cClassName, make_seq);
write_make_seq(out, obj, ClassName, cClassName, *msi);
} else { } else {
if (!is_function_legal((*msi)->_length_getter)) { if (!is_function_legal(make_seq->_length_getter)) {
std::cerr << "illegal length function for MAKE_SEQ: " << (*msi)->_length_getter->_name << "\n"; std::cerr << "illegal length function for MAKE_SEQ: " << make_seq->_length_getter->_name << "\n";
} }
if (!is_function_legal((*msi)->_element_getter)) { if (!is_function_legal(make_seq->_element_getter)) {
std::cerr << "illegal element function for MAKE_SEQ: " << (*msi)->_element_getter->_name << "\n"; std::cerr << "illegal element function for MAKE_SEQ: " << make_seq->_element_getter->_name << "\n";
} }
} }
} }
@ -1297,11 +1278,11 @@ write_module_support(ostream &out, ostream *out_h, InterrogateModuleDef *def) {
out << "#ifndef LINK_ALL_STATIC\n"; out << "#ifndef LINK_ALL_STATIC\n";
out << " // Resolve externally imported types.\n"; out << " // Resolve externally imported types.\n";
for (std::set<CPPType *>::iterator ii = _external_imports.begin(); ii != _external_imports.end(); ++ii) { for (CPPType *type : _external_imports) {
string class_name = (*ii)->get_local_name(&parser); string class_name = type->get_local_name(&parser);
string safe_name = make_safe_name(class_name); string safe_name = make_safe_name(class_name);
if (has_get_class_type_function(*ii)) { if (has_get_class_type_function(type)) {
out << " Dtool_Ptr_" << safe_name << " = LookupRuntimeTypedClass(" << class_name << "::get_class_type());\n"; out << " Dtool_Ptr_" << safe_name << " = LookupRuntimeTypedClass(" << class_name << "::get_class_type());\n";
} else { } else {
out << " Dtool_Ptr_" << safe_name << " = LookupNamedClass(\"" << class_name << "\");\n"; out << " Dtool_Ptr_" << safe_name << " = LookupNamedClass(\"" << class_name << "\");\n";
@ -1555,7 +1536,6 @@ write_module_class(ostream &out, Object *obj) {
is_runtime_typed = true; is_runtime_typed = true;
} }
Functions::iterator fi;
out << "/**\n"; out << "/**\n";
out << " * Python method tables for " << ClassName << " (" << export_class_name << ")\n" ; out << " * Python method tables for " << ClassName << " (" << export_class_name << ")\n" ;
out << " */\n"; out << " */\n";
@ -1566,8 +1546,7 @@ write_module_class(ostream &out, Object *obj) {
bool got_copy = false; bool got_copy = false;
bool got_deepcopy = false; bool got_deepcopy = false;
for (fi = obj->_methods.begin(); fi != obj->_methods.end(); ++fi) { for (Function *func : obj->_methods) {
Function *func = (*fi);
if (func->_name == "__copy__") { if (func->_name == "__copy__") {
got_copy = true; got_copy = true;
} else if (func->_name == "__deepcopy__") { } else if (func->_name == "__deepcopy__") {
@ -1604,9 +1583,7 @@ write_module_class(ostream &out, Object *obj) {
bool has_nonslotted = false; bool has_nonslotted = false;
Function::Remaps::const_iterator ri; for (FunctionRemap *remap : func->_remaps) {
for (ri = func->_remaps.begin(); ri != func->_remaps.end(); ++ri) {
FunctionRemap *remap = (*ri);
if (!is_remap_legal(remap)) { if (!is_remap_legal(remap)) {
continue; continue;
} }
@ -1698,9 +1675,7 @@ write_module_class(ostream &out, Object *obj) {
out << " {\"__deepcopy__\", &map_deepcopy_to_copy, METH_VARARGS, nullptr},\n"; out << " {\"__deepcopy__\", &map_deepcopy_to_copy, METH_VARARGS, nullptr},\n";
} }
MakeSeqs::iterator msi; for (MakeSeq *make_seq : obj->_make_seqs) {
for (msi = obj->_make_seqs.begin(); msi != obj->_make_seqs.end(); ++msi) {
MakeSeq *make_seq = (*msi);
if (!is_function_legal(make_seq->_length_getter) || if (!is_function_legal(make_seq->_length_getter) ||
!is_function_legal(make_seq->_element_getter)) { !is_function_legal(make_seq->_element_getter)) {
continue; continue;
@ -1876,10 +1851,7 @@ write_module_class(ostream &out, Object *obj) {
// This function handles both delattr and setattr. Fish out the // This function handles both delattr and setattr. Fish out the
// remaps for both types. // remaps for both types.
set<FunctionRemap*>::const_iterator ri; for (FunctionRemap *remap : def._remaps) {
for (ri = def._remaps.begin(); ri != def._remaps.end(); ++ri) {
FunctionRemap *remap = (*ri);
if (remap->_cppfunc->get_simple_name() == "__delattr__" && remap->_parameters.size() == 2) { if (remap->_cppfunc->get_simple_name() == "__delattr__" && remap->_parameters.size() == 2) {
delattr_remaps.insert(remap); delattr_remaps.insert(remap);
@ -2029,10 +2001,7 @@ write_module_class(ostream &out, Object *obj) {
// This function handles both delitem and setitem. Fish out the // This function handles both delitem and setitem. Fish out the
// remaps for either one. // remaps for either one.
set<FunctionRemap*>::const_iterator ri; for (FunctionRemap *remap : def._remaps) {
for (ri = def._remaps.begin(); ri != def._remaps.end(); ++ri) {
FunctionRemap *remap = (*ri);
if (remap->_flags & FunctionRemap::F_setitem_int) { if (remap->_flags & FunctionRemap::F_setitem_int) {
setitem_remaps.insert(remap); setitem_remaps.insert(remap);
@ -2098,10 +2067,7 @@ write_module_class(ostream &out, Object *obj) {
// This function handles both delitem and setitem. Fish out the // This function handles both delitem and setitem. Fish out the
// remaps for either one. // remaps for either one.
set<FunctionRemap*>::const_iterator ri; for (FunctionRemap *remap : def._remaps) {
for (ri = def._remaps.begin(); ri != def._remaps.end(); ++ri) {
FunctionRemap *remap = (*ri);
if (remap->_flags & FunctionRemap::F_setitem) { if (remap->_flags & FunctionRemap::F_setitem) {
setitem_remaps.insert(remap); setitem_remaps.insert(remap);
@ -2185,9 +2151,7 @@ write_module_class(ostream &out, Object *obj) {
// Iterate through the remaps to find the one that matches our // Iterate through the remaps to find the one that matches our
// parameters. // parameters.
set<FunctionRemap*>::const_iterator ri; for (FunctionRemap *remap : def._remaps) {
for (ri = def._remaps.begin(); ri != def._remaps.end(); ++ri) {
FunctionRemap *remap = (*ri);
if (remap->_const_method) { if (remap->_const_method) {
if ((remap->_flags & FunctionRemap::F_explicit_self) == 0) { if ((remap->_flags & FunctionRemap::F_explicit_self) == 0) {
params_const.push_back("self"); params_const.push_back("self");
@ -2254,9 +2218,7 @@ write_module_class(ostream &out, Object *obj) {
// Iterate through the remaps to find the one that matches our // Iterate through the remaps to find the one that matches our
// parameters. // parameters.
set<FunctionRemap*>::const_iterator ri; for (FunctionRemap *remap : def._remaps) {
for (ri = def._remaps.begin(); ri != def._remaps.end(); ++ri) {
FunctionRemap *remap = (*ri);
if (remap->_const_method) { if (remap->_const_method) {
if ((remap->_flags & FunctionRemap::F_explicit_self) == 0) { if ((remap->_flags & FunctionRemap::F_explicit_self) == 0) {
params_const.push_back("self"); params_const.push_back("self");
@ -2340,10 +2302,7 @@ write_module_class(ostream &out, Object *obj) {
set<FunctionRemap*> one_param_remaps; set<FunctionRemap*> one_param_remaps;
set<FunctionRemap*> two_param_remaps; set<FunctionRemap*> two_param_remaps;
set<FunctionRemap*>::const_iterator ri; for (FunctionRemap *remap : def._remaps) {
for (ri = def._remaps.begin(); ri != def._remaps.end(); ++ri) {
FunctionRemap *remap = (*ri);
if (remap->_parameters.size() == 2) { if (remap->_parameters.size() == 2) {
one_param_remaps.insert(remap); one_param_remaps.insert(remap);
@ -2537,17 +2496,14 @@ write_module_class(ostream &out, Object *obj) {
out << " return nullptr;\n"; out << " return nullptr;\n";
out << " }\n\n"; out << " }\n\n";
for (fi = obj->_methods.begin(); fi != obj->_methods.end(); ++fi) { for (Function *func : obj->_methods) {
std::set<FunctionRemap*> remaps; std::set<FunctionRemap*> remaps;
Function *func = (*fi);
if (!func) { if (!func) {
continue; continue;
} }
// We only accept comparison operators that take one parameter (besides // We only accept comparison operators that take one parameter (besides
// 'this'). // 'this').
Function::Remaps::const_iterator ri; for (FunctionRemap *remap : func->_remaps) {
for (ri = func->_remaps.begin(); ri != func->_remaps.end(); ++ri) {
FunctionRemap *remap = (*ri);
if (is_remap_legal(remap) && remap->_has_this && (remap->_args_type == AT_single_arg)) { if (is_remap_legal(remap) && remap->_has_this && (remap->_args_type == AT_single_arg)) {
remaps.insert(remap); remaps.insert(remap);
} }
@ -2634,9 +2590,7 @@ write_module_class(ostream &out, Object *obj) {
if (obj->_properties.size() > 0) { if (obj->_properties.size() > 0) {
// Write out the array of properties, telling Python which getter and // Write out the array of properties, telling Python which getter and
// setter to call when they are assigned or queried in Python code. // setter to call when they are assigned or queried in Python code.
Properties::const_iterator pit; for (Property *property : obj->_properties) {
for (pit = obj->_properties.begin(); pit != obj->_properties.end(); ++pit) {
Property *property = (*pit);
const InterrogateElement &ielem = property->_ielement; const InterrogateElement &ielem = property->_ielement;
if (!property->_has_this || property->_getter_remaps.empty()) { if (!property->_has_this || property->_getter_remaps.empty()) {
continue; continue;
@ -3060,10 +3014,10 @@ write_module_class(ostream &out, Object *obj) {
out << " // Dependent objects\n"; out << " // Dependent objects\n";
if (bases.size() > 0) { if (bases.size() > 0) {
string baseargs; string baseargs;
for (std::vector<CPPType*>::iterator bi = bases.begin(); bi != bases.end(); ++bi) { for (CPPType *base : bases) {
string safe_name = make_safe_name((*bi)->get_local_name(&parser)); string safe_name = make_safe_name(base->get_local_name(&parser));
if (isExportThisRun(*bi)) { if (isExportThisRun(base)) {
baseargs += ", (PyTypeObject *)&Dtool_" + safe_name; baseargs += ", (PyTypeObject *)&Dtool_" + safe_name;
out << " Dtool_PyModuleClassInit_" << safe_name << "(nullptr);\n"; out << " Dtool_PyModuleClassInit_" << safe_name << "(nullptr);\n";
@ -3207,9 +3161,7 @@ write_module_class(ostream &out, Object *obj) {
} }
// Also add the static properties, which can't be added via getset. // Also add the static properties, which can't be added via getset.
Properties::const_iterator pit; for (Property *property : obj->_properties) {
for (pit = obj->_properties.begin(); pit != obj->_properties.end(); ++pit) {
Property *property = (*pit);
const InterrogateElement &ielem = property->_ielement; const InterrogateElement &ielem = property->_ielement;
if (property->_has_this || property->_getter_remaps.empty()) { if (property->_has_this || property->_getter_remaps.empty()) {
continue; continue;
@ -3354,9 +3306,7 @@ write_function_for_top(ostream &out, InterfaceMaker::Object *obj, InterfaceMaker
// should even write it. // should even write it.
bool has_remaps = false; bool has_remaps = false;
Function::Remaps::const_iterator ri; for (FunctionRemap *remap : func->_remaps) {
for (ri = func->_remaps.begin(); ri != func->_remaps.end(); ++ri) {
FunctionRemap *remap = (*ri);
if (!is_remap_legal(remap)) { if (!is_remap_legal(remap)) {
continue; continue;
} }
@ -3805,18 +3755,12 @@ void InterfaceMakerPythonNative::
write_coerce_constructor(ostream &out, Object *obj, bool is_const) { write_coerce_constructor(ostream &out, Object *obj, bool is_const) {
std::map<int, std::set<FunctionRemap *> > map_sets; std::map<int, std::set<FunctionRemap *> > map_sets;
std::map<int, std::set<FunctionRemap *> >::iterator mii; std::map<int, std::set<FunctionRemap *> >::iterator mii;
std::set<FunctionRemap *>::iterator sii;
int max_required_args = 0; int max_required_args = 0;
Functions::iterator fi;
Function::Remaps::const_iterator ri;
// Go through the methods and find appropriate static make() functions. // Go through the methods and find appropriate static make() functions.
for (fi = obj->_methods.begin(); fi != obj->_methods.end(); ++fi) { for (Function *func : obj->_methods) {
Function *func = (*fi); for (FunctionRemap *remap : func->_remaps) {
for (ri = func->_remaps.begin(); ri != func->_remaps.end(); ++ri) {
FunctionRemap *remap = (*ri);
if (is_remap_legal(remap) && remap->_flags & FunctionRemap::F_coerce_constructor) { if (is_remap_legal(remap) && remap->_flags & FunctionRemap::F_coerce_constructor) {
nassertd(!remap->_has_this) continue; nassertd(!remap->_has_this) continue;
@ -3850,10 +3794,8 @@ write_coerce_constructor(ostream &out, Object *obj, bool is_const) {
// Now go through the constructors that are suitable for coercion. This // Now go through the constructors that are suitable for coercion. This
// excludes copy constructors and ones marked "explicit". // excludes copy constructors and ones marked "explicit".
for (fi = obj->_constructors.begin(); fi != obj->_constructors.end(); ++fi) { for (Function *func : obj->_constructors) {
Function *func = (*fi); for (FunctionRemap *remap : func->_remaps) {
for (ri = func->_remaps.begin(); ri != func->_remaps.end(); ++ri) {
FunctionRemap *remap = (*ri);
if (is_remap_legal(remap) && remap->_flags & FunctionRemap::F_coerce_constructor) { if (is_remap_legal(remap) && remap->_flags & FunctionRemap::F_coerce_constructor) {
nassertd(!remap->_has_this) continue; nassertd(!remap->_has_this) continue;
@ -6504,11 +6446,7 @@ write_getset(ostream &out, Object *obj, Property *property) {
std::set<FunctionRemap*> remaps; std::set<FunctionRemap*> remaps;
// Extract only the getters that take one integral argument. // Extract only the getters that take one integral argument.
Function::Remaps::iterator it; for (FunctionRemap *remap : property->_getter_remaps) {
for (it = property->_getter_remaps.begin();
it != property->_getter_remaps.end();
++it) {
FunctionRemap *remap = *it;
int min_num_args = remap->get_min_num_args(); int min_num_args = remap->get_min_num_args();
int max_num_args = remap->get_max_num_args(); int max_num_args = remap->get_max_num_args();
if (min_num_args <= 1 && max_num_args >= 1 && if (min_num_args <= 1 && max_num_args >= 1 &&
@ -6573,11 +6511,7 @@ write_getset(ostream &out, Object *obj, Property *property) {
std::set<FunctionRemap*> remaps; std::set<FunctionRemap*> remaps;
// Extract only the setters that take two arguments. // Extract only the setters that take two arguments.
Function::Remaps::iterator it; for (FunctionRemap *remap : property->_setter_remaps) {
for (it = property->_setter_remaps.begin();
it != property->_setter_remaps.end();
++it) {
FunctionRemap *remap = *it;
int min_num_args = remap->get_min_num_args(); int min_num_args = remap->get_min_num_args();
int max_num_args = remap->get_max_num_args(); int max_num_args = remap->get_max_num_args();
if (min_num_args <= 2 && max_num_args >= 2 && if (min_num_args <= 2 && max_num_args >= 2 &&
@ -6675,11 +6609,7 @@ write_getset(ostream &out, Object *obj, Property *property) {
std::set<FunctionRemap*> remaps; std::set<FunctionRemap*> remaps;
// Extract only the getters that take one argument. Fish out the ones // Extract only the getters that take one argument. Fish out the ones
// already taken by the sequence getter. // already taken by the sequence getter.
Function::Remaps::iterator it; for (FunctionRemap *remap : property->_getter_remaps) {
for (it = property->_getter_remaps.begin();
it != property->_getter_remaps.end();
++it) {
FunctionRemap *remap = *it;
int min_num_args = remap->get_min_num_args(); int min_num_args = remap->get_min_num_args();
int max_num_args = remap->get_max_num_args(); int max_num_args = remap->get_max_num_args();
if (min_num_args <= 1 && max_num_args >= 1 && if (min_num_args <= 1 && max_num_args >= 1 &&
@ -6808,11 +6738,7 @@ write_getset(ostream &out, Object *obj, Property *property) {
std::set<FunctionRemap*> remaps; std::set<FunctionRemap*> remaps;
// Extract only the getters that take one integral argument. // Extract only the getters that take one integral argument.
Function::Remaps::iterator it; for (FunctionRemap *remap : property->_getkey_function->_remaps) {
for (it = property->_getkey_function->_remaps.begin();
it != property->_getkey_function->_remaps.end();
++it) {
FunctionRemap *remap = *it;
int min_num_args = remap->get_min_num_args(); int min_num_args = remap->get_min_num_args();
int max_num_args = remap->get_max_num_args(); int max_num_args = remap->get_max_num_args();
if (min_num_args <= 1 && max_num_args >= 1 && if (min_num_args <= 1 && max_num_args >= 1 &&
@ -6969,11 +6895,7 @@ write_getset(ostream &out, Object *obj, Property *property) {
std::set<FunctionRemap*> remaps; std::set<FunctionRemap*> remaps;
// Extract only the setters that take one argument. // Extract only the setters that take one argument.
Function::Remaps::iterator it; for (FunctionRemap *remap : property->_setter_remaps) {
for (it = property->_setter_remaps.begin();
it != property->_setter_remaps.end();
++it) {
FunctionRemap *remap = *it;
int min_num_args = remap->get_min_num_args(); int min_num_args = remap->get_min_num_args();
int max_num_args = remap->get_max_num_args(); int max_num_args = remap->get_max_num_args();
if (min_num_args <= 1 && max_num_args >= 1) { if (min_num_args <= 1 && max_num_args >= 1) {
@ -7362,9 +7284,7 @@ isExportThisRun(Function *func) {
return false; return false;
} }
Function::Remaps::const_iterator ri; for (FunctionRemap *remap : func->_remaps) {
for (ri = func->_remaps.begin(); ri != func->_remaps.end();) {
FunctionRemap *remap = (*ri);
return isExportThisRun(remap->_cpptype); return isExportThisRun(remap->_cpptype);
} }
@ -7439,10 +7359,7 @@ has_coerce_constructor(CPPStructType *type) {
CPPScope::Functions::iterator fgi; CPPScope::Functions::iterator fgi;
for (fgi = scope->_functions.begin(); fgi != scope->_functions.end(); ++fgi) { for (fgi = scope->_functions.begin(); fgi != scope->_functions.end(); ++fgi) {
CPPFunctionGroup *fgroup = fgi->second; CPPFunctionGroup *fgroup = fgi->second;
for (CPPInstance *inst : fgroup->_instances) {
CPPFunctionGroup::Instances::iterator ii;
for (ii = fgroup->_instances.begin(); ii != fgroup->_instances.end(); ++ii) {
CPPInstance *inst = (*ii);
CPPFunctionType *ftype = inst->_type->as_function_type(); CPPFunctionType *ftype = inst->_type->as_function_type();
if (ftype == nullptr) { if (ftype == nullptr) {
continue; continue;
@ -7527,9 +7444,7 @@ is_remap_coercion_possible(FunctionRemap *remap) {
*/ */
bool InterfaceMakerPythonNative:: bool InterfaceMakerPythonNative::
is_function_legal(Function *func) { is_function_legal(Function *func) {
Function::Remaps::const_iterator ri; for (FunctionRemap *remap : func->_remaps) {
for (ri = func->_remaps.begin(); ri != func->_remaps.end(); ++ri) {
FunctionRemap *remap = (*ri);
if (is_remap_legal(remap)) { if (is_remap_legal(remap)) {
// printf(" Function Is Marked Legal %s\n",func->_name.c_str()); // printf(" Function Is Marked Legal %s\n",func->_name.c_str());
@ -7575,13 +7490,7 @@ DoesInheritFromIsClass(const CPPStructType *inclass, const std::string &name) {
return true; return true;
} }
CPPStructType::Derivation::const_iterator bi; for (const CPPStructType::Base &base : inclass->_derivation) {
for (bi = inclass->_derivation.begin();
bi != inclass->_derivation.end();
++bi) {
const CPPStructType::Base &base = (*bi);
CPPStructType *base_type = TypeManager::resolve_type(base._base)->as_struct_type(); CPPStructType *base_type = TypeManager::resolve_type(base._base)->as_struct_type();
if (base_type != nullptr) { if (base_type != nullptr) {
if (DoesInheritFromIsClass(base_type, name)) { if (DoesInheritFromIsClass(base_type, name)) {
@ -7632,9 +7541,7 @@ has_init_type_function(CPPType *type) {
} }
const CPPFunctionGroup *group = it->second; const CPPFunctionGroup *group = it->second;
CPPFunctionGroup::Instances::const_iterator ii; for (const CPPInstance *cppinst : group->_instances) {
for (ii = group->_instances.begin(); ii != group->_instances.end(); ++ii) {
const CPPInstance *cppinst = *ii;
const CPPFunctionType *cppfunc = cppinst->_type->as_function_type(); const CPPFunctionType *cppfunc = cppinst->_type->as_function_type();
if (cppfunc != nullptr && if (cppfunc != nullptr &&