lix-project/lix
18
47
Fork 24
Code Issues 333 Code Review (Gerrit) Projects 1 Releases Wiki Activity

Avoid concatenating lists of one string

Browse source
This commit is contained in:
Eelco Dolstra 2012-08-13 15:10:29 -04:00
parent e5c589d271
commit 767101824a
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/libexpr/eval.cc
View file

@ -965,7 +965,7 @@ void ExprConcatStrings::eval(EvalState & state, Env & env, Value & v)
isPath = vStr.type == tPath; isPath = vStr.type == tPath;
first = false; first = false;
} }
s << state.coerceToString(vStr, context, false, !isPath); s << state.coerceToString(vStr, context, false, !isPath);
} }

2
src/libexpr/parser.y
View file

@ -203,7 +203,7 @@ static Expr * stripIndentation(SymbolTable & symbols, vector<Expr *> & es)
es2->push_back(new ExprString(symbols.create(s2))); es2->push_back(new ExprString(symbols.create(s2)));
} }
return new ExprConcatStrings(es2); return es2->size() == 1 ? (*es2)[0] : new ExprConcatStrings(es2);
} }