diff options
author | dos-reis <gdr@axiomatics.org> | 2009-08-14 10:48:09 +0000 |
---|---|---|
committer | dos-reis <gdr@axiomatics.org> | 2009-08-14 10:48:09 +0000 |
commit | d2afe2366c2c592327cd0eb6593a3536a6eff54d (patch) | |
tree | 11438ab261e17b8ccdd1f91ba83bb3b93032ec5e /src/interp/i-resolv.boot | |
parent | 9bcc210fb444e41fc45e6ccd9ef2be197337d3e8 (diff) | |
download | open-axiom-d2afe2366c2c592327cd0eb6593a3536a6eff54d.tar.gz |
* boot/tokens.boot: Retire "^=". Introduce "~=".
* boot/ast.boot: Use "~=" instead of "^=".
* boot/includer.boot: Likewise.
* boot/translator.boot: Likewise.
* interp/as.boot: Likewise.
* interp/bc-misc.boot: Likewise.
* interp/bc-solve.boot: Likewise.
* interp/bc-util.boot: Likewise.
* interp/br-con.boot: Likewise.
* interp/br-data.boot: Likewise.
* interp/br-op1.boot: Likewise.
* interp/br-op2.boot: Likewise.
* interp/br-prof.boot: Likewise.
* interp/br-saturn.boot: Likewise.
* interp/br-search.boot: Likewise.
* interp/br-util.boot: Likewise.
* interp/c-doc.boot: Likewise.
* interp/c-util.boot: Likewise.
* interp/category.boot: Likewise.
* interp/cattable.boot: Likewise.
* interp/clam.boot: Likewise.
* interp/clammed.boot: Likewise.
* interp/compiler.boot: Likewise.
* interp/database.boot: Likewise.
* interp/define.boot: Likewise.
* interp/format.boot: Likewise.
* interp/fortcall.boot: Likewise.
* interp/functor.boot: Likewise.
* interp/g-cndata.boot: Likewise.
* interp/g-opt.boot: Likewise.
* interp/g-timer.boot: Likewise.
* interp/g-util.boot: Likewise.
* interp/guess.boot: Likewise.
* interp/ht-root.boot: Likewise.
* interp/ht-util.boot: Likewise.
* interp/htsetvar.boot: Likewise.
* interp/i-analy.boot: Likewise.
* interp/i-code.boot: Likewise.
* interp/i-coerce.boot: Likewise.
* interp/i-coerfn.boot: Likewise.
* interp/i-eval.boot: Likewise.
* interp/i-funsel.boot: Likewise.
* interp/i-intern.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/i-toplev.boot: Likewise.
* interp/i-util.boot: Likewise.
* interp/int-top.boot: Likewise.
* interp/interop.boot: Likewise.
* interp/intfile.boot: Likewise.
* interp/lisplib.boot: Likewise.
* interp/macex.boot: Likewise.
* interp/mark.boot: Likewise.
* interp/match.boot: Likewise.
* interp/modemap.boot: Likewise.
* interp/msg.boot: Likewise.
* interp/msgdb.boot: Likewise.
* interp/newfort.boot: Likewise.
* interp/nruncomp.boot: Likewise.
* interp/nrunfast.boot: Likewise.
* interp/nrungo.boot: Likewise.
* interp/nrunopt.boot: Likewise.
* interp/parse.boot: Likewise.
* interp/pathname.boot: Likewise.
* interp/pf2atree.boot: Likewise.
* interp/pf2sex.boot: Likewise.
* interp/postpar.boot: Likewise.
* interp/profile.boot: Likewise.
* interp/pspad1.boot: Likewise.
* interp/pspad2.boot: Likewise.
* interp/record.boot: Likewise.
* interp/scan.boot: Likewise.
* interp/setvars.boot: Likewise.
* interp/simpbool.boot: Likewise.
* interp/slam.boot: Likewise.
* interp/topics.boot: Likewise.
* interp/trace.boot: Likewise.
* interp/wi1.boot: Likewise.
* interp/wi2.boot: Likewise.
* interp/word.boot: Likewise.
Diffstat (limited to 'src/interp/i-resolv.boot')
-rw-r--r-- | src/interp/i-resolv.boot | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/interp/i-resolv.boot b/src/interp/i-resolv.boot index 75aca0e1..ccbb923b 100644 --- a/src/interp/i-resolv.boot +++ b/src/interp/i-resolv.boot @@ -215,7 +215,7 @@ resolveTTSpecial(t1,t2) == t1 is ['FunctionCalled,f] and t2 is ['FunctionCalled,g] => null (mf := get(f,'mode,$e)) => NIL null (mg := get(g,'mode,$e)) => NIL - mf ^= mg => NIL + mf ~= mg => NIL mf t1 is ['UnivariatePolynomial,x,S] => EQCAR(t2,'Variable) => @@ -376,8 +376,8 @@ resolveTCat(t,c) == sd := superType t => resolveTCat(sd,c) - SIZE(td := deconstructT t) ^= 2=> NIL - SIZE(tc := deconstructT c) ^= 2 => NIL + SIZE(td := deconstructT t) ~= 2=> NIL + SIZE(tc := deconstructT c) ~= 2 => NIL ut := underDomainOf t null isValidType(uc := last tc) => NIL null canCoerceFrom(ut,uc) => NIL @@ -509,12 +509,12 @@ resolveTM1(t,m) == $Coerce and canCoerceFrom(t,m) and m resolveTMRecord(tr,mr) == - #tr ^= #mr => NIL + #tr ~= #mr => NIL ok := true tt := NIL for ta in tr for ma in mr while ok repeat -- element is [':,tag,mode] - CADR(ta) ^= CADR(ma) => ok := NIL -- match tags + CADR(ta) ~= CADR(ma) => ok := NIL -- match tags ra := resolveTM1(CADDR ta, CADDR ma) -- resolve modes null ra => ok := NIL tt := CONS([CAR ta,CADR ta,ra],tt) @@ -605,7 +605,7 @@ resolveTMSpecial(t,m) == t is ['Fraction, ['Polynomial, ['Complex, t1]]] and m is ['Complex, m1] => resolveTM1(['Complex, ['Fraction, ['Polynomial, t1]]], m) t is ['Mapping,:lt] and m is ['Mapping,:lm] => - #lt ^= #lm => NIL + #lt ~= #lm => NIL l := NIL ok := true for at in lt for am in lm while ok repeat |