aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/interp/ChangeLog8
-rw-r--r--src/interp/i-analy.boot2
-rw-r--r--src/interp/i-intern.boot2
-rw-r--r--src/interp/i-map.boot18
-rw-r--r--src/interp/i-spec1.boot2
-rw-r--r--src/interp/i-spec2.boot4
6 files changed, 22 insertions, 14 deletions
diff --git a/src/interp/ChangeLog b/src/interp/ChangeLog
index a8aa4572..6698b7fa 100644
--- a/src/interp/ChangeLog
+++ b/src/interp/ChangeLog
@@ -1,5 +1,13 @@
2007-11-22 Gabriel Dos Reis <gdr@cs.tamu.edu>
+ * i-analy.boot: Globally substtitue %noMapVal for noMapVal.
+ * i-intern.boot: Likewise.
+ * i-map.boot: Likewise.
+ * i-spec2.boot: Likewise.
+ * i-spec1.boot: Likewise.
+
+2007-11-22 Gabriel Dos Reis <gdr@cs.tamu.edu>
+
* as.boot: Globally substitute %noBranch for noBranch.
* ax.boot: Likewise.
* cattable.boot: Likewise.
diff --git a/src/interp/i-analy.boot b/src/interp/i-analy.boot
index 361afc75..41ee4c9d 100644
--- a/src/interp/i-analy.boot
+++ b/src/interp/i-analy.boot
@@ -289,7 +289,7 @@ bottomUpCompilePredicate(pred, name) ==
bottomUpIdentifier(t,id) ==
m := isType t => bottomUpType(t, m)
- EQ(id,'noMapVal) => throwKeyedMsg('"S2IB0002",NIL)
+ EQ(id,'%noMapVal) => throwKeyedMsg('"S2IB0002",NIL)
EQ(id,'%noBranch) =>
keyedSystemError("S2GE0016",
['"bottomUpIdentifier",'"trying to evaluate %noBranch"])
diff --git a/src/interp/i-intern.boot b/src/interp/i-intern.boot
index 1253ebc8..37d8d72d 100644
--- a/src/interp/i-intern.boot
+++ b/src/interp/i-intern.boot
@@ -97,7 +97,7 @@ mkAtree1 x ==
null x => throwKeyedMsg("S2IP0005",['"NIL"])
VECP x => x
atom x =>
- x in '(%noBranch noMapVal) => x
+ x in '(%noBranch %noMapVal) => x
x in '(nil true false) => mkAtree2([x],x,NIL)
x = '_/throwAway =>
-- don't want to actually compute this
diff --git a/src/interp/i-map.boot b/src/interp/i-map.boot
index 04777dce..fd30b539 100644
--- a/src/interp/i-map.boot
+++ b/src/interp/i-map.boot
@@ -873,7 +873,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) ==
@@ -899,19 +899,19 @@ nonRecursivePart1(opName, funBody) ==
-- which do not call the function opName
funBody is ['IF,a,b,c] =>
nra:=nonRecursivePart1(opName,a)
- nra = 'noMapVal => 'noMapVal
+ nra = '%noMapVal => '%noMapVal
nrb:=nonRecursivePart1(opName,b)
nrc:=nonRecursivePart1(opName,c)
- not (nrb in '(noMapVal %noBranch)) => ['IF,nra,nrb,nrc]
- not (nrc in '(noMapVal %noBranch)) => ['IF,['not,nra],nrc,nrb]
- 'noMapVal
+ not (nrb in '(%noMapVal %noBranch)) => ['IF,nra,nrb,nrc]
+ not (nrc in '(%noMapVal %noBranch)) => ['IF,['not,nra],nrc,nrb]
+ '%noMapVal
not containsOp(funBody,'IF) =>
notCalled(opName,funBody) => funBody
- 'noMapVal
+ '%noMapVal
funBody is [op,:argl] =>
- op=opName => 'noMapVal
+ op=opName => '%noMapVal
args:= [nonRecursivePart1(opName,arg) for arg in argl]
- MEMQ('noMapVal,args) => 'noMapVal
+ MEMQ('%noMapVal,args) => '%noMapVal
[op,:args]
funBody
@@ -946,7 +946,7 @@ numArgs args ==
combineMapParts(mapTail) ==
-- transforms a piece-wise function definition into an if-then-else
-- statement. Uses %noBranch to indicate undefined branch
- null mapTail => 'noMapVal
+ null mapTail => '%noMapVal
mapTail is [[cond,:part],:restMap] =>
isSharpVarWithNum cond or (cond is ['Tuple,:args] and
and/[isSharpVarWithNum arg for arg in args]) or (null cond) => part
diff --git a/src/interp/i-spec1.boot b/src/interp/i-spec1.boot
index 1ab11dc0..444cb15f 100644
--- a/src/interp/i-spec1.boot
+++ b/src/interp/i-spec1.boot
@@ -79,7 +79,7 @@ upADEF t ==
$compilingMap : local := true
-- if there is a predicate, merge it in with the body
- if pred ^= true then body := ['IF,pred,body,'noMapVal]
+ if pred ^= true then body := ['IF,pred,body,'%noMapVal]
tar := getTarget t
null m and tar is ['Mapping,.,:argTypes] and (#vars = #argTypes) =>
diff --git a/src/interp/i-spec2.boot b/src/interp/i-spec2.boot
index 40528d48..69d179a9 100644
--- a/src/interp/i-spec2.boot
+++ b/src/interp/i-spec2.boot
@@ -210,7 +210,7 @@ compileIF(op,cond,a,b,t) ==
b = "%noBranch" =>
evalIF(op,rest t,$Void)
putModeSet(op,[$Void])
- b = "noMapVal" =>
+ b = "%noMapVal" =>
-- if this was a return statement, we take the mode to be that
-- of what is being returned.
if getUnname a = 'return then
@@ -239,7 +239,7 @@ compileIF(op,cond,a,b,t) ==
evalIF(op,[cond,a,b],m) ==
-- generate code form compiled IF
elseCode:=
- b="noMapVal" =>
+ b="%noMapVal" =>
[[MKQ true, ["throwKeyedMsg",MKQ "S2IM0018",
["CONS",MKQ object2Identifier $mapName,NIL]]]]
b='%noBranch =>