diff options
author | Eelco Dolstra <e.dolstra@tudelft.nl> | 2003-07-04T15·29+0000 |
---|---|---|
committer | Eelco Dolstra <e.dolstra@tudelft.nl> | 2003-07-04T15·29+0000 |
commit | 01b34fe5843df9888737699ee9f9fe2f161a1fa3 (patch) | |
tree | aceb2e7be03951e20d4af2f8d666f957f6925d47 /src/eval.cc | |
parent | 207ff2caf0f48db0fb539e228ec5c3938a279f2a (diff) |
* Cleanup.
Diffstat (limited to 'src/eval.cc')
-rw-r--r-- | src/eval.cc | 36 |
1 files changed, 2 insertions, 34 deletions
diff --git a/src/eval.cc b/src/eval.cc index 4eb222197d38..be8b70a039be 100644 --- a/src/eval.cc +++ b/src/eval.cc @@ -106,7 +106,7 @@ static void runProgram(const string & program, Environment env) } catch (exception & e) { cerr << format("build error: %1%\n") % e.what(); - } + } _exit(1); } @@ -159,38 +159,6 @@ Hash hashTerm(ATerm t) } -#if 0 -/* Evaluate a list of arguments into normal form. */ -void evalArgs(ATermList args, ATermList & argsNF, Environment & env) -{ - argsNF = ATempty; - - while (!ATisEmpty(args)) { - ATerm eName, eVal, arg = ATgetFirst(args); - if (!ATmatch(arg, "Tup(<term>, <term>)", &eName, &eVal)) - throw badTerm("invalid argument", arg); - - string name = evalString(eName); - eVal = evalValue(eVal); - - char * s; - if (ATmatch(eVal, "Str(<str>)", &s)) { - env[name] = s; - } else if (ATmatch(eVal, "Hash(<str>)", &s)) { - env[name] = queryValuePath(parseHash(s)); - } else throw badTerm("invalid argument value", eVal); - - argsNF = ATinsert(argsNF, - ATmake("Tup(Str(<str>), <term>)", name.c_str(), eVal)); - - args = ATgetNext(args); - } - - argsNF = ATreverse(argsNF); -} -#endif - - struct RStatus { /* !!! the comparator of this hash should match the semantics of @@ -362,7 +330,7 @@ static FState realise(RStatus & status, FState fs) return nf; } - throw badTerm("bad file system state expression", fs); + throw badTerm("bad fstate expression", fs); } |