* Refactoring.
This commit is contained in:
parent
4b66cebe7b
commit
8a6080eb14
|
@ -146,12 +146,7 @@ static void processBinding(EvalState & state, Expr e, Derivation & drv,
|
|||
else if (matchUri(e, s)) ss.push_back(aterm2String(s));
|
||||
else if (e == eTrue) ss.push_back("1");
|
||||
else if (e == eFalse) ss.push_back("");
|
||||
|
||||
else if (matchInt(e, n)) {
|
||||
ostringstream st;
|
||||
st << n;
|
||||
ss.push_back(st.str());
|
||||
}
|
||||
else if (matchInt(e, n)) ss.push_back(int2String(n));
|
||||
|
||||
else if (matchAttrs(e, es)) {
|
||||
Expr a = queryAttr(e, "type");
|
||||
|
|
|
@ -360,10 +360,7 @@ Nest::~Nest()
|
|||
|
||||
static string escVerbosity(Verbosity level)
|
||||
{
|
||||
int l = (int) level;
|
||||
ostringstream st;
|
||||
st << l;
|
||||
return st.str();
|
||||
return int2String((int) level);
|
||||
}
|
||||
|
||||
|
||||
|
@ -829,6 +826,14 @@ bool statusOk(int status)
|
|||
}
|
||||
|
||||
|
||||
string int2String(int n)
|
||||
{
|
||||
ostringstream str;
|
||||
str << n;
|
||||
return str.str();
|
||||
}
|
||||
|
||||
|
||||
bool string2Int(const string & s, int & n)
|
||||
{
|
||||
istringstream str(s);
|
||||
|
|
|
@ -292,6 +292,7 @@ bool statusOk(int status);
|
|||
|
||||
|
||||
/* Parse a string into an integer. */
|
||||
string int2String(int n);
|
||||
bool string2Int(const string & s, int & n);
|
||||
|
||||
|
||||
|
|
Loading…
Reference in a new issue