Normalize spelling of mkpf.

8 files changed, 17 insertions, 17 deletions

diff --git a/src/interp/br-op2.boot b/src/interp/br-op2.boot
index 3d576881..9c279f8e 100644
--- a/src/interp/br-op2.boot
+++ b/src/interp/br-op2.boot
@@ -544,7 +544,7 @@ opPageFastPath opstring ==
   mmList := getAllModemapsFromDatabase(op,nil) or return nil
   opAlist := [[op,:[item for mm in mmList]]] where item() ==
     [predList, origin, sig] := modemap2Sig(op, mm)
-    predicate := predList and MKPF(predList,'AND)
+    predicate := predList and mkpf(predList,'AND)
     exposed? := isExposedConstructor opOf origin
     [sig, predicate, origin, exposed?]
   opAlist
diff --git a/src/interp/c-util.boot b/src/interp/c-util.boot
index 3c8bee94..ebc90480 100644
--- a/src/interp/c-util.boot
+++ b/src/interp/c-util.boot
@@ -713,12 +713,12 @@ getInverseEnvironment(a,e) ==
     --the next two lines are necessary to get 3-branched Unions to work
     -- old-style unions, that is
     (get(x,"condition",e) is [["OR",:oldpred]]) and listMember?(a,oldpred) =>
-      put(x,"condition",[MKPF(remove(oldpred,a),"OR")],e)
+      put(x,"condition",[mkpf(remove(oldpred,a),"OR")],e)
     unionProperty(x,e) is ['UnionCategory,:l] =>
       l' := remove(l,m)
       for u in l' repeat
 	 if u is ['_:,=m,:.] then l' := remove(l',u)
-      newpred:= MKPF([["case",x,m'] for m' in l'],"OR")
+      newpred:= mkpf([["case",x,m'] for m' in l'],"OR")
       put(x,"condition",[newpred,:get(x,"condition",e)],e)
     e
   a is ["not",a'] => getSuccessEnvironment(a',e)
diff --git a/src/interp/cattable.boot b/src/interp/cattable.boot
index 56b00384..cc3afea7 100644
--- a/src/interp/cattable.boot
+++ b/src/interp/cattable.boot
@@ -100,7 +100,7 @@ simpHasPred(pred,:options) == main where
         form := ["has",a := first r,['ATTRIBUTE,b := simpDevaluate second r]]
         simpHasAttribute(form,a,b)
       op in '(AND OR NOT) =>
-        null (u := MKPF([simp p for p in r],op)) => nil
+        null (u := mkpf([simp p for p in r],op)) => nil
         u is '%true or u is '(QUOTE T) => true
         simpBool u
       op is 'hasArgs => ($hasArgs => $hasArgs = r; pred)
diff --git a/src/interp/define.boot b/src/interp/define.boot
index 788e4827..c3c9065d 100644
--- a/src/interp/define.boot
+++ b/src/interp/define.boot
@@ -668,7 +668,7 @@ explodeIfs x == main where  --called by getParentsFor
   fn(p,a,b) ==
     [:"append"/[gn(p,y) for y in a],:"append"/[gn(['NOT,p],y) for y in b]]
   gn(p,a) ==
-    a is ['IF,q,b,:.] => fn(MKPF([p,q],'AND),b,nil)
+    a is ['IF,q,b,:.] => fn(mkpf([p,q],'AND),b,nil)
     [[a,:p]]
 
 getParentsFor db ==
@@ -732,7 +732,7 @@ clearExportsTable() ==
 
 makePredicate l ==
   null l => true
-  MKPF(l,"and")
+  mkpf(l,"and")
 
 --% FUNCTIONS WHICH MUNCH ON == STATEMENTS
 
@@ -2106,7 +2106,7 @@ stripOffSubdomainConditions(margl,argl) ==
     f() ==
       x is ['SubDomain,marg,condition] =>
         pair:= assoc(i,$argumentConditionList) =>
-          (pair.rest.first := MKPF([condition,second pair],'AND); marg)
+          (pair.rest.first := mkpf([condition,second pair],'AND); marg)
         $argumentConditionList:= [[i,arg,condition],:$argumentConditionList]
         marg
       x
@@ -2338,7 +2338,7 @@ compCapsuleInner(db,itemList,m,e) ==
   code :=
     dbForCategory? db => data
     buildFunctor(db,$signature,data,localParList,e)
-  [MKPF([:$getDomainCode,code],"PROGN"),m,e]
+  [mkpf([:$getDomainCode,code],"PROGN"),m,e]
  
 --% PROCESS FUNCTOR CODE
  
@@ -2631,7 +2631,7 @@ compCategoryItem(db,x,predl,env,sigs,atts) ==
       for y in l repeat
         compCategoryItem(db,y,predl',env,sigs,atts)
     compCategoryItem(db,c,predl',env,sigs,atts)
-  pred := (predl => MKPF(predl,"AND"); true)
+  pred := (predl => mkpf(predl,"AND"); true)
  
   --2. if attribute, push it and return
   x is ["ATTRIBUTE",y] => 
diff --git a/src/interp/format.boot b/src/interp/format.boot
index 66d36400..fa7c9af8 100644
--- a/src/interp/format.boot
+++ b/src/interp/format.boot
@@ -90,7 +90,7 @@ listOfPredOfTypePatternIds p ==
 removeIsDomains pred ==
   pred is ['isDomain,a,b] => true
   pred is ['AND,:predl] =>
-    MKPF([x for x in predl | x isnt ['isDomain,:.]],'AND)
+    mkpf([x for x in predl | x isnt ['isDomain,:.]],'AND)
   pred
 
 canRemoveIsDomain? pred ==
diff --git a/src/interp/i-map.boot b/src/interp/i-map.boot
index ba4e1277..d2e9e477 100644
--- a/src/interp/i-map.boot
+++ b/src/interp/i-map.boot
@@ -180,7 +180,7 @@ addMap(lhs,rhs,pred) ==
   argPredList:= reverse! predList
   finalPred :=
 -- handle g(a,T)==a+T confusion between pred=T and T variable
-    MKPF((pred and (pred ~= 'T) => [:argPredList,applySubstNQ($sl,pred)]; argPredList),"and")
+    mkpf((pred and (pred ~= 'T) => [:argPredList,applySubstNQ($sl,pred)]; argPredList),"and")
   body:= applySubstNQ($sl,rhs)
   oldMap :=
     (obj := get(op,'value,$InteractiveFrame)) => objVal obj
@@ -431,7 +431,7 @@ simplifyMapPattern (x,alias) ==
       y' := applySubst(sl,y)
       pred:= unTrivialize applySubst(sl,pred) where unTrivialize x ==
         x is [op,:l] and op in '(and or) =>
-          MKPF([unTrivialize y for y in l],op)
+          mkpf([unTrivialize y for y in l],op)
         x is [op,a,=a] and op in '(_= is)=> true
         x
       rhs':= applySubst(sl,rhs)
@@ -465,8 +465,8 @@ simplifyMapConstructorRefs form ==
 
 predTran x ==
   x is ["IF",a,b,c] =>
-    c = "false" => MKPF([predTran a,predTran b],"and")
-    b = "true" => MKPF([predTran a,predTran c],"or")
+    c = "false" => mkpf([predTran a,predTran b],"and")
+    b = "true" => mkpf([predTran a,predTran c],"or")
     b = "false" and c = "true" => ["not",predTran a]
     x
   x
diff --git a/src/interp/lisplib.boot b/src/interp/lisplib.boot
index e2eb834d..9b18b6ca 100644
--- a/src/interp/lisplib.boot
+++ b/src/interp/lisplib.boot
@@ -84,7 +84,7 @@ predicateBitRef(db,x,e) ==
   ['testBitVector,'pv_$,predicateBitIndex(db,x,e)]
  
 makePrefixForm(u,op) ==
-  u := MKPF(u,op)
+  u := mkpf(u,op)
   u is ''T => 'T
   u
 
@@ -114,7 +114,7 @@ makePredicateBitVector(db,pl,e) ==   --called by buildFunctor
 augmentPredCode(n,lastPl) ==
   ['%list,:pl] := mungeAddGensyms(lastPl,$predGensymAlist)
   delta := 2 ** n
-  l := [(u := MKPF([x,['augmentPredVector,"$",delta]],'AND); 
+  l := [(u := mkpf([x,['augmentPredVector,"$",delta]],'AND); 
          delta:=2 * delta; u) for x in pl]
 
 augmentPredVector(dollar,value) ==
diff --git a/src/interp/nruncomp.boot b/src/interp/nruncomp.boot
index 7a53fe1e..c8c692a2 100644
--- a/src/interp/nruncomp.boot
+++ b/src/interp/nruncomp.boot
@@ -534,7 +534,7 @@ setVector4Part1(db,siglist,formlist,condlist,e) ==
   reducedConlist :=
     [[x,:y] for [x,z] in $condList| y := SETDIFFERENCE(z,reducedUncondlist)]
   revCondlist := reverseCondlist reducedConlist
-  orCondlist := [[x,:MKPF(y,'OR)] for [x,:y] in revCondlist]
+  orCondlist := [[x,:mkpf(y,'OR)] for [x,:y] in revCondlist]
   [reducedUncondlist,:orCondlist]
 
 reverseCondlist cl ==