* boot/tokens.boot: gensym is now candidate for renaming.

	* boot/ast.boot: Replace GENSYM with gensym.
	* interp/buildom.boot: Likewise.
	* interp/clam.boot: Likewise.
	* interp/clammed.boot: Likewise.
	* interp/compiler.boot: Likewise.
	* interp/define.boot: Likewise.
	* interp/fortcall.boot: Likewise.
	* interp/g-opt.boot: Likewise.
	* interp/i-coerce.boot: Likewise.
	* interp/i-coerfn.boot: Likewise.
	* interp/i-funsel.boot: Likewise.
	* interp/i-map.boot: Likewise.
	* interp/i-spec1.boot: Likewise.
	* interp/i-spec2.boot: Likewise.
	* interp/macex.boot: Likewise.
	* interp/nruncomp.boot: Likewise.
	* interp/nrunopt.boot: Likewise.
	* interp/parse.boot: Likewise.
	* interp/pf2atree.boot: Likewise.
	* interp/pf2sex.boot: Likewise.
	* interp/postpar.boot: Likewise.
	* interp/ptrees.boot: Likewise.
	* interp/server.boot: Likewise.
	* interp/slam.boot: Likewise.
	* interp/sys-constants.boot: Likewise.
	* interp/wi1.boot: Likewise.
	* interp/wi2.boot: Likewise.

3 files changed, 9 insertions, 7 deletions

diff --git a/src/boot/ast.boot b/src/boot/ast.boot
index 8de1ae5c..7f60ae1b 100644
--- a/src/boot/ast.boot
+++ b/src/boot/ast.boot
@@ -1455,7 +1455,7 @@ genECLnativeTranslation(op,s,t,op') ==
   argtypes := nil
   for x in s repeat
      argtypes := [nativeArgumentType x,:argtypes]
-     args := [GENSYM(),:args]
+     args := [gensym(),:args]
   args := reverse args
   rettype := nativeReturnType t
   [["DEFUN",op, args,
@@ -1500,7 +1500,7 @@ genCLISPnativeTranslation(op,s,t,op') ==
   -- copy data there, pass pointers to them, and possibly copy
   -- them back.  Ugh.  
   n := INTERN strconc(PNAME op, '"%clisp-hack")
-  parms := [GENSYM '"parm" for x in s]  -- parameters of the forward decl.
+  parms := [gensym '"parm" for x in s]  -- parameters of the forward decl.
 
   -- Now, separate non-simple data from the rest.  This is a triple-list
   -- of the form ((parameter boot-type . ffi-type) ...)
@@ -1525,7 +1525,7 @@ genCLISPnativeTranslation(op,s,t,op') ==
   -- gigantic buffer, you might find out that it is insanely inefficient.
   forwardingFun := 
     unstableArgs = nil => ["DEFUN",op,parms, [n,:parms]]
-    localPairs := [[a,x,y,:GENSYM '"loc"] for [a,x,:y] in unstableArgs]
+    localPairs := [[a,x,y,:gensym '"loc"] for [a,x,:y] in unstableArgs]
     call := 
       [n,:[actualArg(p,localPairs) for p in parms]] where
 	    actualArg(p,pairs) ==
@@ -1559,7 +1559,7 @@ genSBCLnativeTranslation(op,s,t,op') ==
   rettype := nativeReturnType t
   argtypes := [nativeArgumentType x for x in s]
 
-  args := [GENSYM() for x in s]
+  args := [gensym() for x in s]
   unstableArgs := nil
   newArgs := nil
   for a in args for x in s repeat
@@ -1591,7 +1591,7 @@ genCLOZUREnativeTranslation(op,s,t,op') ==
   argtypes := [nativeArgumentType x for x in s]
 
   -- Build parameter list for the forwarding function
-  parms := [GENSYM '"parm" for x in s]
+  parms := [gensym '"parm" for x in s]
 
   -- Separate string arguments and array arguments from scalars.
   -- These array arguments need to be pinned down, and the string
@@ -1599,8 +1599,8 @@ genCLOZUREnativeTranslation(op,s,t,op') ==
   strPairs := nil 
   aryPairs := nil
   for p in parms for x in s repeat
-    x = "string" => strPairs := [[p,:GENSYM '"loc"], :strPairs]
-    x is [.,["buffer",.]] => aryPairs := [[p,:GENSYM '"loc"], :aryPairs]
+    x = "string" => strPairs := [[p,:gensym '"loc"], :strPairs]
+    x is [.,["buffer",.]] => aryPairs := [[p,:gensym '"loc"], :aryPairs]
 
   -- Build the actual foreign function call.
   -- Note that Clozure CL does not mangle foreign function call for
diff --git a/src/boot/strap/tokens.clisp b/src/boot/strap/tokens.clisp
index 897bea78..88d2552a 100644
--- a/src/boot/strap/tokens.clisp
+++ b/src/boot/strap/tokens.clisp
@@ -206,6 +206,7 @@
                          (LIST '|exit| 'EXIT) (LIST '|false| 'NIL)
                          (LIST '|first| 'CAR) (LIST '|fourth| 'CADDDR)
                          (LIST '|function| 'FUNCTION)
+                         (LIST '|gensym| 'GENSYM)
                          (LIST '|genvar| 'GENVAR)
                          (LIST '|integer?| 'INTEGERP)
                          (LIST '|lastNode| 'LAST) (LIST 'LAST '|last|)
diff --git a/src/boot/tokens.boot b/src/boot/tokens.boot
index 597ac295..74c5e437 100644
--- a/src/boot/tokens.boot
+++ b/src/boot/tokens.boot
@@ -247,6 +247,7 @@ for i in [ _
   ["first",        "CAR"]  , _
   ["fourth",    "CADDDR"]  , _
   ["function","FUNCTION"] , _
+  ["gensym",    "GENSYM"]  , _
   ["genvar",    "GENVAR"]  , _
   ["integer?","INTEGERP"]  , _
   ["lastNode",    "LAST"]  , _