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/i-funsel.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/i-funsel.boot')
| -rw-r--r-- | src/interp/i-funsel.boot | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/interp/i-funsel.boot b/src/interp/i-funsel.boot index 719142de..acdf2bd1 100644 --- a/src/interp/i-funsel.boot +++ b/src/interp/i-funsel.boot @@ -1151,7 +1151,7 @@ evalMm(op,tar,sig,mmC) == not containsVars sig => isFreeFunctionFromMmCond mmC and (m := evalMmFreeFunction(op,tar,sig,mmC)) => mS:= nconc(m,mS) - "or"/[^isValidType(arg) for arg in sig] => nil + "or"/[not isValidType(arg) for arg in sig] => nil [dc,t,:args]:= sig $Coerce or null tar or tar=t => mS:= nconc(findFunctionInDomain(op,dc,t,args,args,NIL,'T),mS) @@ -1638,8 +1638,8 @@ unifyStruct(s1,s2,SL) == s1=s2 => SL if s1 is [":",x,.] then s1:= x if s2 is [":",x,.] then s2:= x - if ^atom s1 and CAR s1 = '_# then s1:= LENGTH CADR s1 - if ^atom s2 and CAR s2 = '_# then s2:= LENGTH CADR s2 + if not atom s1 and CAR s1 = '_# then s1:= LENGTH CADR s1 + if not atom s2 and CAR s2 = '_# then s2:= LENGTH CADR s2 s1=s2 => SL isPatternVar s1 => unifyStructVar(s1,s2,SL) isPatternVar s2 => unifyStructVar(s2,s1,SL) |