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-analy.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-analy.boot')
| -rw-r--r-- | src/interp/i-analy.boot | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/interp/i-analy.boot b/src/interp/i-analy.boot index bcf01ce8..3f2ba6d3 100644 --- a/src/interp/i-analy.boot +++ b/src/interp/i-analy.boot @@ -253,7 +253,7 @@ bottomUp t == argModeSetList:= [bottomUp x for x in argl] - if ^tar and opName = "*" and nargs = 2 then + if null tar and opName = "*" and nargs = 2 then [[t1],[t2]] := argModeSetList tar := computeTypeWithVariablesTarget(t1, t2) tar => @@ -530,7 +530,7 @@ bottomUpForm2(t,op,opName,argl,argModeSetList) == -- modesets are the same $genValue and - ^(opName = "=" and argModeSetList is [[m],[=m]] and m is ['Union,:.]) and + not (opName = "=" and argModeSetList is [[m],[=m]] and m is ['Union,:.]) and (u := bottomUpFormUntaggedUnionRetract(t,op,opName,argl,argModeSetList)) => u lookForIt and (u := bottomUpFormTuple(t, op, opName, argl, argModeSetList)) => u @@ -849,15 +849,15 @@ bottomUpElt (form:=[op,:argl]) == newOps := [mkAtreeNode "elt", mkAtreeNode "apply"] u := nil - while ^u for newOp in newOps repeat + while null u for newOp in newOps repeat newArgs := [op,:argl] if selectMms(newOp, newArgs, target) then RPLAC(CDR form, newArgs) RPLAC(CAR form, newOp) u := bottomUp form - while ^u and ( "and"/[retractAtree(a) for a in newArgs] ) repeat - while ^u for newOp in newOps repeat + while null u and ( "and"/[retractAtree(a) for a in newArgs] ) repeat + while null u for newOp in newOps repeat newArgs := [op,:argl] if selectMms(newOp, newArgs, target) then RPLAC(CDR form, newArgs) |