bool negate = (pattern[0]=='!');
vector<string> parts = split(pattern.substr(negate), "-");
resolve_aliases(parts);
- for(vector<string>::const_iterator i=parts.begin(); i!=parts.end(); ++i)
+ for(const string &p: parts)
{
- if((*i=="32" && bits==32) || (*i=="64" && bits==64))
+ if((p=="32" && bits==32) || (p=="64" && bits==64))
;
- else if(*i!=type && *i!=cpu && *i!=fpu && *i!=system && *i!=toolchain)
+ else if(p!=type && p!=cpu && p!=fpu && p!=system && p!=toolchain)
return negate;
}
return !negate;
{
string best;
unsigned best_size = 0;
- for(vector<string>::const_iterator i=names.begin(); i!=names.end(); ++i)
- if(match_name(*i))
+ for(const string &n: names)
+ if(match_name(n))
{
/* TODO Do full parse and alias resolution here? Otherwise x86 and
x86_64 are treated as equally good, even though the latter is more
specific. */
unsigned size = 1;
- for(string::const_iterator j=i->begin(); j!=i->end(); ++j)
- size += (*j=='-');
+ for(char c: n)
+ size += (c=='-');
if(size>best_size)
{
- best = *i;
+ best = n;
best_size = size;
}
}
{
vector<string> parts = split(spec, "-");
resolve_aliases(parts);
- for(vector<string>::const_iterator i=parts.begin(); i!=parts.end(); ++i)
+ for(const string &p: parts)
{
bool ok = false;
for(unsigned j=0; (!ok && types[j]); ++j)
- if(*i==types[j])
+ if(p==types[j])
{
- if(!type.empty() && *i!=type)
+ if(!type.empty() && p!=type)
throw invalid_argument("Conflicting type specification");
- type = *i;
+ type = p;
ok = true;
}
for(unsigned j=0; (!ok && cpus[j]); j+=2)
- if(*i==cpus[j])
+ if(p==cpus[j])
{
if(type.empty())
type = cpus[j+1];
else if(cpus[j+1]!=type)
throw invalid_argument("Conflicting CPU specification");
- cpu = *i;
+ cpu = p;
ok = true;
}
for(unsigned j=0; (!ok && fpus[j]); j+=2)
- if(*i==fpus[j])
+ if(p==fpus[j])
{
if(fpus[j+1]!=type)
throw invalid_argument("Conflicting FPU specification");
- fpu = *i;
+ fpu = p;
ok = true;
}
for(unsigned j=0; (!ok && systems[j]); ++j)
- if(*i==systems[j])
+ if(p==systems[j])
{
- system = *i;
+ system = p;
ok = true;
}
for(unsigned j=0; (!ok && toolchains[j]); ++j)
- if(*i==toolchains[j])
+ if(p==toolchains[j])
{
- toolchain = *i;
+ toolchain = p;
ok = true;
}
- if(!ok && (*i=="32" || *i=="64"))
+ if(!ok && (p=="32" || p=="64"))
{
- bits = lexical_cast<unsigned>(*i);
+ bits = lexical_cast<unsigned>(p);
ok = true;
}
if(!ok)
- throw invalid_argument("Unrecognized part in arch specification: "+*i);
+ throw invalid_argument("Unrecognized part in arch specification: "+p);
}
}