* interp/wi2.boot: Replace INTEGERP, STRINGP, SYMBOLP, CONSP with

	integer?, string?, symbol?, and cons? respectively.
	* interp/wi1.boot: Likewise.
	* interp/trace.boot: Likewise.
	* interp/sys-utility.boot: Likewise.
	* interp/showimp.boot: Likewise.
	* interp/setvars.boot: Likewise.
	* interp/record.boot: Likewise.
	* interp/pspad2.boot: Likewise.
	* interp/pspad1.boot: Likewise.
	* interp/postpar.boot: Likewise.
	* interp/posit.boot: Likewise.
	* interp/pf2sex.boot: Likewise.
	* interp/pf2atree.boot: Likewise.
	* interp/parse.boot: Likewise.
	* interp/packtran.boot: Likewise.
	* interp/nrunopt.boot: Likewise.
	* interp/nrungo.boot: Likewise.
	* interp/nrunfast.boot: Likewise.
	* interp/nruncomp.boot: Likewise.
	* interp/newfort.boot: Likewise.
	* interp/msgdb.boot: Likewise.
	* interp/msg.boot: Likewise.
	* interp/modemap.boot: Likewise.
	* interp/match.boot: Likewise.
	* interp/mark.boot: Likewise.
	* interp/interop.boot: Likewise.
	* interp/int-top.boot: Likewise.
	* interp/i-toplev.boot: Likewise.
	* interp/i-syscmd.boot: Likewise.
	* interp/i-spec2.boot: Likewise.
	* interp/i-spec1.boot: Likewise.
	* interp/i-resolv.boot: Likewise.
	* interp/i-output.boot: Likewise.
	* interp/i-object.boot: Likewise.
	* interp/i-map.boot: Likewise.
	* interp/i-intern.boot: Likewise.
	* interp/i-funsel.boot: Likewise.
	* interp/i-eval.boot: Likewise.
	* interp/i-coerfn.boot: Likewise.
	* interp/i-coerce.boot: Likewise.
	* interp/i-analy.boot: Likewise.
	* interp/htsetvar.boot: Likewise.
	* interp/htcheck.boot: Likewise.
	* interp/ht-util.boot: Likewise.
	* interp/ht-root.boot: Likewise.
	* interp/g-util.boot: Likewise.
	* interp/g-opt.boot: Likewise.
	* interp/g-error.boot: Likewise.
	* interp/g-boot.boot: Likewise.
	* interp/functor.boot: Likewise.
	* interp/fortcall.boot: Likewise.
	* interp/format.boot: Likewise.
	* interp/diagnostics.boot: Likewise.
	* interp/define.boot: Likewise.
	* interp/compress.boot: Likewise.
	* interp/compiler.boot: Likewise.
	* interp/clammed.boot: Likewise.
	* interp/clam.boot: Likewise.
	* interp/cformat.boot: Likewise.
	* interp/cattable.boot: Likewise.
	* interp/category.boot: Likewise.
	* interp/c-util.boot: Likewise.
	* interp/c-doc.boot: Likewise.
	* interp/buildom.boot: Likewise.
	* interp/br-util.boot: Likewise.
	* interp/br-search.boot: Likewise.
	* interp/br-saturn.boot: Likewise.
	* interp/br-op2.boot: Likewise.
	* interp/br-op1.boot: Likewise.
	* interp/br-data.boot: Likewise.
	* interp/br-con.boot: Likewise.
	* interp/bc-util.boot: Likewise.
	* interp/ax.boot: Likewise.
	* interp/as.boot: Likewise.
	* boot/translator.boot: Likewise.
	* boot/ast.boot: Likewise.
	* boot/includer.boot: Likewise.
	* boot/tokens.boot: Add new replacement for integer?, string?,
	symbol? and cons?

1 files changed, 5 insertions, 5 deletions

diff --git a/src/interp/clam.boot b/src/interp/clam.boot
index 56347798..0028ffe1 100644
--- a/src/interp/clam.boot
+++ b/src/interp/clam.boot
@@ -87,7 +87,7 @@ compClam(op,argl,body,$clamList) ==
   countFl := 'count in options
   if #argl > 1 and eqEtc= 'EQ then
     keyedSystemError("S2GE0007",[op])
-  (not IDENTP kind) and (not INTEGERP kind or kind < 1) =>
+  (not IDENTP kind) and (not integer? kind or kind < 1) =>
     keyedSystemError("S2GE0005",[op])
   IDENTP kind =>
     shiftFl => keyedSystemError("S2GE0008",[op])
@@ -328,7 +328,7 @@ HGETandCount(hashTable,prop) ==
   u
  
 clearClams() ==
-  for [fn,kind,:.] in $clamList | kind = 'hash or INTEGERP kind repeat
+  for [fn,kind,:.] in $clamList | kind = 'hash or integer? kind repeat
     clearClam fn
  
 clearClam fn ==
@@ -374,7 +374,7 @@ cacheStats() ==
   for [fn,kind,:u] in $clamList repeat
     not ('count in u) =>
       sayBrightly ["%b",fn,"%d","does not keep reference counts"]
-    INTEGERP kind => reportCircularCacheStats(fn,kind)
+    integer? kind => reportCircularCacheStats(fn,kind)
     kind = 'hash => reportHashCacheStats fn
     sayBrightly ["Unknown cache type for","%b",fn,"%d"]
  
@@ -396,7 +396,7 @@ displayCacheFrequency al ==
 mkCircularCountAlist(cl,len) ==
   for [x,count,:.] in cl for i in 1..len while x ~= '_$failed repeat
     u:= assoc(count,al) => RPLACD(u,1 + rest u)
-    if INTEGERP $reportFavoritesIfNumber and count >= $reportFavoritesIfNumber then
+    if integer? $reportFavoritesIfNumber and count >= $reportFavoritesIfNumber then
       sayBrightlyNT ["   ",count,"  "]
       pp x
     al:= [[count,:1],:al]
@@ -674,7 +674,7 @@ globalHashtableStats(x,sortFn) ==
   for key in keys repeat
     u:= HGET(x,key)
     for [argList,n,:.] in u repeat
-      not INTEGERP n =>   keyedSystemError("S2GE0013",[x])
+      not integer? n =>   keyedSystemError("S2GE0013",[x])
       argList1:= [constructor2ConstructorForm x for x in argList]
       reportList:= [[n,key,argList1],:reportList]
   sayBrightly ["%b","  USE  NAME ARGS","%d"]