More cleanups

17 files changed, 44 insertions, 44 deletions

diff --git a/src/interp/br-op1.boot b/src/interp/br-op1.boot
index d00f19e1..c880a704 100644
--- a/src/interp/br-op1.boot
+++ b/src/interp/br-op1.boot
@@ -241,7 +241,7 @@ conform2StringList(form,opFn,argFn,exception) ==
       typ := sublisFormal(args,atype)
       if x is ['QUOTE,a] then x := a
       u := mathform2HtString algCoerceInteractive(x,typ,'(OutputForm)) => [u]
-      NUMBERP x or string? x => [x]
+      integer? x or string? x => [x]
       systemError()
     keyword => [keyword,'": ",:res]
     res
@@ -277,7 +277,7 @@ dbOuttran form ==
       x is ['QUOTE,a] => a
       x
     res := mathform2HtString algCoerceInteractive(arg,typ,'(OutputForm))
-    NUMBERP res or string? res => res
+    integer? res or string? res => res
     ['QUOTE,res]
   [op,:argl]
 
diff --git a/src/interp/br-search.boot b/src/interp/br-search.boot
index c3d57c9c..9bd50917 100644
--- a/src/interp/br-search.boot
+++ b/src/interp/br-search.boot
@@ -211,7 +211,7 @@ grepSplit(lines,doc?) ==
   while lines is [line, :lines] repeat
     if doc? then
         N:=readInteger dbPart(line,1,-1)
-        if NUMBERP N then 
+        if integer? N then 
            FILE_-POSITION(instream2,N)
            line := READLINE instream2
     kind := dbKind line
diff --git a/src/interp/database.boot b/src/interp/database.boot
index 040f5cb6..f7cff26a 100644
--- a/src/interp/database.boot
+++ b/src/interp/database.boot
@@ -576,7 +576,7 @@ getSystemModemaps(op,nargs) ==
   mml:= getOperationFromDB op =>
     mms := NIL
     for (x := [[.,:sig],.]) in mml repeat
-      (NUMBERP nargs) and (nargs ~= # sig.source) => 'iterate
+      (integer? nargs) and (nargs ~= # sig.source) => 'iterate
       $getUnexposedOperations or isFreeFunctionFromMm(x) or
         isExposedConstructor(getDomainFromMm(x)) => mms := [x,:mms]
       'iterate
@@ -587,7 +587,7 @@ getInCoreModemaps(modemapList,op,nargs) ==
   mml:= LASSOC (op,modemapList) =>
     mml:= first mml
     [x for (x:= [[dc,:sig],.]) in mml |
-      (NUMBERP nargs => nargs=#rest sig; true) and
+      (integer? nargs => nargs=#rest sig; true) and
         (cfn := abbreviate (domName := getDomainFromMm x)) and
           ($getUnexposedOperations or isExposedConstructor(domName))]
   nil
diff --git a/src/interp/define.boot b/src/interp/define.boot
index 79b0c580..dbd8bfc7 100644
--- a/src/interp/define.boot
+++ b/src/interp/define.boot
@@ -1271,7 +1271,7 @@ spadCompileOrSetq (form is [nam,[lam,vl,body]]) ==
   -- parameters are never used in the body.
   vl := [ renameParameter for v in vl] where
     renameParameter() ==
-      NUMBERP v or IDENTP v or string? v => v
+      integer? v or IDENTP v or string? v => v
       gensym '"flag"
   clearReplacement nam   -- Make sure we have fresh info
   if $optReplaceSimpleFunctions then
diff --git a/src/interp/format.boot b/src/interp/format.boot
index f762c33f..15ba282d 100644
--- a/src/interp/format.boot
+++ b/src/interp/format.boot
@@ -789,7 +789,7 @@ form2Fence1 x ==
   ['"  ", x]
 
 form2FenceQuote x ==
-  NUMBERP x => [STRINGIMAGE x]
+  integer? x => [STRINGIMAGE x]
   symbol? x => [FORMAT(NIL, '"|~a|", x)]
   string? x => ['"_"",x,'"_""]
   atom    x => systemErrorHere ["form2FenceQuote",x]
diff --git a/src/interp/fortcall.boot b/src/interp/fortcall.boot
index 9106506b..6045f211 100644
--- a/src/interp/fortcall.boot
+++ b/src/interp/fortcall.boot
@@ -542,7 +542,7 @@ lispType u ==
 getVal(u,names,values) ==
   -- if u is the i'th element of names, return the i'th element of values,
   -- otherwise if it is an arithmetic expression evaluate it.
-  NUMBERP(u) => u
+  integer?(u) => u
   LISTP(u) => eval [first(u), :[getVal(v,names,values) for v in rest u]]
   (place := POSITION(u,names)) => NTH(place,values)
   error ['"No value found for parameter: ",u]
diff --git a/src/interp/functor.boot b/src/interp/functor.boot
index 4b004280..3b8d900c 100644
--- a/src/interp/functor.boot
+++ b/src/interp/functor.boot
@@ -269,7 +269,7 @@ optFunctorBody x ==
  
 optFunctorBodyQuotable u ==
   null u => true
-  NUMBERP u => true
+  integer? u => true
   atom u => nil
   u is ['QUOTE,:.] => true
   nil
diff --git a/src/interp/g-opt.boot b/src/interp/g-opt.boot
index 47c5ce92..9c4004ed 100644
--- a/src/interp/g-opt.boot
+++ b/src/interp/g-opt.boot
@@ -443,19 +443,19 @@ optSuchthat [.,:u] == ["SUCHTHAT",:u]
  
 optMINUS u ==
   u is ['MINUS,v] =>
-    NUMBERP v => -v
+    integer? v => -v
     u
   u
  
 optQSMINUS u ==
   u is ['QSMINUS,v] =>
-    NUMBERP v => -v
+    integer? v => -v
     u
   u
  
 opt_- u ==
   u is ['_-,v] =>
-    NUMBERP v => -v
+    integer? v => -v
     u
   u
  
diff --git a/src/interp/i-analy.boot b/src/interp/i-analy.boot
index 3c8ada31..78cd0a73 100644
--- a/src/interp/i-analy.boot
+++ b/src/interp/i-analy.boot
@@ -665,7 +665,7 @@ sayIntelligentMessageAboutOpAvailability(opName, nArgs) ==
   -- see if we can give some decent messages about the availability if
   -- library messages
 
-  NUMBERP opName => NIL
+  integer? opName => NIL
 
   oo :=  object2Identifier opOf opName
   if ( oo = "%" ) or ( oo = "Domain" ) or ( domainForm? opName ) then
diff --git a/src/interp/i-map.boot b/src/interp/i-map.boot
index fabad1c4..bbbb4524 100644
--- a/src/interp/i-map.boot
+++ b/src/interp/i-map.boot
@@ -106,7 +106,7 @@ addDefMap(['DEF,lhs,mapsig,.,rhs],pred) ==
     putHist(op,'isInterpreterRule,false,$e)
     putHist(op,'isInterpreterFunction,true,$e)
 
-  (NUMBERP(op) or op in '(true false nil % %%)) =>
+  (integer?(op) or op in '(true false nil % %%)) =>
     throwKeyedMsg("S2IM0002",[lhs])
 
   -- verify a constructor abbreviation is not used on the lhs
@@ -274,7 +274,7 @@ makeArgumentIntoNumber x ==
   x=$Zero => 0
   x=$One => 1
   atom x => x
-  x is ["-",n] and NUMBERP n => -n
+  x is ["-",n] and integer? n => -n
   [removeZeroOne first x,:removeZeroOne rest x]
 
 mkMapAlias(op,argl) ==
@@ -341,7 +341,7 @@ mkFormalArg(x,s) ==
   ['SUCHTHAT,s,["=",s,x]]
 
 isConstantArgument x ==
-  NUMBERP x => x
+  integer? x => x
   x is ["QUOTE",.] => x
 
 isPatternArgument x == x is ["construct",:.]
diff --git a/src/interp/i-object.boot b/src/interp/i-object.boot
index 5092745f..1d065fa4 100644
--- a/src/interp/i-object.boot
+++ b/src/interp/i-object.boot
@@ -93,10 +93,10 @@ wrap x ==
   isWrapped x => x
   ["WRAPPED",:x]
  
-isWrapped x == x is ['WRAPPED,:.] or NUMBERP x or FLOATP x or string? x
+isWrapped x == x is ['WRAPPED,:.] or integer? x or FLOATP x or string? x
  
 unwrap x ==
-  NUMBERP x or FLOATP x or string? x => x
+  integer? x or FLOATP x or string? x => x
   x is ["WRAPPED",:y] => y
   x
  
@@ -131,7 +131,7 @@ instantiationNormalForm(op,argl) ==
 
 
 -- addQuote x ==
---   NUMBERP x => x
+--   integer? x => x
 --   ['QUOTE,x]
  
 --% Library compiler structures needed by the interpreter
diff --git a/src/interp/i-output.boot b/src/interp/i-output.boot
index 05808590..02dc2d1c 100644
--- a/src/interp/i-output.boot
+++ b/src/interp/i-output.boot
@@ -420,7 +420,7 @@ APP(u,x,y,d) ==
     APP(a,x+#s,y,appChar(s,x,y,d))
   u is [[id,:.],:.] =>
     fn := GETL(id,'APP) => FUNCALL(fn,u,x,y,d)
-    not NUMBERP id and (d':= appInfix(u,x,y,d))=> d'
+    not integer? id and (d':= appInfix(u,x,y,d))=> d'
     appelse(u,x,y,d)
   appelse(u,x,y,d)
 
@@ -486,7 +486,7 @@ outputTran x ==
   string? x => x
   vector? x =>
     outputTran ['BRACKET,['AGGLST,:[x.i for i in 0..MAXINDEX x]]]
-  NUMBERP x =>
+  integer? x =>
     MINUSP x => ["-",MINUS x]
     x
   atom x =>
@@ -767,9 +767,9 @@ timesApp(u,x,y,d) ==
       d:= APP(BLANK,x,y,d)
       x:= x+1
     [d,x]:= appInfixArg(arg,x,y,d,rightPrec,"left",nil) --app in a right arg
-    wasSimple:= atom arg and not NUMBERP arg or isRationalNumber arg
+    wasSimple:= atom arg and not integer? arg or isRationalNumber arg
     wasQuotient:= isQuotient op
-    wasNumber:= NUMBERP arg
+    wasNumber:= integer? arg
     lastOp := op
     firstTime:= nil
   d
@@ -862,10 +862,10 @@ needStar(wasSimple,wasQuotient,wasNumber,cur,op) ==
   wasQuotient or isQuotient op => true
   wasSimple =>
     atom cur or keyp cur="SUB" or isRationalNumber cur or op="**" or op = "^" or
-      (atom op and not NUMBERP op and null GETL(op,"APP"))
+      (atom op and not integer? op and null GETL(op,"APP"))
   wasNumber =>
-    NUMBERP(cur) or isRationalNumber cur or
-        ((op="**" or op ="^") and NUMBERP(second cur))
+    integer?(cur) or isRationalNumber cur or
+        ((op="**" or op ="^") and integer?(second cur))
 
 isQuotient op ==
   op="/" or op="OVER"
@@ -880,9 +880,9 @@ timesWidth u ==
       w:= w+1
     if infixArgNeedsParens(arg, rightPrec, "left") then w:= w+2
     w:= w+WIDTH arg
-    wasSimple:= atom arg and not NUMBERP arg --or isRationalNumber arg
+    wasSimple:= atom arg and not integer? arg --or isRationalNumber arg
     wasQuotient:= isQuotient op
-    wasNumber:= NUMBERP arg
+    wasNumber:= integer? arg
     firstTime:= nil
   w
 
@@ -1055,9 +1055,9 @@ WIDTH u ==
   THROW('outputFailure,'outputFailure)
 
 putWidth u ==
-  atom u or u is [[.,:n],:.] and NUMBERP n => u
+  atom u or u is [[.,:n],:.] and integer? n => u
   op:= keyp u
---NUMBERP op => nil
+--integer? op => nil
   leftPrec:= getBindingPowerOf("left",u)
   rightPrec:= getBindingPowerOf("right",u)
   [firstEl,:l] := u
@@ -1090,7 +1090,7 @@ putWidth u ==
 
 opWidth(op,has2Arguments) ==
   op = "EQUATNUM" => 4
-  NUMBERP op => 2+SIZE STRINGIMAGE op
+  integer? op => 2+SIZE STRINGIMAGE op
   null has2Arguments =>
     a:= GETL(op,"PREFIXOP") => SIZE a
     2+SIZE PNAME op
@@ -1711,7 +1711,7 @@ charyTop(u,start,linelength) ==
 charyTopWidth u ==
     atom u => u
     atom first u => putWidth u
-    NUMBERP CDAR u => u
+    integer? CDAR u => u
     putWidth u
 
 charyTrouble(u,v,start,linelength) ==
@@ -1735,7 +1735,7 @@ sublisMatAlist(m,m1,u) ==
   u
 
 charyTrouble1(u,v,start,linelength) ==
-  NUMBERP u => outputNumber(start,linelength,atom2String u)
+  integer? u => outputNumber(start,linelength,atom2String u)
   atom u => outputString(start,linelength,atom2String u)
   EQ(x:= keyp u,'_-) => charyMinus(u,v,start,linelength)
   x in '(_+ _* AGGLST) => charySplit(u,v,start,linelength)
@@ -1857,7 +1857,7 @@ keyp(u) ==
   CAAR u
 
 absym x ==
-  (NUMBERP x) and (MINUSP x) => -x
+  (integer? x) and (MINUSP x) => -x
   cons? x and (keyp(x) = '_-) => second x
   x
 
@@ -1874,10 +1874,10 @@ argsapp(u,x,y,d) == appargs(rest u,x,y,d)
 
 subspan u ==
   atom u => 0
-  NUMBERP rest u => subspan first u
+  integer? rest u => subspan first u
   (cons? first u             and_
    atom CAAR u           and_
-   not NUMBERP CAAR u    and_
+   not integer? CAAR u    and_
    GETL(CAAR u, 'SUBSPAN)    )    =>
    APPLX(GETL(CAAR u, 'SUBSPAN), [u])
   MAX(subspan first u, subspan rest u)
@@ -1886,10 +1886,10 @@ agggsub u == subspan rest u
 
 superspan u ==
   atom u => 0
-  NUMBERP rest u => superspan first u
+  integer? rest u => superspan first u
   (cons? first u               and_
    atom CAAR u             and_
-   not NUMBERP CAAR u      and_
+   not integer? CAAR u      and_
    GETL(CAAR u, 'SUPERSPAN)    )    =>
    APPLX(GETL(CAAR u, 'SUPERSPAN), [u])
   MAX(superspan first u, superspan rest u)
@@ -1975,7 +1975,7 @@ apphor(x1,x2,y,d,char) ==
   APP(char, x2, y, temp)
 
 syminusp x ==
-  NUMBERP x => MINUSP x
+  integer? x => MINUSP x
   cons? x and EQ(keyp x,'_-)
 
 appsum(u, x, y, d) ==
diff --git a/src/interp/interop.boot b/src/interp/interop.boot
index eefb82ea..d260b7cb 100644
--- a/src/interp/interop.boot
+++ b/src/interp/interop.boot
@@ -583,7 +583,7 @@ newHasCategory(domain,catform) ==
   lazyMatchAssocV(catform,auxvec,catvec,domain)         --new style
 
 getCatForm(catvec, index, domain) ==
-   NUMBERP(form := QVELT(catvec,index)) => domain.form
+   integer?(form := QVELT(catvec,index)) => domain.form
    form
 
 HasSignature(domain,[op,sig]) ==
diff --git a/src/interp/newfort.boot b/src/interp/newfort.boot
index fa9aa373..cb79c32c 100644
--- a/src/interp/newfort.boot
+++ b/src/interp/newfort.boot
@@ -457,7 +457,7 @@ exp2FortSpecial(op,args,nargs) ==
       if LISTP first elts and #elts=1 and first elts is [sOp,:sArgs] then
         member(sOp, ['"SEGMENT","SEGMENT"]) =>
           #sArgs=1 => fortError1 first elts
-          not(NUMBERP(first sArgs) and NUMBERP(second sArgs)) =>
+          not(integer?(first sArgs) and integer?(second sArgs)) =>
             fortError("Cannot expand segment: ",first elts)
           first sArgs > second sArgs => fortError1
             '"Lower bound of segment exceeds upper bound."
diff --git a/src/interp/nruncomp.boot b/src/interp/nruncomp.boot
index d7b9eefd..4c5c3b11 100644
--- a/src/interp/nruncomp.boot
+++ b/src/interp/nruncomp.boot
@@ -199,7 +199,7 @@ genDeltaEntry(opMmPair,e) ==
   if eltOrConst = 'Subsumed then eltOrConst := 'ELT
   if atom dc then
     dc = "$" => nsig := sig
-    if NUMBERP nsig then nsig := MSUBST("$",dc,substitute("$$","$",sig))
+    if integer? nsig then nsig := MSUBST("$",dc,substitute("$$","$",sig))
   setDifference(listOfBoundVars dc,$functorLocalParameters) ~= [] =>
     ['applyFun,['compiledLookupCheck,MKQ op,
          mkList consSig(nsig,dc),consDomainForm(dc,nil)]]
diff --git a/src/interp/nrunfast.boot b/src/interp/nrunfast.boot
index cf484760..e66cabdf 100644
--- a/src/interp/nrunfast.boot
+++ b/src/interp/nrunfast.boot
@@ -476,7 +476,7 @@ lazyMatch(source,lazyt,dollar,domain) ==
       and/[lazyMatchArg2(s,a,dollar,domain,flag)
            for s in sargl for a in argl for flag in rest coSig]
   string? source and lazyt is ['QUOTE,=source] => true
-  NUMBERP source =>
+  integer? source =>
       lazyt is ['_#, slotNum] => source = #(domain.slotNum)
       lazyt is ['%call,'LENGTH, slotNum] => source = #(domain.slotNum)
       nil
diff --git a/src/interp/pspad1.boot b/src/interp/pspad1.boot
index 925a4a94..7534a057 100644
--- a/src/interp/pspad1.boot
+++ b/src/interp/pspad1.boot
@@ -184,7 +184,7 @@ consBuffer item ==
     nil
   $lineFragmentBuffer:=
     null item or IDENTP item => [PNAME item,:$lineFragmentBuffer]
-    NUMBERP item or CHARP item => [STRINGIMAGE item,:$lineFragmentBuffer]
+    integer? item or CHARP item => [STRINGIMAGE item,:$lineFragmentBuffer]
     string? item => ["_"",string2PrintImage item,"_"",:$lineFragmentBuffer]
     sayBrightly ['"Unexpected line buffer item: ", STRINGIMAGE item]
     $lineFragmentBuffer