diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-02-01T15·41+0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-02-01T15·41+0100 |
| commit | 2f9bb5c7e744ddca3fbe5576e520a3e80c106c55 (patch) | |
| tree | 7a3d5d57a460aa87a8f8b58d46102ca339e97770 /src/libexpr/parser.y | |
| parent | c5ba08133370f98de722c978bda3b446721985de (diff) | |
| parent | 6dca72006aa9b1cf2f226bb5b538e744fcab976f (diff) | |
Merge branch 'make'
Diffstat (limited to 'src/libexpr/parser.y')
| -rw-r--r-- | src/libexpr/parser.y | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libexpr/parser.y b/src/libexpr/parser.y index 55a42fcaba9f..8a084fea0697 100644 --- a/src/libexpr/parser.y +++ b/src/libexpr/parser.y @@ -252,7 +252,7 @@ void yyerror(YYLTYPE * loc, yyscan_t scanner, ParseData * data, const char * err nix::Formals * formals; nix::Formal * formal; nix::NixInt n; - char * id; // !!! -> Symbol + const char * id; // !!! -> Symbol char * path; char * uri; std::vector<nix::AttrName> * attrNames; @@ -414,7 +414,7 @@ expr_simple string_parts : STR | string_parts_interpolated { $$ = new ExprConcatStrings(true, $1); } - | { $$ = new ExprString(data->symbols.create("")) } + | { $$ = new ExprString(data->symbols.create("")); } ; string_parts_interpolated |