diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-08-27T15·09-0400 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-08-27T15·09-0400 |
commit | e94806d03098f1d6e654542500bbea1eaa0ec60b (patch) | |
tree | 4e967f3d39a984d86bb93849d76cab92512a07ce /src/libexpr/parser.y | |
parent | 9c2decaa1935ae4bf99a9b723d4eab188f8f88ef (diff) | |
parent | a9e6752bbd888ab8fbc1cda6e4d539b2858c4cef (diff) |
Merge branch 'master' into no-manifests
Diffstat (limited to 'src/libexpr/parser.y')
-rw-r--r-- | src/libexpr/parser.y | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libexpr/parser.y b/src/libexpr/parser.y index 095e288430f6..1819da5e1caa 100644 --- a/src/libexpr/parser.y +++ b/src/libexpr/parser.y @@ -203,7 +203,7 @@ static Expr * stripIndentation(SymbolTable & symbols, vector<Expr *> & es) es2->push_back(new ExprString(symbols.create(s2))); } - return new ExprConcatStrings(es2); + return es2->size() == 1 ? (*es2)[0] : new ExprConcatStrings(es2); } |