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/lexer.l | |
| parent | 9bedd9b09b0b622286498b079207b80a4bbd1118 (diff) | |
| parent | c4653afbcd96bf8f43bb54c1c2f79a27fd615e11 (diff) | |
Merge branch 'tilde-paths' of https://github.com/shlevy/nix
Diffstat (limited to 'src/libexpr/lexer.l')
| -rw-r--r-- | src/libexpr/lexer.l | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/libexpr/lexer.l b/src/libexpr/lexer.l index 82520ee7a59a..7051909008d1 100644 --- a/src/libexpr/lexer.l +++ b/src/libexpr/lexer.l @@ -80,6 +80,7 @@ static Expr * unescapeStr(SymbolTable & symbols, const char * s) ID [a-zA-Z\_][a-zA-Z0-9\_\'\-]* INT [0-9]+ PATH [a-zA-Z0-9\.\_\-\+]*(\/[a-zA-Z0-9\.\_\-\+]+)+ +HPATH \~(\/[a-zA-Z0-9\.\_\-\+]+)+ SPATH \<[a-zA-Z0-9\.\_\-\+]+(\/[a-zA-Z0-9\.\_\-\+]+)*\> URI [a-zA-Z][a-zA-Z0-9\+\-\.]*\:[a-zA-Z0-9\%\/\?\:\@\&\=\+\$\,\-\_\.\!\~\*\']+ @@ -159,6 +160,7 @@ or { return OR_KW; } <IND_STRING>. return yytext[0]; /* just in case: shouldn't be reached */ {PATH} { yylval->path = strdup(yytext); return PATH; } +{HPATH} { yylval->path = strdup(yytext); return HPATH; } {SPATH} { yylval->path = strdup(yytext); return SPATH; } {URI} { yylval->uri = strdup(yytext); return URI; } |