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-coerce.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-coerce.boot')
| -rw-r--r-- | src/interp/i-coerce.boot | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/interp/i-coerce.boot b/src/interp/i-coerce.boot index 663b1178..a6012574 100644 --- a/src/interp/i-coerce.boot +++ b/src/interp/i-coerce.boot @@ -974,7 +974,7 @@ coerceUnion2Branch(object) == val' := objValUnwrap object predicate := NIL targetType:= NIL - for typ in doms for pred in predList while ^targetType repeat + for typ in doms for pred in predList while null targetType repeat thisUnionBranch?(pred,val') => predicate := pred targetType := typ @@ -1027,7 +1027,7 @@ coerceIntByMap(triple,t2) == u1 := deconstructT t1 1 = #u1 => NIL CAAR u1 ~= CAAR u2 => nil -- constructors not equal - ^valueArgsEqual?(t1, t2) => NIL + not valueArgsEqual?(t1, t2) => NIL -- CAR u1 ~= CAR u2 => NIL top := CAAR u1 u1 := underDomainOf t1 @@ -1282,7 +1282,7 @@ coerceIntTest(t1,t2) == coerceByTable(fn,x,t1,t2,isTotalCoerce) == -- catch point for 'failure in boot coercions - t2 = $OutputForm and ^(newType? t1) => NIL + t2 = $OutputForm and not (newType? t1) => NIL isWrapped x => x:= unwrap x c:= CATCH('coerceFailure,FUNCALL(fn,x,t1,t2)) |