diff options
| author | dos-reis <gdr@axiomatics.org> | 2009-08-17 13:34:29 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2009-08-17 13:34:29 +0000 |
| commit | cd78da3860f838c41aedc3a0c475cfc8c23eaad3 (patch) | |
| tree | d5ff533c51c40fcfec604902bfc78c83db950a7b /src/interp/database.boot | |
| parent | f20eeee3e9937d7696cc06841f6c411a0022963e (diff) | |
| download | open-axiom-cd78da3860f838c41aedc3a0c475cfc8c23eaad3.tar.gz | |
* boot/tokens.boot: Retire "^" as negation operator.
* interp/br-search.boot: Use "not" instead of "^".
* interp/br-util.boot: Likewise.
* interp/database.boot: Likewise.
* interp/define.boot: Likewise.
* interp/format.boot: Likewise.
* interp/g-error.boot: Likewise.
* interp/i-analy.boot: Likewise.
* interp/i-coerce.boot: Likewise.
* interp/i-coerfn.boot: Likewise.
* interp/i-funsel.boot: Likewise.
* interp/i-map.boot: Likewise.
* interp/i-output.boot: Likewise.
* interp/i-resolv.boot: Likewise.
* interp/i-spec1.boot: Likewise.
* interp/i-spec2.boot: Likewise.
* interp/i-syscmd.boot: Likewise.
* interp/mark.boot: Likewise.
* interp/modemap.boot: Likewise.
* interp/pspad1.boot: Likewise.
* interp/pspad2.boot: Likewise.
* interp/spad-parser.boot: Likewise.
* interp/trace.boot: Likewise.
* interp/wi1.boot: Likewise.
* interp/wi2.boot: Likewise.
Diffstat (limited to 'src/interp/database.boot')
| -rw-r--r-- | src/interp/database.boot | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/interp/database.boot b/src/interp/database.boot index 874db5ae..1f4b8c0f 100644 --- a/src/interp/database.boot +++ b/src/interp/database.boot @@ -298,8 +298,8 @@ orderPredTran(oldList,sig,skip) == ----- (isDomain *1 ..) for pred in oldList repeat ((pred is [op,pvar,.] and MEMQ(op,'(isDomain ofCategory)) - and pvar=first sig and ^(pvar in rest sig)) or - (^skip and pred is ['isDomain,pvar,.] and pvar="*1")) => + and pvar=first sig and not (pvar in rest sig)) or + (not skip and pred is ['isDomain,pvar,.] and pvar="*1")) => oldList:=delete(pred,oldList) lastPreds:=[pred,:lastPreds] --sayBrightlyNT "lastPreds=" @@ -449,7 +449,7 @@ substVars(pred,patternAlist,patternVarList) == pred := MSUBST(patVar,value,pred) patternAlist := nsubst(patVar,value,patternAlist) domainPredicates := MSUBST(patVar,value,domainPredicates) - if ^MEMQ(value,$FormalMapVariableList) then + if not MEMQ(value,$FormalMapVariableList) then domainPredicates := [["isDomain",patVar,value],:domainPredicates] everything := [pred,patternAlist,domainPredicates] for var in $FormalMapVariableList repeat |