From c5659a8580de5b531891c6703465c84add9fbb1b Mon Sep 17 00:00:00 2001 From: dos-reis Date: Sun, 13 Apr 2008 06:22:18 +0000 Subject: Various cleanups. --- src/interp/i-eval.boot | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/interp/i-eval.boot') diff --git a/src/interp/i-eval.boot b/src/interp/i-eval.boot index 156caec9..6d31ceb8 100644 --- a/src/interp/i-eval.boot +++ b/src/interp/i-eval.boot @@ -55,7 +55,7 @@ mkEvalable form == op="Mapping"=> mkEvalableMapping form op="Enumeration" => form loadIfNecessary op - kind:= GETDATABASE(op,'CONSTRUCTORKIND) + kind:= getConstructorKindFromDB op cosig := GETDATABASE(op, 'COSIG) => [op,:[val for x in argl for typeFlag in rest cosig]] where val() == typeFlag => @@ -182,7 +182,7 @@ evaluateType1 (form is [op,:argl]) == evalCategory(x' := (evaluateType x), m) => x' throwEvalTypeMsg("S2IE0004",[form]) m := evaluateType m - GETDATABASE(opOf m,'CONSTRUCTORKIND) = 'domain and + getConstructorKindFromDB opOf m = "domain" and (tree := mkAtree x) and putTarget(tree,m) and ((bottomUp tree) is [m1]) => [zt,:zv]:= z1:= getAndEvalConstructorArgument tree (v' := coerceOrRetract(z1,m)) => objValUnwrap v' -- cgit v1.2.3