aboutsummaryrefslogtreecommitdiff
path: root/src/interp/i-map.boot
diff options
context:
space:
mode:
authordos-reis <gdr@axiomatics.org>2009-08-14 10:48:09 +0000
committerdos-reis <gdr@axiomatics.org>2009-08-14 10:48:09 +0000
commitd2afe2366c2c592327cd0eb6593a3536a6eff54d (patch)
tree11438ab261e17b8ccdd1f91ba83bb3b93032ec5e /src/interp/i-map.boot
parent9bcc210fb444e41fc45e6ccd9ef2be197337d3e8 (diff)
downloadopen-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-map.boot')
-rw-r--r--src/interp/i-map.boot22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/interp/i-map.boot b/src/interp/i-map.boot
index d0969c48..74829990 100644
--- a/src/interp/i-map.boot
+++ b/src/interp/i-map.boot
@@ -59,7 +59,7 @@ isInternalMapName name ==
-- this only returns true or false as a "best guess"
(not IDENTP(name)) or (name = "*") or (name = "**") => false
sz := SIZE (name' := PNAME name)
- (sz < 7) or (char("*") ^= name'.0) => false
+ (sz < 7) or (char("*") ~= name'.0) => false
null DIGITP name'.1 => false
null STRPOS('"_;",name',1,NIL) => false
-- good enough
@@ -106,7 +106,7 @@ addDefMap(['DEF,lhs,mapsig,.,rhs],pred) ==
throwKeyedMsg("S2IM0002",[lhs])
-- verify a constructor abbreviation is not used on the lhs
- op ^= (op' := unabbrev op) => throwKeyedMsg("S2IM0003",[op,op'])
+ op ~= (op' := unabbrev op) => throwKeyedMsg("S2IM0003",[op,op'])
-- get the formal parameters. These should only be atomic symbols
-- that are not numbers.
@@ -139,9 +139,9 @@ addDefMap(['DEF,lhs,mapsig,.,rhs],pred) ==
-- same as what is given.
if get(op,'mode,$e) is ['Mapping,.,:mapargs] then
EQCAR(rhs,'rules) =>
- 0 ^= (numargs := # rest lhs) =>
+ 0 ~= (numargs := # rest lhs) =>
throwKeyedMsg("S2IM0027",[numargs,op])
- # rest lhs ^= # mapargs => throwKeyedMsg("S2IM0008",[op])
+ # rest lhs ~= # mapargs => throwKeyedMsg("S2IM0008",[op])
--get all the user variables in the map definition. This is a multi
--step process as this should not include recursive calls to the map
--itself, or the formal parameters
@@ -173,7 +173,7 @@ addMap(lhs,rhs,pred) ==
argPredList:= NREVERSE predList
finalPred :=
-- handle g(a,T)==a+T confusion between pred=T and T variable
- MKPF((pred and (pred ^= 'T) => [:argPredList,SUBLISNQ($sl,pred)]; argPredList),"and")
+ MKPF((pred and (pred = 'T) => [:argPredList,SUBLISNQ($sl,pred)]; argPredList),"and")
body:= SUBLISNQ($sl,rhs)
oldMap :=
(obj := get(op,'value,$InteractiveFrame)) => objVal obj
@@ -516,7 +516,7 @@ analyzeMap0(op,argTypes,mapDef) ==
-- Type analyze and compile a map. Returns the target type of the map.
-- only called if there is no applicable compiled map
$MapArgumentTypeList:local:= argTypes
- numMapArgs mapDef ^= #argTypes => nil
+ numMapArgs mapDef ~= #argTypes => nil
((m:=getMode op) is ['Mapping,:sig]) or (m and (sig:=[m])) =>
-- op has mapping property only if user has declared the signature
analyzeDeclaredMap(op,argTypes,sig,mapDef,$mapList)
@@ -648,9 +648,9 @@ interpMap(opName,tar) ==
savedTimerStack := COPY $timedNameStack
catchName := mapCatchName $mapName
c := CATCH(catchName, interpret1(body,tar,nil))
--- $interpMapTag and $interpMapTag ^= mapCatchName $mapName =>
+-- $interpMapTag and $interpMapTag ~= mapCatchName $mapName =>
-- THROW($interpMapTag,c)
- while savedTimerStack ^= $timedNameStack repeat
+ while savedTimerStack ~= $timedNameStack repeat
stopTimingProcess peekTimedName()
c -- better be a triple
@@ -666,7 +666,7 @@ analyzeDeclaredMap(op,argTypes,sig,mapDef,$mapList) ==
compileCoerceMap(opName,argTypes,mm)
-- The declared map needs to be compiled
compileDeclaredMap(opName,sig,mapDef)
- argTypes ^= CDR sig =>
+ argTypes ~= CDR sig =>
analyzeDeclaredMap(op,argTypes,sig,mapDef,$mapList)
CAR sig
@@ -829,7 +829,7 @@ analyzeRecursiveMap(op,argTypes,body,parms,n) ==
sigChanged:= false
name := makeLocalModemap(op,sig:=[tar,:argTypes])
code := compileBody(body,$mapTarget)
- objMode(code) ^= tar =>
+ objMode(code) ~= tar =>
sigChanged:= true
tar := objMode(code)
restoreDependentMapInfo(op, CDR $mapList, localMapInfo)
@@ -876,7 +876,7 @@ nonRecursivePart(opName, funBody) ==
-- a function, and returns a list of the parts
-- of the function which are not recursive in the name opName
body:= expandRecursiveBody([opName], funBody)
- ((nrp:=nonRecursivePart1(opName, body)) ^= '%noMapVal) => nrp
+ ((nrp:=nonRecursivePart1(opName, body)) ~= '%noMapVal) => nrp
throwKeyedMsg("S2IM0012",[opName])
expandRecursiveBody(alreadyExpanded, body) ==