* 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, 8 insertions, 8 deletions

diff --git a/src/interp/c-util.boot b/src/interp/c-util.boot
index 46417f08..f65b5dd6 100644
--- a/src/interp/c-util.boot
+++ b/src/interp/c-util.boot
@@ -92,7 +92,7 @@ $optExportedFunctionReference := false
 
 ++ Quote form, if not a basic value.
 quoteMinimally form ==
-  FIXP form or STRINGP form or form = nil or form = true => form
+  FIXP form or string? form or form = nil or form = true => form
   ["QUOTE",form]
 
 ++ If using old `Rep' definition semantics, return `$' when m is `Rep'.
@@ -177,7 +177,7 @@ continue() == FIN comp($x,$m,$f)
 LEVEL(:l) == APPLY('level,l)
 level(:l) ==
   null l => same()
-  l is [n] and INTEGERP n => displayComp ($level:= n)
+  l is [n] and integer? n => displayComp ($level:= n)
   SAY '"Correct format: (level n) where n is the level you want to go to"
  
 UP() == up()
@@ -507,7 +507,7 @@ diagnoseUnknownType(t,e) ==
     t in '($ constant) => t
     t' := assoc(t,getDomainsInScope e) => t'
     (m := getmode(t,e)) and isKnownCategory(m,$CategoryFrame) => t
-    STRINGP t => t
+    string? t => t
     -- ??? We should not to check for $$ at this stage.  
     -- ??? This is a bug in the compiler that needs to be fixed.
     t = "$$" => t
@@ -775,7 +775,7 @@ stackAndThrow(msg, args == nil) ==
   $compErrorMessageStack:= [msg,:$compErrorMessageStack]
   THROW("compOrCroak",nil)
  
-printString x == PRINTEXP (STRINGP x => x; PNAME x)
+printString x == PRINTEXP (string? x => x; PNAME x)
  
 printAny x == if atom x then printString x else PRIN1 x
  
@@ -882,7 +882,7 @@ substituteOp(op',op,x) ==
 sublisV(p,e) ==
   (atom p => e; suba(p,e)) where
     suba(p,e) ==
-      STRINGP e => e
+      string? e => e
       -- no need to descend vectors unless they are categories
       isCategory e => LIST2VEC [suba(p,e.i) for i in 0..MAXINDEX e]
       atom e => (y:= ASSQ(e,p) => rest y; e)
@@ -1220,7 +1220,7 @@ foldExportedFunctionReferences defs ==
 ++ record optimizations permitted at level `level'.
 setCompilerOptimizations level ==
   level = nil => nil
-  INTEGERP level =>
+  integer? level =>
     if level = 0 then
       -- explicit request for no optimization.
       $optProclaim := false
@@ -1654,7 +1654,7 @@ expandFormTemplate(shell,args,slot) ==
     args.n   -- FIXME: we should probably expand with dual signature
   slot is ["NRTEVAL",val] => val
   slot is ["QUOTE",val] => 
-    STRINGP val => val
+    string? val => val
     slot
   [expandFormTemplate(shell,args,i) for i in slot]
 
@@ -1669,7 +1669,7 @@ equalFormTemplate(shell,args,slot,form) ==
     equalFormTemplate(shell,args,args.n,form)
   slot is ["NTREVAL",val] => form = val
   slot is ["QUOTE",val] => 
-     STRINGP val => val = form
+     string? val => val = form
      slot = form
   atom slot or atom form => form = slot
   #slot ~= #form => false