diff options
| author | dos-reis <gdr@axiomatics.org> | 2008-04-14 01:59:56 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2008-04-14 01:59:56 +0000 |
| commit | 663089e7f95f4901a46939ef34c60982dd5aadda (patch) | |
| tree | 591d333d98a1eaf5b3c22d57e75ece8c56f9619b /src/interp/i-funsel.boot | |
| parent | c5659a8580de5b531891c6703465c84add9fbb1b (diff) | |
| download | open-axiom-663089e7f95f4901a46939ef34c60982dd5aadda.tar.gz | |
Various cleanups.
Diffstat (limited to 'src/interp/i-funsel.boot')
| -rw-r--r-- | src/interp/i-funsel.boot | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/interp/i-funsel.boot b/src/interp/i-funsel.boot index 0857b4a4..bce242f8 100644 --- a/src/interp/i-funsel.boot +++ b/src/interp/i-funsel.boot @@ -1248,12 +1248,12 @@ coerceTypeArgs(t1, t2, SL) == -- if needed. t1 isnt [con1, :args1] or t2 isnt [con2, :args2] => t2 con1 ^= con2 => t2 - coSig := CDR GETDATABASE(CAR t1, 'COSIG) + coSig := rest getDualSignatureFromDB first t1 and/coSig => t2 csub1 := constructSubst t1 csub2 := constructSubst t2 - cs1 := CDR getConstructorSignature con1 - cs2 := CDR getConstructorSignature con2 + cs1 := rest getConstructorSignature con1 + cs2 := rest getConstructorSignature con2 [con1, : [makeConstrArg(arg1, arg2, constrArg(c1,csub1,SL), constrArg(c2,csub2,SL), cs) @@ -1601,7 +1601,7 @@ hasAtt(dom,att,SL) == -- needs S0 similar to hasSig above ?? $domPvar: local := nil fun:= CAR dom => - atts:= subCopy(GETDATABASE(fun,'ATTRIBUTES),constructSubst dom) => + atts:= subCopy(getConstructorAttributesFromDB fun,constructSubst dom) => PAIRP (u := getInfovec CAR dom) => --UGH! New world has attributes stored as pairs not as lists!! for [x,:cond] in atts until not (S='failed) repeat @@ -1746,7 +1746,7 @@ defaultTypeForCategory(cat, SL) == -- calls this and should possibly fail in some cases. cat := subCopy(cat, SL) c := CAR cat - d := GETDATABASE(c, 'DEFAULTDOMAIN) + d := getConstructorDefaultFromDB c d => [d, :CDR cat] cat is [c] => c = 'Field => $RationalNumber |