diff options
| author | dos-reis <gdr@axiomatics.org> | 2010-07-11 12:01:35 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2010-07-11 12:01:35 +0000 |
| commit | 7dee86947c3b587f0b365eeb3a8c0cb3c5510c3c (patch) | |
| tree | 20dc0c94ee739c1acf1462ebba3fe20c851c52bf /src/interp/i-funsel.boot | |
| parent | 452dc63a67da26ebe9e1578378512d7884775f3e (diff) | |
| download | open-axiom-7dee86947c3b587f0b365eeb3a8c0cb3c5510c3c.tar.gz | |
* interp/database.boot (markUnique): Remove.
($FunctionDescriptorTail): Likewise.
(getOperationAlistFromLisplib): Likewise.
(getOplistForConstructorForm): Adjust.
* interp/br-op1.boot (getDomainOpTable): Likewise.
* interp/br-op2.boot (koOps): Likewise.
* interp/define.boot (genDomainViewList): Likewise.
* interp/i-analy.boot (namedConstant): Likewise.
* interp/i-coerce.boot (getConstantFromDomain): Likewise.
* interp/i-funsel.boot (isOpInDomain): Likewise.
(findCommonSigInDomain): Likewise.
(findUniqueOpInDomain): Likewise.
(hasSig): Likewise.
* interp/i-spec2.boot (constantInDomain?): Likewise.
* interp/trace.boot (spadTrace): Likewise.
* interp/lisplib.boot (transformOperationAlist): Simplify.
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 0c3acb0a..51b3ccde 100644 --- a/src/interp/i-funsel.boot +++ b/src/interp/i-funsel.boot @@ -690,7 +690,7 @@ getFunctionFromDomain(op,dc,args) == isOpInDomain(opName,dom,nargs) == -- returns true only if there is an op in the given domain with -- the given number of arguments - mmList := ASSQ(opName,getOperationAlistFromLisplib first dom) + mmList := ASSQ(opName,getConstructorOperationsFromDB dom.op) mmList := subCopy(mmList,constructSubst dom) null mmList => NIL gotOne := NIL @@ -705,7 +705,7 @@ findCommonSigInDomain(opName,dom,nargs) == -- a "signature" where a type position is non-NIL only if all -- signatures shares that type . first(dom) in '(Union Record Mapping) => NIL - mmList := ASSQ(opName,getOperationAlistFromLisplib first dom) + mmList := ASSQ(opName,getConstructorOperationsFromDB dom.op) mmList := subCopy(mmList,constructSubst dom) null mmList => NIL gotOne := NIL @@ -720,7 +720,7 @@ findCommonSigInDomain(opName,dom,nargs) == findUniqueOpInDomain(op,opName,dom) == -- return function named op in domain dom if unique, choose one if not - mmList := ASSQ(opName,getOperationAlistFromLisplib first dom) + mmList := ASSQ(opName,getConstructorOperationsFromDB dom.op) mmList := subCopy(mmList,constructSubst dom) null mmList => throwKeyedMsg("S2IS0021",[opName,dom]) @@ -792,7 +792,7 @@ findFunctionInDomain(op,dc,tar,args1,args2,$Coerce,$SubDom) == findFunctionInCategory(op,dc,tar,args1,args2,$Coerce,$SubDom) NIL fun:= NIL - ( p := ASSQ(op,getOperationAlistFromLisplib dcName) ) and + ( p := ASSQ(op,getConstructorOperationsFromDB dcName) ) and SL := constructSubst dc -- if the arglist is homogeneous, first look for homogeneous -- functions. If we don't find any, look at remaining ones @@ -1586,7 +1586,7 @@ hasSig(dom,foo,sig,SL) == $domPvar: local := nil fun:= constructor? first dom => S0:= constructSubst dom - p := ASSQ(foo,getOperationAlistFromLisplib first dom) => + p := ASSQ(foo,getConstructorOperationsFromDB dom.op) => for [x,.,cond,.] in rest p until not (S='failed) repeat S:= atom cond => copy SL |