diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-02-19T13·55+0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-02-19T13·55+0100 |
| commit | c33244d7c19a43173676d14215e188270f31f115 (patch) | |
| tree | 04b336817bef045562b2a9c132994834a5b6c9b7 /src/libexpr/parser.y | |
| parent | 9bedd9b09b0b622286498b079207b80a4bbd1118 (diff) | |
| parent | c4653afbcd96bf8f43bb54c1c2f79a27fd615e11 (diff) | |
Merge branch 'tilde-paths' of https://github.com/shlevy/nix
Diffstat (limited to 'src/libexpr/parser.y')
| -rw-r--r-- | src/libexpr/parser.y | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libexpr/parser.y b/src/libexpr/parser.y index 091d59071c77..d70d29be8ba7 100644 --- a/src/libexpr/parser.y +++ b/src/libexpr/parser.y @@ -268,7 +268,7 @@ void yyerror(YYLTYPE * loc, yyscan_t scanner, ParseData * data, const char * err %token <id> ID ATTRPATH %token <e> STR IND_STR %token <n> INT -%token <path> PATH SPATH +%token <path> PATH HPATH SPATH %token <uri> URI %token IF THEN ELSE ASSERT WITH LET IN REC INHERIT EQ NEQ AND OR IMPL OR_KW %token DOLLAR_CURLY /* == ${ */ @@ -375,6 +375,7 @@ expr_simple $$ = stripIndentation(CUR_POS, data->symbols, *$2); } | PATH { $$ = new ExprPath(absPath($1, data->basePath)); } + | HPATH { $$ = new ExprPath(getEnv("HOME", "") + string{$1 + 1}); } | SPATH { string path($1 + 1, strlen($1) - 2); $$ = new ExprApp(CUR_POS, |