mirror of
https://github.com/panda3d/panda3d.git
synced 2025-10-04 10:54:24 -04:00
formatting
This commit is contained in:
parent
de052535d4
commit
0dd3363dd1
@ -78,7 +78,7 @@ operator == (const CPPIdentifier &other) const {
|
|||||||
if (_names.size() != other._names.size()) {
|
if (_names.size() != other._names.size()) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
for (int i = 0; i < (int)_names.size(); i++) {
|
for (int i = 0; i < (int)_names.size(); ++i) {
|
||||||
if (_names[i] != other._names[i]) {
|
if (_names[i] != other._names[i]) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -107,7 +107,7 @@ operator < (const CPPIdentifier &other) const {
|
|||||||
if (_names.size() != other._names.size()) {
|
if (_names.size() != other._names.size()) {
|
||||||
return _names.size() < other._names.size();
|
return _names.size() < other._names.size();
|
||||||
}
|
}
|
||||||
for (int i = 0; i < (int)_names.size(); i++) {
|
for (int i = 0; i < (int)_names.size(); ++i) {
|
||||||
if (_names[i] != other._names[i]) {
|
if (_names[i] != other._names[i]) {
|
||||||
return _names[i] < other._names[i];
|
return _names[i] < other._names[i];
|
||||||
}
|
}
|
||||||
@ -492,7 +492,7 @@ substitute_decl(CPPDeclaration::SubstDecl &subst,
|
|||||||
CPPIdentifier *rep = new CPPIdentifier(*this);
|
CPPIdentifier *rep = new CPPIdentifier(*this);
|
||||||
|
|
||||||
bool anything_changed = false;
|
bool anything_changed = false;
|
||||||
for (int i = 0; i < (int)rep->_names.size(); i++) {
|
for (int i = 0; i < (int)rep->_names.size(); ++i) {
|
||||||
if (_names[i].has_templ()) {
|
if (_names[i].has_templ()) {
|
||||||
rep->_names[i].set_templ
|
rep->_names[i].set_templ
|
||||||
(_names[i].get_templ()->substitute_decl(subst, current_scope, global_scope));
|
(_names[i].get_templ()->substitute_decl(subst, current_scope, global_scope));
|
||||||
|
@ -156,7 +156,7 @@ output(ostream &out) const {
|
|||||||
out << "(";
|
out << "(";
|
||||||
if (_num_parameters > 0) {
|
if (_num_parameters > 0) {
|
||||||
out << "$1";
|
out << "$1";
|
||||||
for (int i = 1; i < _num_parameters; i++) {
|
for (int i = 1; i < _num_parameters; ++i) {
|
||||||
out << ", $" << i + 1;
|
out << ", $" << i + 1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -248,7 +248,7 @@ save_expansion(const string &exp, const vector_string ¶meter_names) {
|
|||||||
|
|
||||||
// Is this identifier one of our parameters?
|
// Is this identifier one of our parameters?
|
||||||
int pnum = -1;
|
int pnum = -1;
|
||||||
for (int i = 0; pnum == -1 && i < (int)parameter_names.size(); i++) {
|
for (int i = 0; pnum == -1 && i < (int)parameter_names.size(); ++i) {
|
||||||
if (parameter_names[i] == ident) {
|
if (parameter_names[i] == ident) {
|
||||||
pnum = i;
|
pnum = i;
|
||||||
}
|
}
|
||||||
|
@ -46,7 +46,7 @@ is_equivalent(const CPPParameterList &other) const {
|
|||||||
if (_parameters.size() != other._parameters.size()) {
|
if (_parameters.size() != other._parameters.size()) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
for (int i = 0; i < (int)_parameters.size(); i++) {
|
for (int i = 0; i < (int)_parameters.size(); ++i) {
|
||||||
if (!_parameters[i]->_type->is_equivalent(*other._parameters[i]->_type)) {
|
if (!_parameters[i]->_type->is_equivalent(*other._parameters[i]->_type)) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -67,7 +67,7 @@ operator == (const CPPParameterList &other) const {
|
|||||||
if (_parameters.size() != other._parameters.size()) {
|
if (_parameters.size() != other._parameters.size()) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
for (int i = 0; i < (int)_parameters.size(); i++) {
|
for (int i = 0; i < (int)_parameters.size(); ++i) {
|
||||||
if (*_parameters[i] != *other._parameters[i]) {
|
if (*_parameters[i] != *other._parameters[i]) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -98,7 +98,7 @@ operator < (const CPPParameterList &other) const {
|
|||||||
if (_parameters.size() != other._parameters.size()) {
|
if (_parameters.size() != other._parameters.size()) {
|
||||||
return _parameters.size() < other._parameters.size();
|
return _parameters.size() < other._parameters.size();
|
||||||
}
|
}
|
||||||
for (int i = 0; i < (int)_parameters.size(); i++) {
|
for (int i = 0; i < (int)_parameters.size(); ++i) {
|
||||||
if (*_parameters[i] != *other._parameters[i]) {
|
if (*_parameters[i] != *other._parameters[i]) {
|
||||||
return *_parameters[i] < *other._parameters[i];
|
return *_parameters[i] < *other._parameters[i];
|
||||||
}
|
}
|
||||||
@ -114,7 +114,7 @@ operator < (const CPPParameterList &other) const {
|
|||||||
////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////
|
||||||
bool CPPParameterList::
|
bool CPPParameterList::
|
||||||
is_tbd() const {
|
is_tbd() const {
|
||||||
for (int i = 0; i < (int)_parameters.size(); i++) {
|
for (int i = 0; i < (int)_parameters.size(); ++i) {
|
||||||
if (_parameters[i]->_type->is_tbd()) {
|
if (_parameters[i]->_type->is_tbd()) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@ -132,7 +132,7 @@ is_tbd() const {
|
|||||||
////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////
|
||||||
bool CPPParameterList::
|
bool CPPParameterList::
|
||||||
is_parameter_expr() const {
|
is_parameter_expr() const {
|
||||||
for (int i = 0; i < (int)_parameters.size(); i++) {
|
for (int i = 0; i < (int)_parameters.size(); ++i) {
|
||||||
if (_parameters[i]->_type->is_parameter_expr()) {
|
if (_parameters[i]->_type->is_parameter_expr()) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@ -150,7 +150,7 @@ is_parameter_expr() const {
|
|||||||
////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////
|
||||||
bool CPPParameterList::
|
bool CPPParameterList::
|
||||||
is_fully_specified() const {
|
is_fully_specified() const {
|
||||||
for (int i = 0; i < (int)_parameters.size(); i++) {
|
for (int i = 0; i < (int)_parameters.size(); ++i) {
|
||||||
if (!_parameters[i]->is_fully_specified()) {
|
if (!_parameters[i]->is_fully_specified()) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -169,7 +169,7 @@ substitute_decl(CPPDeclaration::SubstDecl &subst,
|
|||||||
CPPScope *current_scope, CPPScope *global_scope) {
|
CPPScope *current_scope, CPPScope *global_scope) {
|
||||||
CPPParameterList *rep = new CPPParameterList;
|
CPPParameterList *rep = new CPPParameterList;
|
||||||
bool any_changed = false;
|
bool any_changed = false;
|
||||||
for (int i = 0; i < (int)_parameters.size(); i++) {
|
for (int i = 0; i < (int)_parameters.size(); ++i) {
|
||||||
CPPInstance *inst =
|
CPPInstance *inst =
|
||||||
_parameters[i]->substitute_decl(subst, current_scope, global_scope)
|
_parameters[i]->substitute_decl(subst, current_scope, global_scope)
|
||||||
->as_instance();
|
->as_instance();
|
||||||
@ -197,7 +197,7 @@ CPPParameterList *CPPParameterList::
|
|||||||
resolve_type(CPPScope *current_scope, CPPScope *global_scope) {
|
resolve_type(CPPScope *current_scope, CPPScope *global_scope) {
|
||||||
CPPParameterList *rep = new CPPParameterList;
|
CPPParameterList *rep = new CPPParameterList;
|
||||||
bool any_changed = false;
|
bool any_changed = false;
|
||||||
for (int i = 0; i < (int)_parameters.size(); i++) {
|
for (int i = 0; i < (int)_parameters.size(); ++i) {
|
||||||
CPPInstance *inst = _parameters[i];
|
CPPInstance *inst = _parameters[i];
|
||||||
CPPType *new_type = inst->_type;
|
CPPType *new_type = inst->_type;
|
||||||
if (new_type->is_tbd()) {
|
if (new_type->is_tbd()) {
|
||||||
@ -232,7 +232,7 @@ void CPPParameterList::
|
|||||||
output(ostream &out, CPPScope *scope, bool parameter_names,
|
output(ostream &out, CPPScope *scope, bool parameter_names,
|
||||||
int num_default_parameters) const {
|
int num_default_parameters) const {
|
||||||
if (!_parameters.empty()) {
|
if (!_parameters.empty()) {
|
||||||
for (int i = 0; i < (int)_parameters.size(); i++) {
|
for (int i = 0; i < (int)_parameters.size(); ++i) {
|
||||||
if (i != 0) {
|
if (i != 0) {
|
||||||
out << ", ";
|
out << ", ";
|
||||||
}
|
}
|
||||||
|
@ -332,7 +332,7 @@ substitute_decl(CPPDeclaration::SubstDecl &subst,
|
|||||||
bool unchanged =
|
bool unchanged =
|
||||||
(rep->_ident == _ident && rep->_scope == _scope);
|
(rep->_ident == _ident && rep->_scope == _scope);
|
||||||
|
|
||||||
for (int i = 0; i < (int)_derivation.size(); i++) {
|
for (int i = 0; i < (int)_derivation.size(); ++i) {
|
||||||
rep->_derivation[i]._base =
|
rep->_derivation[i]._base =
|
||||||
_derivation[i]._base->substitute_decl(subst, current_scope, global_scope)->as_type();
|
_derivation[i]._base->substitute_decl(subst, current_scope, global_scope)->as_type();
|
||||||
if (rep->_derivation[i]._base != _derivation[i]._base) {
|
if (rep->_derivation[i]._base != _derivation[i]._base) {
|
||||||
|
@ -117,7 +117,7 @@ build_subst_decl(const CPPTemplateParameterList &formal_params,
|
|||||||
////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////
|
||||||
bool CPPTemplateParameterList::
|
bool CPPTemplateParameterList::
|
||||||
is_fully_specified() const {
|
is_fully_specified() const {
|
||||||
for (int i = 0; i < (int)_parameters.size(); i++) {
|
for (int i = 0; i < (int)_parameters.size(); ++i) {
|
||||||
if (!_parameters[i]->is_fully_specified()) {
|
if (!_parameters[i]->is_fully_specified()) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -134,7 +134,7 @@ is_fully_specified() const {
|
|||||||
////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////
|
||||||
bool CPPTemplateParameterList::
|
bool CPPTemplateParameterList::
|
||||||
is_tbd() const {
|
is_tbd() const {
|
||||||
for (int i = 0; i < (int)_parameters.size(); i++) {
|
for (int i = 0; i < (int)_parameters.size(); ++i) {
|
||||||
CPPType *type = _parameters[i]->as_type();
|
CPPType *type = _parameters[i]->as_type();
|
||||||
if (type != (CPPType *)NULL &&
|
if (type != (CPPType *)NULL &&
|
||||||
(type->is_tbd() || type->as_class_template_parameter() != NULL)) {
|
(type->is_tbd() || type->as_class_template_parameter() != NULL)) {
|
||||||
@ -158,7 +158,7 @@ operator == (const CPPTemplateParameterList &other) const {
|
|||||||
if (_parameters.size() != other._parameters.size()) {
|
if (_parameters.size() != other._parameters.size()) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
for (int i = 0; i < (int)_parameters.size(); i++) {
|
for (int i = 0; i < (int)_parameters.size(); ++i) {
|
||||||
if (*_parameters[i] != *other._parameters[i]) {
|
if (*_parameters[i] != *other._parameters[i]) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -186,7 +186,7 @@ operator < (const CPPTemplateParameterList &other) const {
|
|||||||
if (_parameters.size() != other._parameters.size()) {
|
if (_parameters.size() != other._parameters.size()) {
|
||||||
return _parameters.size() < other._parameters.size();
|
return _parameters.size() < other._parameters.size();
|
||||||
}
|
}
|
||||||
for (int i = 0; i < (int)_parameters.size(); i++) {
|
for (int i = 0; i < (int)_parameters.size(); ++i) {
|
||||||
if (*_parameters[i] != *other._parameters[i]) {
|
if (*_parameters[i] != *other._parameters[i]) {
|
||||||
return *_parameters[i] < *other._parameters[i];
|
return *_parameters[i] < *other._parameters[i];
|
||||||
}
|
}
|
||||||
@ -205,7 +205,7 @@ substitute_decl(CPPDeclaration::SubstDecl &subst,
|
|||||||
CPPTemplateParameterList *rep = new CPPTemplateParameterList(*this);
|
CPPTemplateParameterList *rep = new CPPTemplateParameterList(*this);
|
||||||
|
|
||||||
bool anything_changed = false;
|
bool anything_changed = false;
|
||||||
for (int i = 0; i < (int)rep->_parameters.size(); i++) {
|
for (int i = 0; i < (int)rep->_parameters.size(); ++i) {
|
||||||
rep->_parameters[i] =
|
rep->_parameters[i] =
|
||||||
_parameters[i]->substitute_decl(subst, current_scope, global_scope);
|
_parameters[i]->substitute_decl(subst, current_scope, global_scope);
|
||||||
if (rep->_parameters[i] != _parameters[i]) {
|
if (rep->_parameters[i] != _parameters[i]) {
|
||||||
|
@ -29,7 +29,7 @@
|
|||||||
////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////
|
||||||
ostream &
|
ostream &
|
||||||
indent(ostream &out, int indent_level) {
|
indent(ostream &out, int indent_level) {
|
||||||
for (int i = 0; i < indent_level; i++) {
|
for (int i = 0; i < indent_level; ++i) {
|
||||||
out << ' ';
|
out << ' ';
|
||||||
}
|
}
|
||||||
return out;
|
return out;
|
||||||
|
@ -161,7 +161,7 @@ ConfigTable::Symbol& Config<GetConfig>::GetAll(const ConfigString sym,
|
|||||||
ConfigVariableList var(sym, "DConfig", ConfigFlags::F_dconfig);
|
ConfigVariableList var(sym, "DConfig", ConfigFlags::F_dconfig);
|
||||||
|
|
||||||
int num_values = var.get_num_values();
|
int num_values = var.get_num_values();
|
||||||
for (int i = 0; i < num_values; i++) {
|
for (int i = 0; i < num_values; ++i) {
|
||||||
string value = var.get_string_value(i);
|
string value = var.get_string_value(i);
|
||||||
s.push_back(SymbolEnt(SymbolEnt::ConfigFile, value));
|
s.push_back(SymbolEnt(SymbolEnt::ConfigFile, value));
|
||||||
}
|
}
|
||||||
|
@ -397,7 +397,7 @@ void DSearchPath::
|
|||||||
write(ostream &out, int indent_level) const {
|
write(ostream &out, int indent_level) const {
|
||||||
Directories::const_iterator di;
|
Directories::const_iterator di;
|
||||||
for (di = _directories.begin(); di != _directories.end(); ++di) {
|
for (di = _directories.begin(); di != _directories.end(); ++di) {
|
||||||
for (int i = 0; i < indent_level; i++) {
|
for (int i = 0; i < indent_level; ++i) {
|
||||||
out << ' ';
|
out << ' ';
|
||||||
}
|
}
|
||||||
out << (*di) << "\n";
|
out << (*di) << "\n";
|
||||||
|
@ -115,7 +115,7 @@ pad_bytes(size_t size) {
|
|||||||
|
|
||||||
while (size > 0) {
|
while (size > 0) {
|
||||||
_data.push_back('\0');
|
_data.push_back('\0');
|
||||||
size--;
|
--size;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -150,7 +150,7 @@ append_data(const void *data, size_t size) {
|
|||||||
// _data.reserve(_data.size() + size);
|
// _data.reserve(_data.size() + size);
|
||||||
|
|
||||||
const uchar *source = (const uchar *)data;
|
const uchar *source = (const uchar *)data;
|
||||||
for (size_t i = 0; i < size; i++) {
|
for (size_t i = 0; i < size; ++i) {
|
||||||
_data.v().push_back(source[i]);
|
_data.v().push_back(source[i]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user