maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* Use a map to lookup primops.

Browse source 
* Various performance improvements in the evaluator.
* Do not link against unused (and missing!) libraries (-lsglr, etc.).
This commit is contained in:
Eelco Dolstra 2004-02-04 16:03:29 +00:00
parent c4f7ae4aa5
commit 9b44480612
12 changed files with 127 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/libexpr/parser.cc
View file

@ -66,7 +66,8 @@ int yyparse(yyscan_t scanner, ParseData * data);
}
static Expr parse(const char * text, const string & location,
static Expr parse(EvalState & state,
const char * text, const string & location,
const Path & basePath)
{
yyscan_t scanner;
@ -81,18 +82,8 @@ static Expr parse(const char * text, const string & location,
if (res) throw Error(data.error);
ATermMap primOps;
primOps.set("import", (ATerm) ATempty);
primOps.set("derivation", (ATerm) ATempty);
primOps.set("true", (ATerm) ATempty);
primOps.set("false", (ATerm) ATempty);
primOps.set("null", (ATerm) ATempty);
primOps.set("isNull", (ATerm) ATempty);
primOps.set("toString", (ATerm) ATempty);
primOps.set("baseNameOf", (ATerm) ATempty);
try {
checkVarDefs(primOps, data.result);
checkVarDefs(state.primOpsAll, data.result);
} catch (Error & e) {
throw Error(format("%1%, in %2%") % e.msg() % location);
}
@ -101,7 +92,7 @@ static Expr parse(const char * text, const string & location,
}
Expr parseExprFromFile(Path path)
Expr parseExprFromFile(EvalState & state, Path path)
{
assert(path[0] == '/');
@ -137,11 +128,12 @@ Expr parseExprFromFile(Path path)
readFull(fd, (unsigned char *) text, st.st_size);
text[st.st_size] = 0;
return parse(text, "`" + path + "'", dirOf(path));
return parse(state, text, "`" + path + "'", dirOf(path));
}
Expr parseExprFromString(const string & s, const Path & basePath)
Expr parseExprFromString(EvalState & state,
const string & s, const Path & basePath)
{
return parse(s.c_str(), "(string)", basePath);
return parse(state, s.c_str(), "(string)", basePath);
}