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

diff --git a/src/interp/ht-util.boot b/src/interp/ht-util.boot
index 22667c3c..79543cfc 100644
--- a/src/interp/ht-util.boot
+++ b/src/interp/ht-util.boot
@@ -1,6 +1,6 @@
 -- Copyright (c) 1991-2002, The Numerical Algorithms Group Ltd.
 -- All rights reserved.
--- Copyright (C) 2007-2009, Gabriel Dos Reis.
+-- Copyright (C) 2007-2010, Gabriel Dos Reis.
 -- All rights reserved.
 --
 -- Redistribution and use in source and binary forms, with or without
@@ -120,7 +120,7 @@ htpSetProperty(htPage, propName, val) ==
 htpLabelInputString(htPage, label) ==
 -- value user typed as input string on page
   props := LASSOC(label, htpInputAreaAlist htPage)
-  props and STRINGP (s := ELT(props,0)) =>
+  props and string? (s := ELT(props,0)) =>
     s = '"" => s
     trimString s
   nil
@@ -210,12 +210,12 @@ htpSetPageDescription(htPage, pageDescription) ==
 iht line ==
 -- issue a single hyperteTeX line, or a group of lines
   $newPage => nil
-  CONSP line =>
+  cons? line =>
     $htLineList := NCONC(nreverse mapStringize COPY_-LIST line, $htLineList)
   $htLineList := [basicStringize line, :$htLineList]
 
 bcIssueHt line ==
-  CONSP line => htMakePage1 line
+  cons? line => htMakePage1 line
   iht line
 
 mapStringize l ==
@@ -225,7 +225,7 @@ mapStringize l ==
   l
 
 basicStringize s ==
-  STRINGP s =>
+  string? s =>
     s = '"\$"      => '"\%"
     s = '"{\em $}" => '"{\em \%}"
     s
@@ -233,7 +233,7 @@ basicStringize s ==
   PRINC_-TO_-STRING s
 
 stringize s ==
-  STRINGP s => s
+  string? s => s
   PRINC_-TO_-STRING s
 
 --htInitPageNoHeading(propList) ==
@@ -404,12 +404,12 @@ htMakeTemplates(templateList, numLabels) ==
   templateList := [templateParts template for template in templateList]
   [[substLabel(i, template) for template in templateList]
     for i in 1..numLabels] where substLabel(i, template) ==
-      CONSP template =>
+      cons? template =>
         INTERN CONCAT(first template, PRINC_-TO_-STRING i, rest template)
       template
 
 templateParts template ==
-  NULL STRINGP template => template
+  NULL string? template => template
   i := SEARCH('"%l", template)
   null i => template
   [SUBSEQ(template, 0, i), : SUBSEQ(template, i+2)]
@@ -494,7 +494,7 @@ typeCheckInputAreas htPage ==
       nil
     val := checkCondition(htpLabelInputString(htPage, stringName),
                           string, condList)
-    STRINGP val =>
+    string? val =>
       errorCondition := true
       htpSetLabelErrorMsg(htPage, stringName, val)
     htpSetLabelSpadValue(htPage, stringName, val)
@@ -503,13 +503,13 @@ typeCheckInputAreas htPage ==
 checkCondition(s1, string, condList) ==
   condList is [['Satisfies, pvar, pred]] =>
     val := FUNCALL(pred, string)
-    STRINGP val => val
+    string? val => val
     ['(String), :wrap s1]
   condList isnt [['isDomain, pvar, pattern]] =>
     systemError '"currently invalid domain condition"
   pattern is '(String) => ['(String), :wrap s1]
   val := parseAndEval string
-  STRINGP val =>
+  string? val =>
     val = '"Syntax Error " => '"Error: Syntax Error "
     condErrorMsg pattern
   [type, : data] := val
@@ -520,7 +520,7 @@ checkCondition(s1, string, condList) ==
 
 condErrorMsg type ==
   typeString := form2String type
-  if CONSP typeString then typeString := APPLY(function CONCAT, typeString)
+  if cons? typeString then typeString := APPLY(function CONCAT, typeString)
   CONCAT('"Error: Could not make your input into a ", typeString)
 
 parseAndEval string ==
@@ -578,10 +578,10 @@ htEscapeString str ==
   SUBSTITUTE($funnyBacks, char '_\, str)
 
 unescapeStringsInForm form ==
-  STRINGP form =>
+  string? form =>
     str := NSUBSTITUTE(char '_", $funnyQuote, form)
     NSUBSTITUTE(char '_\, $funnyBacks, str)
-  CONSP form =>
+  cons? form =>
     unescapeStringsInForm first form
     unescapeStringsInForm rest form
     form