diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-03-08T00·24+0100 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-03-08T00·24+0100 |
commit | bdd4646338da296fdf3a8f9dc3cf5aff1dafa163 (patch) | |
tree | 8bda49fe3eaef361a025c0f3b64ea51ea7728cbe /src/libexpr/parser.y | |
parent | e73d9e948887621906363a35c980538294898a02 (diff) |
Revert "Prevent config.h from being clobbered"
This reverts commit 28bba8c44f484eae38e8a15dcec73cfa999156f6.
Diffstat (limited to 'src/libexpr/parser.y')
-rw-r--r-- | src/libexpr/parser.y | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libexpr/parser.y b/src/libexpr/parser.y index 1819da5e1caa..66edfb548b32 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 es2->size() == 1 ? (*es2)[0] : new ExprConcatStrings(es2); + return es2->size() == 1 ? (*es2)[0] : new ExprConcatStrings(true, es2); } @@ -318,7 +318,7 @@ expr_op { vector<Expr *> * l = new vector<Expr *>; l->push_back($1); l->push_back($3); - $$ = new ExprConcatStrings(l); + $$ = new ExprConcatStrings(false, l); } | expr_op CONCAT expr_op { $$ = new ExprOpConcatLists($1, $3); } | expr_app @@ -349,7 +349,7 @@ expr_simple /* For efficiency, and to simplify parse trees a bit. */ if ($2->empty()) $$ = new ExprString(data->symbols.create("")); else if ($2->size() == 1) $$ = $2->front(); - else $$ = new ExprConcatStrings($2); + else $$ = new ExprConcatStrings(true, $2); } | IND_STRING_OPEN ind_string_parts IND_STRING_CLOSE { $$ = stripIndentation(data->symbols, *$2); |