diff options
Diffstat (limited to 'src/interp/define.boot')
| -rw-r--r-- | src/interp/define.boot | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/interp/define.boot b/src/interp/define.boot index a765091d..937ce162 100644 --- a/src/interp/define.boot +++ b/src/interp/define.boot @@ -271,8 +271,8 @@ mkCategoryPackage(form is [op,:argl],cat,def) == :SUBLISLIS(argl,$FormalMapVariableList,catOpList)] nils:= [nil for x in argl] packageSig := [packageCategory,form,:nils] - $categoryPredicateList := SUBST(nameForDollar,'$,$categoryPredicateList) - SUBST(nameForDollar,'$, + $categoryPredicateList := substitute(nameForDollar,'$,$categoryPredicateList) + substitute(nameForDollar,'$, ['DEF,[packageName,:packageArgl],packageSig,[nil,:nils],def]) compDefineCategory2(form,signature,specialCases,body,m,e, @@ -662,7 +662,7 @@ makeFunctorArgumentParameters(argl,sigl,target) == $ConditionalOperators:=[CDR u,:$ConditionalOperators] s is ['Join,:sl] => u:=ASSQ('CATEGORY,ss) => - SUBST([:u,:ss],u,s) + MSUBST([:u,:ss],u,s) ['Join,:sl,['CATEGORY,'package,:ss]] ['Join,s,['CATEGORY,'package,:ss]] fn(a,s) == @@ -720,7 +720,7 @@ mkOpVec(dom,siglist) == assoc(sig,u) is [.,n,.,'ELT] => ops.i := dom.n noplist:= SUBLIS(substargs,u) -- following variation on assoc needed for GENSYMS in Mutable domains - AssocBarGensym(SUBST(dom.0,'$,sig),noplist) is [.,n,.,'ELT] => + AssocBarGensym(substitute(dom.0,'$,sig),noplist) is [.,n,.,'ELT] => ops.i := dom.n ops.i := [function Undef,[dom.0,i],:opSig] ops @@ -993,7 +993,7 @@ stripOffArgumentConditions argl == [f for x in argl for i in 1..] where f() == x is ["|",arg,condition] => - condition:= SUBST('_#1,arg,condition) + condition:= substitute('_#1,arg,condition) -- in case conditions are given in terms of argument names, replace $argumentConditionList:= [[i,arg,condition],:$argumentConditionList] arg @@ -1014,7 +1014,7 @@ compArgumentConditions e == $argumentConditionList:= [f for [n,a,x] in $argumentConditionList] where f() == - y:= SUBST(a,'_#1,x) + y:= substitute(a,'_#1,x) T := [.,.,e]:= compOrCroak(y,$Boolean,e) [n,x,T.expr] e |