nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-20 09:19:36 +01:00
Code Activity

* String interpolation. Expressions like

Browse source 
"--with-freetype2-library=" + freetype + "/lib"

  can now be written as

    "--with-freetype2-library=${freetype}/lib"

  An arbitrary expression can be enclosed within ${...}, not just
  identifiers.

* Escaping in string literals: \n, \r, \t interpreted as in C, any
  other character following \ is interpreted as-is.
  
* Newlines are now allowed in string literals.
This commit is contained in:
Eelco Dolstra 2006-05-01 14:01:47 +00:00
parent 6cecad2be0
commit 0064599a27
7 changed files with 88 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/libexpr/parser.cc
View file

@ -71,9 +71,29 @@ const char * getPath(ParseData * data)
return data->path.c_str();
}
int yyparse(yyscan_t scanner, ParseData * data);
Expr unescapeStr(const char * s)
{
string t;
char c;
while (c = *s++) {
if (c == '\\') {
assert(*s);
c = *s++;
if (c == 'n') t += "\n";
else if (c == 'r') t += "\r";
else if (c == 't') t += "\t";
else t += c;
}
else t += c;
}
return makeStr(toATerm(t));
}
int yyparse(yyscan_t scanner, ParseData * data);
} /* end of C functions */
static void checkAttrs(ATermMap & names, ATermList bnds)
{