grahamc/hydra2 - Change 7YCFGMZBCWDOOO3DHSJ3ZWPUWFMEO6OLQGDZWLULAPER3YZOYUJAC

* Report evaluation errors per job, and don't bail out if a job fails

to evaluate.

Created by Eelco Dolstra on March 7, 2009

7YCFGMZBCWDOOO3DHSJ3ZWPUWFMEO6OLQGDZWLULAPER3YZOYUJAC

Dependencies

In channels

main

Change contents

Insertion in src/c/eval-jobs.cc at line 65 [3.303]

[2.1405]

}
static void showArgsUsed(XMLWriter & doc, const ATermMap & argsUsed)
{
    foreach (ATermMap::const_iterator, i, argsUsed) {
        XMLAttrs xmlAttrs2;
        xmlAttrs2["name"] = aterm2String(i->key);
        xmlAttrs2["value"] = showValue(i->value);
        doc.writeEmptyElement("arg", xmlAttrs2);
    }

Replacement in src/c/eval-jobs.cc at line 79 [3.303]

B:BD[2.1413] → [2.1413:1470]

static void findJobs(EvalState & state, XMLWriter & doc,

[2.1413]

[2.1470]

static void findJobsWrapped(EvalState & state, XMLWriter & doc,

Replacement in src/c/eval-jobs.cc at line 113 [3.303]

B:BD[4.1148] → [2.1577:1863]


            foreach (ATermMap::const_iterator, i, argsUsed) {
                XMLAttrs xmlAttrs2;
                xmlAttrs2["name"] = aterm2String(i->key);
                xmlAttrs2["value"] = showValue(i->value);
                doc.writeEmptyElement("arg", xmlAttrs2);
            }

[4.1148]

            showArgsUsed(doc, argsUsed);

Replacement in src/c/eval-jobs.cc at line 128 [3.303]

B:BD[2.2029] → [2.2029:2102]

        printMsg(lvlError, format("unknown value: %1%") % showValue(e));

[2.2029]

[3.541]

        throw TypeError(format("unknown value: %1%") % showValue(e));
}
static void findJobs(EvalState & state, XMLWriter & doc,
    const ATermMap & argsUsed, const ATermMap & argsLeft,
    Expr e, const string & attrPath)
{
    try {
        findJobsWrapped(state, doc, argsUsed, argsLeft, e, attrPath);
    } catch (Error & e) {
        XMLAttrs xmlAttrs;
        xmlAttrs["location"] = attrPath;
        xmlAttrs["msg"] = e.msg();
        XMLOpenElement _(doc, "error", xmlAttrs);
        showArgsUsed(doc, argsUsed);
    }

Replacement in src/c/eval-jobs.cc at line 156 [3.303]
B:BD[3.711] → [2.2127:2157]
```
        if (arg == "--arg") {
```
[3.711]
[2.2157]
```
        if (arg == "--arg" || arg == "--argstr") {
```

Replacement in src/c/eval-jobs.cc at line 165 [3.303]

B:BD[2.2604] → [2.2604:2674]

            Expr e = parseExprFromString(state, value, absPath("."));

[2.2604]

[2.2674]

            Expr e = arg == "--arg"
                ? parseExprFromString(state, value, absPath("."))
                : makeStr(value);