From 62fb1ed88e7c6a94e1ba833a2078cc162e1a44f9 Mon Sep 17 00:00:00 2001
From: dos-reis <gdr@axiomatics.org>
Date: Thu, 6 May 2010 15:23:36 +0000
Subject: 	* 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?

---
 src/interp/g-opt.boot | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/interp/g-opt.boot')

diff --git a/src/interp/g-opt.boot b/src/interp/g-opt.boot
index cfaa3730..3b9976f2 100644
--- a/src/interp/g-opt.boot
+++ b/src/interp/g-opt.boot
@@ -268,7 +268,7 @@ optCond (x is ['COND,:l]) ==
  
 AssocBarGensym(key,l) ==
   for x in l repeat
-    CONSP x =>
+    cons? x =>
       EqualBarGensym(key,first x) => return x
  
 EqualBarGensym(x,y) ==
@@ -437,7 +437,7 @@ isFloatableVMForm form ==
 ++ fairly conservative approximation of compile time constants.
 isVMConstantForm: %Code -> %Boolean
 isVMConstantForm form ==
-  INTEGERP form or STRINGP form => true
+  integer? form or string? form => true
   form=nil or form=true => true
   form isnt [op,:args] => false
   op = "QUOTE" => true
-- 
cgit v1.2.3