lix-project/lix
20
57
Fork 31
Code Issues 348 Code Review (Gerrit) Projects 3 Releases Wiki Activity

Merge pull request #2741 from mayflower/primop-type-desc

Browse source 
eval: improve type description for primops and applied primops
This commit is contained in:
Eelco Dolstra 2019-03-21 15:49:19 +01:00 committed by GitHub
parent 6a3dfcb623 2aa89daab3
commit 56f1ed5579
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/libexpr/eval.cc
View file

@ -130,6 +130,16 @@ std::ostream & operator << (std::ostream & str, const Value & v)
} }
const Value *getPrimOp(const Value &v) {
const Value * primOp = &v;
while (primOp->type == tPrimOpApp) {
primOp = primOp->primOpApp.left;
}
assert(primOp->type == tPrimOp);
return primOp;
}
string showType(const Value & v) string showType(const Value & v)
{ {
switch (v.type) { switch (v.type) {
@ -144,8 +154,10 @@ string showType(const Value & v)
case tApp: return "a function application"; case tApp: return "a function application";
case tLambda: return "a function"; case tLambda: return "a function";
case tBlackhole: return "a black hole"; case tBlackhole: return "a black hole";
case tPrimOp: return "a built-in function"; case tPrimOp:
case tPrimOpApp: return "a partially applied built-in function"; return fmt("the built-in function '%s'", string(v.primOp->name));
case tPrimOpApp:
return fmt("the partially applied built-in function '%s'", string(getPrimOp(v)->primOp->name));
case tExternal: return v.external->showType(); case tExternal: return v.external->showType();
case tFloat: return "a float"; case tFloat: return "a float";
} }