aboutsummaryrefslogtreecommitdiff
path: root/src/interp
diff options
context:
space:
mode:
authordos-reis <gdr@axiomatics.org>2007-11-22 17:20:27 +0000
committerdos-reis <gdr@axiomatics.org>2007-11-22 17:20:27 +0000
commitfcc7f11db9c755b9b58ce43d37bbe8a702af8ebf (patch)
tree05aa94e2606b88faf554913a03a60bc424e56102 /src/interp
parent4244764830efa92de999f8e548f0cc2a800e61d1 (diff)
downloadopen-axiom-fcc7f11db9c755b9b58ce43d37bbe8a702af8ebf.tar.gz
* as.boot: Globally substitute %noBranch for noBranch.
* ax.boot: Likewise. * cattable.boot: Likewise. * compiler.boot: Likewise. * def.lisp: Likewise. * define.boot: Likewise. * functor.boot: Likewise. * g-opt.boot: Likewise. * i-analy.boot: Likewise. * i-intern.boot: Likewise. * i-map.boot: Likewise. * i-object.boot: Likewise. * i-output.boot: Likewise. * i-spec2.boot: Likewise. * info.boot: Likewise. * mark.boot: Likewise. * nrunopt.boot: Likewise. * package.boot: Likewise. * parse.boot: Likewise. * pf2atree.boot: Likewise. * pf2sex.boot: Likewise. * postpar.boot: Likewise. * pspad2.boot: Likewise. * wi2.boot: Likewise.
Diffstat (limited to 'src/interp')
-rw-r--r--src/interp/ChangeLog27
-rw-r--r--src/interp/as.boot8
-rw-r--r--src/interp/ax.boot4
-rw-r--r--src/interp/cattable.boot4
-rw-r--r--src/interp/compiler.boot2
-rw-r--r--src/interp/def.lisp2
-rw-r--r--src/interp/define.boot8
-rw-r--r--src/interp/functor.boot4
-rw-r--r--src/interp/g-opt.boot4
-rw-r--r--src/interp/i-analy.boot4
-rw-r--r--src/interp/i-intern.boot4
-rw-r--r--src/interp/i-map.boot6
-rw-r--r--src/interp/i-object.boot2
-rw-r--r--src/interp/i-output.boot4
-rw-r--r--src/interp/i-spec2.boot6
-rw-r--r--src/interp/info.boot4
-rw-r--r--src/interp/mark.boot4
-rw-r--r--src/interp/nrunopt.boot2
-rw-r--r--src/interp/package.boot2
-rw-r--r--src/interp/parse.boot8
-rw-r--r--src/interp/pf2atree.boot6
-rw-r--r--src/interp/pf2sex.boot6
-rw-r--r--src/interp/postpar.boot4
-rw-r--r--src/interp/pspad2.boot12
-rw-r--r--src/interp/wi2.boot4
25 files changed, 84 insertions, 57 deletions
diff --git a/src/interp/ChangeLog b/src/interp/ChangeLog
index ccd695e3..a8aa4572 100644
--- a/src/interp/ChangeLog
+++ b/src/interp/ChangeLog
@@ -1,3 +1,30 @@
+2007-11-22 Gabriel Dos Reis <gdr@cs.tamu.edu>
+
+ * as.boot: Globally substitute %noBranch for noBranch.
+ * ax.boot: Likewise.
+ * cattable.boot: Likewise.
+ * compiler.boot: Likewise.
+ * def.lisp: Likewise.
+ * define.boot: Likewise.
+ * functor.boot: Likewise.
+ * g-opt.boot: Likewise.
+ * i-analy.boot: Likewise.
+ * i-intern.boot: Likewise.
+ * i-map.boot: Likewise.
+ * i-object.boot: Likewise.
+ * i-output.boot: Likewise.
+ * i-spec2.boot: Likewise.
+ * info.boot: Likewise.
+ * mark.boot: Likewise.
+ * nrunopt.boot: Likewise.
+ * package.boot: Likewise.
+ * parse.boot: Likewise.
+ * pf2atree.boot: Likewise.
+ * pf2sex.boot: Likewise.
+ * postpar.boot: Likewise.
+ * pspad2.boot: Likewise.
+ * wi2.boot: Likewise.
+
2007-11-18 Gabriel Dos Reis <gdr@cs.tamu.edu>
* Makefile.pamphlet (nrunopt.$(FASLEXT)): New rule.
diff --git a/src/interp/as.boot b/src/interp/as.boot
index 189b5f7d..2751419a 100644
--- a/src/interp/as.boot
+++ b/src/interp/as.boot
@@ -647,7 +647,7 @@ asytranCategoryItem(x,levels,predlist,local?) ==
-- (CATEGORY domain
-- (SIGNATURE diagonalMatrix ($ (Vector #1)))
-- (IF (has #1 (Field))
--- (SIGNATURE inverse ((Union $ "failed") $)) noBranch)))
+-- (SIGNATURE inverse ((Union $ "failed") $)) %noBranch)))
-- (Ring))
-- (T Matrix)) )
extendConstructorDataTable() ==
@@ -1006,7 +1006,7 @@ asyCattranOp1(op, item, predlist) ==
-- This line used to call asyCattranOp1 with too few arguments. Following
-- fix suggested by RDJ.
x is ['IF,:.] => "append"/[asyCattranOp1(op,y,[pred,:predlist]) for y in x]
- [['IF, asySimpPred(pred,predlist), asyCattranSig(op,x), 'noBranch]]
+ [['IF, asySimpPred(pred,predlist), asyCattranSig(op,x), '%noBranch]]
[asyCattranSig(op,item)]
asyPredTran p == asyPredTran1 asyJoinPart p
@@ -1025,7 +1025,7 @@ asyCattranConstructors(item, predlist) ==
p
x is ['IF,:.] => "append"/[asyCattranConstructors(x, [pred,:predlist])]
form := ['ATTRIBUTE, asyJoinPart x]
- [['IF, asySimpPred(pred,predlist), form, 'noBranch]]
+ [['IF, asySimpPred(pred,predlist), form, '%noBranch]]
systemError()
asySimpPred(p, predlist) ==
@@ -1137,7 +1137,7 @@ asCategoryParts(kind,conform,category,:options) == main where
build(s1,quickAnd(pred,pred1))
s2 => build(s2,quickAnd(pred,['NOT,pred1]))
item is ['PROGN,:r] => for x in r repeat build(x,pred)
- item in '(noBranch) => 'ok
+ item in '(%noBranch) => 'ok
null item => 'ok
systemError '"build error"
exportsOf(target) ==
diff --git a/src/interp/ax.boot b/src/interp/ax.boot
index 950d9307..1f61ece4 100644
--- a/src/interp/ax.boot
+++ b/src/interp/ax.boot
@@ -287,7 +287,7 @@ axFormatCondOp op ==
axFormatOp op ==
op is ['IF, pred, trueops, falseops] =>
- NULL(trueops) or trueops='noBranch =>
+ NULL(trueops) or trueops='%noBranch =>
['If, ['Test,['Not, axFormatPred pred]],
axFormatCondOp falseops,
axFormatCondOp trueops]
@@ -303,7 +303,7 @@ axFormatOp op ==
axFormatType attributeOrCategory
['RestrictTo, axFormatAttrib attributeOrCategory, 'Category]
op is ['PROGN, :ops] => axFormatOpList ops
- op is 'noBranch => []
+ op is '%noBranch => []
axFormatType op
addDefaults(catname, withform) ==
diff --git a/src/interp/cattable.boot b/src/interp/cattable.boot
index c5bb711c..8cc6b65d 100644
--- a/src/interp/cattable.boot
+++ b/src/interp/cattable.boot
@@ -360,7 +360,7 @@ makeCatPred(zz, cats, thePred) ==
for at in ats repeat
if at is ['ATTRIBUTE,z3] and not atom z3 and
constructor? CAR z3 then
- cats:= CONS(['IF,quickAnd(['has,z1,z2], thePred),z3,'noBranch],cats)
+ cats:= CONS(['IF,quickAnd(['has,z1,z2], thePred),z3,'%noBranch],cats)
at is ['IF, pred, :.] =>
cats := makeCatPred(at, cats, curPred)
cats
@@ -399,7 +399,7 @@ categoryParts(conform,category,:options) == main where
build(s1,quickAnd(pred,pred1))
s2 => build(s2,quickAnd(pred,['NOT,pred1]))
item is ['PROGN,:r] => for x in r repeat build(x,pred)
- item in '(noBranch) => 'ok
+ item in '(%noBranch) => 'ok
null item => 'ok
systemError '"build error"
exportsOf(target) ==
diff --git a/src/interp/compiler.boot b/src/interp/compiler.boot
index 7347fb26..75f28a10 100644
--- a/src/interp/compiler.boot
+++ b/src/interp/compiler.boot
@@ -978,7 +978,7 @@ isUnionMode(m,e) ==
nil
compFromIf(a,m,E) ==
- a="noBranch" => ["noBranch",m,E]
+ a="%noBranch" => ["%noBranch",m,E]
true => comp(a,m,E)
quotify x == x
diff --git a/src/interp/def.lisp b/src/interp/def.lisp
index 146d65de..bce042cc 100644
--- a/src/interp/def.lisp
+++ b/src/interp/def.lisp
@@ -640,7 +640,7 @@ except that elements are separated by commas."
(b (third COND-EXPR))
(c (fourth COND-EXPR)))
(setq a (|new2OldTran| a) b (|new2OldTran| b) c (|new2OldTran| c))
- (cond ((EQ c '|noBranch|) `(if ,a ,b))
+ (cond ((EQ c '|%noBranch|) `(if ,a ,b))
(t `(if ,a ,b ,c)))))
(defun |newConstruct| (l)
diff --git a/src/interp/define.boot b/src/interp/define.boot
index 757d59c9..b77139be 100644
--- a/src/interp/define.boot
+++ b/src/interp/define.boot
@@ -1315,11 +1315,11 @@ doItIf(item is [.,p,x,y],$predl,$e) ==
olde:= $e
[p',.,$e]:= comp(p,$Boolean,$e) or userError ['"not a Boolean:",p]
oldFLP:=$functorLocalParameters
- if x^="noBranch" then
+ if x^="%noBranch" then
compSingleCapsuleItem(x,$predl,getSuccessEnvironment(p,$e))
x':=localExtras(oldFLP)
oldFLP:=$functorLocalParameters
- if y^="noBranch" then
+ if y^="%noBranch" then
compSingleCapsuleItem(y,$predl,getInverseEnvironment(p,olde))
y':=localExtras(oldFLP)
RPLACA(item,"COND")
@@ -1473,10 +1473,10 @@ compCategoryItem(x,predl) ==
compCategoryItem(e,predl')
x is ["IF",a,b,c] =>
predl':= [a,:predl]
- if b^="noBranch" then
+ if b^="%noBranch" then
b is ["PROGN",:l] => for y in l repeat compCategoryItem(y,predl')
compCategoryItem(b,predl')
- c="noBranch" => nil
+ c="%noBranch" => nil
predl':= [["not",a],:predl]
c is ["PROGN",:l] => for y in l repeat compCategoryItem(y,predl')
compCategoryItem(c,predl')
diff --git a/src/interp/functor.boot b/src/interp/functor.boot
index cc25b793..2e581dec 100644
--- a/src/interp/functor.boot
+++ b/src/interp/functor.boot
@@ -585,7 +585,7 @@ DescendCode(code,flag,viewAssoc,EnvToPass) ==
-- flag = true if we are walking down code always executed;
-- otherwise set to conditions in which
code=nil => nil
- code='noBranch => nil
+ code='%noBranch => nil
isMacro(code,$e) => nil --RDJ: added 3/16/83
code is ['add,base,:codelist] =>
codelist:=
@@ -790,7 +790,7 @@ InvestigateConditions catvecListMaker ==
--Rather like eval, but quotes parameters first
for u in CADR principal'.4 repeat
if not TruthP(cond:=CADR u) then
- new:=['CATEGORY,'domain,['IF,cond,['ATTRIBUTE,CAR u], 'noBranch]]
+ new:=['CATEGORY,'domain,['IF,cond,['ATTRIBUTE,CAR u], '%noBranch]]
$principal is ['Join,:l] =>
not member(new,l) =>
$principal:=['Join,:l,new]
diff --git a/src/interp/g-opt.boot b/src/interp/g-opt.boot
index ed80cc90..782ab874 100644
--- a/src/interp/g-opt.boot
+++ b/src/interp/g-opt.boot
@@ -270,8 +270,8 @@ EqualBarGensym(x,y) ==
--Called early, to change IF to COND
optIF2COND ["IF",a,b,c] ==
- b is "noBranch" => ["COND",[["NULL",a],c]]
- c is "noBranch" => ["COND",[a,b]]
+ b is "%noBranch" => ["COND",[["NULL",a],c]]
+ c is "%noBranch" => ["COND",[a,b]]
c is ["IF",:.] => ["COND",[a,b],:rest optIF2COND c]
c is ["COND",:p] => ["COND",[a,b],:p]
["COND",[a,b],[$true,c]]
diff --git a/src/interp/i-analy.boot b/src/interp/i-analy.boot
index 5b1997b2..361afc75 100644
--- a/src/interp/i-analy.boot
+++ b/src/interp/i-analy.boot
@@ -290,9 +290,9 @@ bottomUpCompilePredicate(pred, name) ==
bottomUpIdentifier(t,id) ==
m := isType t => bottomUpType(t, m)
EQ(id,'noMapVal) => throwKeyedMsg('"S2IB0002",NIL)
- EQ(id,'noBranch) =>
+ EQ(id,'%noBranch) =>
keyedSystemError("S2GE0016",
- ['"bottomUpIdentifier",'"trying to evaluate noBranch"])
+ ['"bottomUpIdentifier",'"trying to evaluate %noBranch"])
transferPropsToNode(id,t)
defaultType := ['Variable,id]
-- This was meant to stop building silly symbols but had some unfortunate
diff --git a/src/interp/i-intern.boot b/src/interp/i-intern.boot
index c2cd8a84..1253ebc8 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
@@ -202,7 +202,7 @@ mkAtree3(x,op,argl) ==
ul => ['and,lowTest,upTest]
lowTest
mkAtree1 z
- x is ["IF",p,"noBranch",a] => mkAtree1 ["IF",["not",p],a,"noBranch"]
+ x is ["IF",p,"%noBranch",a] => mkAtree1 ["IF",["not",p],a,"%noBranch"]
x is ["RULEDEF",:.] => [mkAtreeNode "RULEDEF",:CDR x]
x is ["MDEF",sym,junk1,junk2,val] =>
-- new macros look like macro f == or macro f(x) ===
diff --git a/src/interp/i-map.boot b/src/interp/i-map.boot
index 7a4a3eb1..04777dce 100644
--- a/src/interp/i-map.boot
+++ b/src/interp/i-map.boot
@@ -902,8 +902,8 @@ nonRecursivePart1(opName, funBody) ==
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]
+ 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
@@ -945,7 +945,7 @@ numArgs args ==
combineMapParts(mapTail) ==
-- transforms a piece-wise function definition into an if-then-else
- -- statement. Uses noBranch to indicate undefined branch
+ -- statement. Uses %noBranch to indicate undefined branch
null mapTail => 'noMapVal
mapTail is [[cond,:part],:restMap] =>
isSharpVarWithNum cond or (cond is ['Tuple,:args] and
diff --git a/src/interp/i-object.boot b/src/interp/i-object.boot
index 8443c55e..954d71e4 100644
--- a/src/interp/i-object.boot
+++ b/src/interp/i-object.boot
@@ -125,7 +125,7 @@ getBasicMode0(x,useIntegerSubdomain) ==
$Integer
$Integer
FLOATP x => $DoubleFloat
- (x='noBranch) or (x='noValue) => $NoValueMode
+ (x='%noBranch) or (x='noValue) => $NoValueMode
nil
++ If x is a literal of the basic types then returns
diff --git a/src/interp/i-output.boot b/src/interp/i-output.boot
index 833f070f..bff7f613 100644
--- a/src/interp/i-output.boot
+++ b/src/interp/i-output.boot
@@ -456,9 +456,9 @@ outputTranSEQ ['SEQ,:l,exitform] ==
['SC,:[outputTran x for x in l],outputTran exitform]
outputTranIf ['IF,x,y,z] ==
- y = 'noBranch =>
+ y = '%noBranch =>
['CONCATB,'if,['CONCATB,'not,outputTran x],'then,outputTran z]
- z = 'noBranch =>
+ z = '%noBranch =>
['CONCATB,'if,outputTran x,'then,outputTran y]
y' := outputTran y
z' := outputTran z
diff --git a/src/interp/i-spec2.boot b/src/interp/i-spec2.boot
index aec3d6ce..40528d48 100644
--- a/src/interp/i-spec2.boot
+++ b/src/interp/i-spec2.boot
@@ -207,7 +207,7 @@ compileIF(op,cond,a,b,t) ==
-- IF are resolved.
ms1 := bottomUp a
[m1] := ms1
- b = "noBranch" =>
+ b = "%noBranch" =>
evalIF(op,rest t,$Void)
putModeSet(op,[$Void])
b = "noMapVal" =>
@@ -242,7 +242,7 @@ evalIF(op,[cond,a,b],m) ==
b="noMapVal" =>
[[MKQ true, ["throwKeyedMsg",MKQ "S2IM0018",
["CONS",MKQ object2Identifier $mapName,NIL]]]]
- b='noBranch =>
+ b='%noBranch =>
$lastLineInSEQ => [[MKQ true,["voidValue"]]]
NIL
[[MKQ true,genIFvalCode(b,m)]]
@@ -279,7 +279,7 @@ interpIF(op,cond,a,b) ==
val:= getValue cond
val:= coerceInteractive(val,$Boolean) =>
objValUnwrap(val) => upIFgenValue(op,a)
- EQ(b,"noBranch") =>
+ EQ(b,"%noBranch") =>
putValue(op,objNew(voidValue(), $Void))
putModeSet(op,[$Void])
upIFgenValue(op,b)
diff --git a/src/interp/info.boot b/src/interp/info.boot
index 4506c676..b53cc314 100644
--- a/src/interp/info.boot
+++ b/src/interp/info.boot
@@ -94,8 +94,8 @@ formatInfo u ==
isCategoryForm(v,$e) => ["has","$",v]
["ATTRIBUTE","$",v]
u is ["IF",a,b,c] =>
- c="noBranch" => ["COND",:liftCond [formatPred a,formatInfo b]]
- b="noBranch" => ["COND",:liftCond [["not",formatPred a],formatInfo c]]
+ c="%noBranch" => ["COND",:liftCond [formatPred a,formatInfo b]]
+ b="%noBranch" => ["COND",:liftCond [["not",formatPred a],formatInfo c]]
["COND",:liftCond [formatPred a,formatInfo b],:
liftCond [["not",formatPred a],formatInfo c]]
systemError '"formatInfo"
diff --git a/src/interp/mark.boot b/src/interp/mark.boot
index 95efaf83..67ec82c8 100644
--- a/src/interp/mark.boot
+++ b/src/interp/mark.boot
@@ -1170,7 +1170,7 @@ markPartOp? op ==
markWrapPart y ==
----------------new definition----------94/10/11
atom y =>
- y = 'noBranch => y
+ y = '%noBranch => y
GETL(y, 'SPECIAL) => y
$partNumber := $partNumber + 1
['PART,$partNumber, y]
@@ -1465,7 +1465,7 @@ buildNewDefinition(op,theSig,formPredAlist) ==
outerPred
def := ['DEF, theForm, theSig, theNils, ifize theAlist]
value :=
- thePred => ['IF, thePred, def, 'noBranch]
+ thePred => ['IF, thePred, def, '%noBranch]
def
stop value
value
diff --git a/src/interp/nrunopt.boot b/src/interp/nrunopt.boot
index 5ca437b3..d4a05010 100644
--- a/src/interp/nrunopt.boot
+++ b/src/interp/nrunopt.boot
@@ -430,7 +430,7 @@ listOfCategoryEntries l ==
pp l
listOfCategoryEntriesIf(pred,conseq,alternate) ==
- alternate in '(noBranch NIL) =>
+ alternate in '(%noBranch NIL) =>
conseq is ['IF,p,c,a] => listOfCategoryEntriesIf(makePrefixForm([pred,p],'AND),c,a)
[fn for x in listOfEntries conseq] where fn() ==
x is ['IF,a,b] => ['IF,makePrefixForm([pred,a],'AND),b]
diff --git a/src/interp/package.boot b/src/interp/package.boot
index afb54051..f2d758f1 100644
--- a/src/interp/package.boot
+++ b/src/interp/package.boot
@@ -134,7 +134,7 @@ PackageDescendCode(code,flag,viewAssoc) ==
--flag is true if we are walking down code always executed
--nil if we are in conditional code
code=nil => nil
- code="noBranch" => nil
+ code="%noBranch" => nil
code is ["add",base,:codelist] =>
systemError '"packages may not have add clauses"
code is ["PROGN",:codelist] =>
diff --git a/src/interp/parse.boot b/src/interp/parse.boot
index f2480254..acecc6bd 100644
--- a/src/interp/parse.boot
+++ b/src/interp/parse.boot
@@ -281,7 +281,7 @@ parseTranCheckForRecord(x,op) ==
parseCases [expr,ifClause] ==
casefn(expr,ifClause) where
casefn(x,ifExpr) ==
- ifExpr="noBranch" => ["ifClauseError",x]
+ ifExpr="%noBranch" => ["ifClauseError",x]
ifExpr is ["IF",a,b,c] => ["IF",parseTran a,parseTran b,casefn(x,c)]
postError ['" CASES format error: cases ",x," of ",ifExpr]
@@ -438,13 +438,13 @@ transSeq l ==
null l => nil
null rest l => decExitLevel first l
[item,:tail]:= l
- item is ["SEQ",:l,["exit",1,["IF",p,["exit", =2,q],"noBranch"]]] and
+ item is ["SEQ",:l,["exit",1,["IF",p,["exit", =2,q],"%noBranch"]]] and
(and/[x is ["LET",:.] for x in l]) =>
["SEQ",:[decExitLevel x for x in l],["exit",1,["IF",decExitLevel p,
decExitLevel q,transSeq tail]]]
- item is ["IF",a,["exit",1,b],"noBranch"] =>
+ item is ["IF",a,["exit",1,b],"%noBranch"] =>
["IF",decExitLevel a,decExitLevel b,transSeq tail]
- item is ["IF",a,"noBranch",["exit",1,b]] =>
+ item is ["IF",a,"%noBranch",["exit",1,b]] =>
["IF",decExitLevel a,transSeq tail,decExitLevel b]
(y:= transSeq tail) is ["SEQ",:s] => ["SEQ",item,:s]
["SEQ",item,["exit",1,incExitLevel y]]
diff --git a/src/interp/pf2atree.boot b/src/interp/pf2atree.boot
index 4cfea2cd..3d09ea46 100644
--- a/src/interp/pf2atree.boot
+++ b/src/interp/pf2atree.boot
@@ -87,7 +87,7 @@ pf2Atree1 pf ==
thenPart := pf2Atree1 (pfIfThen)(pf)
elsePart := pf2Atree1 (pfIfElse)(pf)
ifPart := mkAtreeNodeWithSrcPos("IF", pf)
- thenPart = "noBranch" =>
+ thenPart = "%noBranch" =>
[ifPart, [mkAtreeNodeWithSrcPos("not", condPf), condPart],
elsePart, thenPart]
[ifPart, condPart, thenPart, elsePart]
@@ -147,7 +147,7 @@ pf2Atree1 pf ==
pf2Atree1 (pfExitExpr)(pf)]
[mkAtreeNodeWithSrcPos("IF",pf),
pf2Atree1 (pfExitCond)(pf),
- pf2Atree1 (pfExitExpr)(pf), "noBranch"]
+ pf2Atree1 (pfExitExpr)(pf), "%noBranch"]
(pfLoop?)(pf) =>
[mkAtreeNodeWithSrcPos("REPEAT",pf),
@@ -399,7 +399,7 @@ pfSequence2Atree pf ==
seq
pfSequence2Atree0(seqList, pf) ==
- null seqList => "noBranch"
+ null seqList => "%noBranch"
seqTranList := []
while seqList ^= nil repeat
item := first seqList
diff --git a/src/interp/pf2sex.boot b/src/interp/pf2sex.boot
index bde56323..6849970b 100644
--- a/src/interp/pf2sex.boot
+++ b/src/interp/pf2sex.boot
@@ -50,7 +50,7 @@ pf2Sex pf ==
pf2Sex1 pf ==
pfNothing? pf =>
- "noBranch"
+ "%noBranch"
pfSymbol? pf =>
$insideRule = 'left =>
s := pfSymbolSymbol pf
@@ -90,7 +90,7 @@ pf2Sex1 pf ==
pfSequence2Sex pf
pfExit? pf =>
$insideSEQ => ["exit", pf2Sex1 pfExitCond pf, pf2Sex1 pfExitExpr pf]
- ["IF", pf2Sex1 pfExitCond pf, pf2Sex1 pfExitExpr pf, "noBranch"]
+ ["IF", pf2Sex1 pfExitCond pf, pf2Sex1 pfExitExpr pf, "%noBranch"]
pfLoop? pf =>
["REPEAT", :loopIters2Sex pf0LoopIterators pf]
pfCollect? pf =>
@@ -327,7 +327,7 @@ pfSequence2Sex pf ==
seq
pfSequence2Sex0 seqList ==
- null seqList => "noBranch"
+ null seqList => "%noBranch"
seqTranList := []
while seqList ^= nil repeat
item := first seqList
diff --git a/src/interp/postpar.boot b/src/interp/postpar.boot
index 58568d22..aa34f176 100644
--- a/src/interp/postpar.boot
+++ b/src/interp/postpar.boot
@@ -238,7 +238,7 @@ postElt (u is [.,a,b]) ==
b is ["Sequence",:.] => [["elt",a,"makeRecord"],:postTranList rest b]
["elt",a,postTran b]
-postExit ["=>",a,b] == ["IF",postTran a,["exit",postTran b],"noBranch"]
+postExit ["=>",a,b] == ["IF",postTran a,["exit",postTran b],"%noBranch"]
postFlatten(x,op) ==
@@ -299,7 +299,7 @@ decodeScripts a ==
postIf t ==
t isnt ["if",:l] => t
- ["IF",:[(null (x:= postTran x) and null $BOOT => "noBranch"; x)
+ ["IF",:[(null (x:= postTran x) and null $BOOT => "%noBranch"; x)
for x in l]]
postJoin ["Join",a,:l] ==
diff --git a/src/interp/pspad2.boot b/src/interp/pspad2.boot
index 4f5a729b..80af26dc 100644
--- a/src/interp/pspad2.boot
+++ b/src/interp/pspad2.boot
@@ -167,7 +167,7 @@ formatDeftranREPEAT(itl,body) ==
u := [x for x in itl | x is ["UNTIL",p]] or return nil
nitl := SETDIFFERENCE(itl,u)
pred := MKPF([p for ['UNTIL,p] in u],'or)
- cond := ['IF,pred,['leave,n,nil],'noBranch]
+ cond := ['IF,pred,['leave,n,nil],'%noBranch]
nbody :=
body is ['SEQ,:l,[.,n,x]] => ['SEQ,:l,x,['exit,n,cond]]
['SEQ,body,['exit,n,cond]]
@@ -179,7 +179,7 @@ formatDeftranSEQ(x,flag) ==
[u]
formatDeftranIf(a,b,c) ==
- b = 'noBranch =>
+ b = '%noBranch =>
a is [op,:r] and (al := '((_= . _~_=) (_< . _>_=) (_> . _<_=));
iop := LASSOC(op, al) or rassoc(op, al)) =>
[["=>",[iop, :r],c]]
@@ -187,7 +187,7 @@ formatDeftranIf(a,b,c) ==
[["=>", r, c]]
[["=>", ['not, a], c]]
post :=
- c = 'noBranch => nil
+ c = '%noBranch => nil
c is ['SEQ,:.] => CDR c
[c]
[["=>",a,b],:post]
@@ -229,8 +229,8 @@ formatDefault ["default",a] ==
formatUNCOERCE ['UNCOERCE,x] == format x
formatIF ['IF,a,b,c] ==
- c = 'noBranch => formatIF2(a,b,"if ")
- b = 'noBranch => formatIF ['IF,['not,a],c,'noBranch]
+ c = '%noBranch => formatIF2(a,b,"if ")
+ b = '%noBranch => formatIF ['IF,['not,a],c,'%noBranch]
formatIF2(a,b,"if ") and newLine() and formatIF3 c
formatIF2(a,b,prefix) ==
@@ -238,7 +238,7 @@ formatIF2(a,b,prefix) ==
formatIF3 x ==
x is ['IF,a,b,c] =>
- c = 'noBranch => tryBreak(format "else if "
+ c = '%noBranch => tryBreak(format "else if "
and format a and format " then ",b,"then","Nud")
formatIF2(a,b,"else if ") and newLine() and formatIF3 c
tryBreak(format "else ",x,"else","Nud")
diff --git a/src/interp/wi2.boot b/src/interp/wi2.boot
index 418ddf66..77171800 100644
--- a/src/interp/wi2.boot
+++ b/src/interp/wi2.boot
@@ -1073,7 +1073,7 @@ doItIf(item is [.,p,x,y],$predl,$e) ==
olde:= $e
[p',.,$e]:= qt(19,comp(p,$Boolean,$e)) or userError ['"not a Boolean:",p]
oldFLP:=$functorLocalParameters
- if x^="noBranch" then
+ if x^="%noBranch" then
--> new <-----------------------
qe(20,compSingleCapsuleItem(x,[p,:$predl],getSuccessEnvironment(markKillAll p,$e)))
---> new -----------
@@ -1104,7 +1104,7 @@ doItIf(item is [.,p,x,y],$predl,$e) ==
$functorLocalParameters:=[:oldFLP,:REVERSE nils]
REVERSE ans
oldFLP:=$functorLocalParameters
- if y^="noBranch" then
+ if y^="%noBranch" then
--> new <-----------------------
qe(21,compSingleCapsuleItem(y,[['not, p],:$predl],getInverseEnvironment(markKillAll p,olde)))
--> -----------
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-10 18:11:42 +0000