* boot/tokens.boot: Retire "^=". Introduce "~=".

	* boot/ast.boot: Use "~=" instead of "^=".
	* boot/includer.boot: Likewise.
	* boot/translator.boot: Likewise.
	* interp/as.boot: Likewise.
	* interp/bc-misc.boot: Likewise.
	* interp/bc-solve.boot: Likewise.
	* interp/bc-util.boot: Likewise.
	* interp/br-con.boot: Likewise.
	* interp/br-data.boot: Likewise.
	* interp/br-op1.boot: Likewise.
	* interp/br-op2.boot: Likewise.
	* interp/br-prof.boot: Likewise.
	* interp/br-saturn.boot: Likewise.
	* interp/br-search.boot: Likewise.
	* interp/br-util.boot: Likewise.
	* interp/c-doc.boot: Likewise.
	* interp/c-util.boot: Likewise.
	* interp/category.boot: Likewise.
	* interp/cattable.boot: Likewise.
	* interp/clam.boot: Likewise.
	* interp/clammed.boot: Likewise.
	* interp/compiler.boot: Likewise.
	* interp/database.boot: Likewise.
	* interp/define.boot: Likewise.
	* interp/format.boot: Likewise.
	* interp/fortcall.boot: Likewise.
	* interp/functor.boot: Likewise.
	* interp/g-cndata.boot: Likewise.
	* interp/g-opt.boot: Likewise.
	* interp/g-timer.boot: Likewise.
	* interp/g-util.boot: Likewise.
	* interp/guess.boot: Likewise.
	* interp/ht-root.boot: Likewise.
	* interp/ht-util.boot: Likewise.
	* interp/htsetvar.boot: Likewise.
	* interp/i-analy.boot: Likewise.
	* interp/i-code.boot: Likewise.
	* interp/i-coerce.boot: Likewise.
	* interp/i-coerfn.boot: Likewise.
	* interp/i-eval.boot: Likewise.
	* interp/i-funsel.boot: Likewise.
	* interp/i-intern.boot: Likewise.
	* interp/i-map.boot: Likewise.
	* interp/i-output.boot: Likewise.
	* interp/i-resolv.boot: Likewise.
	* interp/i-spec1.boot: Likewise.
	* interp/i-spec2.boot: Likewise.
	* interp/i-syscmd.boot: Likewise.
	* interp/i-toplev.boot: Likewise.
	* interp/i-util.boot: Likewise.
	* interp/int-top.boot: Likewise.
	* interp/interop.boot: Likewise.
	* interp/intfile.boot: Likewise.
	* interp/lisplib.boot: Likewise.
	* interp/macex.boot: Likewise.
	* interp/mark.boot: Likewise.
	* interp/match.boot: Likewise.
	* interp/modemap.boot: Likewise.
	* interp/msg.boot: Likewise.
	* interp/msgdb.boot: Likewise.
	* interp/newfort.boot: Likewise.
	* interp/nruncomp.boot: Likewise.
	* interp/nrunfast.boot: Likewise.
	* interp/nrungo.boot: Likewise.
	* interp/nrunopt.boot: Likewise.
	* interp/parse.boot: Likewise.
	* interp/pathname.boot: Likewise.
	* interp/pf2atree.boot: Likewise.
	* interp/pf2sex.boot: Likewise.
	* interp/postpar.boot: Likewise.
	* interp/profile.boot: Likewise.
	* interp/pspad1.boot: Likewise.
	* interp/pspad2.boot: Likewise.
	* interp/record.boot: Likewise.
	* interp/scan.boot: Likewise.
	* interp/setvars.boot: Likewise.
	* interp/simpbool.boot: Likewise.
	* interp/slam.boot: Likewise.
	* interp/topics.boot: Likewise.
	* interp/trace.boot: Likewise.
	* interp/wi1.boot: Likewise.
	* interp/wi2.boot: Likewise.
	* interp/word.boot: Likewise.

2 files changed, 17 insertions, 12 deletions

diff --git a/src/boot/strap/ast.clisp b/src/boot/strap/ast.clisp
index bd54f16f..01cde61b 100644
--- a/src/boot/strap/ast.clisp
+++ b/src/boot/strap/ast.clisp
@@ -2964,17 +2964,22 @@
                     (SETQ |unstableArgs| (CONS |a| |unstableArgs|)))))))
             (SETQ |bfVar#174| (CDR |bfVar#174|))
             (SETQ |bfVar#175| (CDR |bfVar#175|))))
+        (SETQ |op'|
+              (COND
+                ((|%hasFeature| :WIN32)
+                 (CONCAT "_" (SYMBOL-NAME |op'|)))
+                (#1='T (SYMBOL-NAME |op'|))))
         (COND
           ((NULL |unstableArgs|)
            (LIST (LIST 'DEFUN |op| |args|
                        (CONS (INTERN "ALIEN-FUNCALL" "SB-ALIEN")
                              (CONS (LIST
                                     (INTERN "EXTERN-ALIEN" "SB-ALIEN")
-                                    (SYMBOL-NAME |op'|)
+                                    |op'|
                                     (CONS 'FUNCTION
                                      (CONS |rettype| |argtypes|)))
                                    |args|)))))
-          ('T
+          (#1#
            (LIST (LIST 'DEFUN |op| |args|
                        (LIST (|bfColonColon| 'SB-SYS
                                  'WITH-PINNED-OBJECTS)
@@ -2983,7 +2988,7 @@
                                    (CONS
                                     (LIST
                                      (INTERN "EXTERN-ALIEN" "SB-ALIEN")
-                                     (SYMBOL-NAME |op'|)
+                                     |op'|
                                      (CONS 'FUNCTION
                                       (CONS |rettype| |argtypes|)))
                                     (NREVERSE |newArgs|))))))))))))
diff --git a/src/boot/strap/tokens.clisp b/src/boot/strap/tokens.clisp
index 75e3f3f5..618d4f4d 100644
--- a/src/boot/strap/tokens.clisp
+++ b/src/boot/strap/tokens.clisp
@@ -20,13 +20,13 @@
           (LIST ";" 'SEMICOLON) (LIST "*" 'TIMES) (LIST "**" 'POWER)
           (LIST "/" 'SLASH) (LIST "+" 'PLUS) (LIST "-" 'MINUS)
           (LIST "<" 'LT) (LIST ">" 'GT) (LIST "<=" 'LE) (LIST ">=" 'GE)
-          (LIST "=" 'SHOEEQ) (LIST "^" 'NOT) (LIST "^=" 'SHOENE)
-          (LIST ".." 'SEG) (LIST "#" 'LENGTH) (LIST "=>" 'EXIT)
-          (LIST "->" 'ARROW) (LIST ":=" 'BEC) (LIST "==" 'DEF)
-          (LIST "==>" 'MDEF) (LIST "<=>" 'TDEF) (LIST "(" 'OPAREN)
-          (LIST ")" 'CPAREN) (LIST "(|" 'OBRACK) (LIST "|)" 'CBRACK)
-          (LIST "[" 'OBRACK) (LIST "]" 'CBRACK) (LIST "suchthat" 'BAR)
-          (LIST "'" 'QUOTE) (LIST "|" 'BAR)))
+          (LIST "=" 'SHOEEQ) (LIST "^" 'NOT) (LIST "^=" 'SHOENERETIRED)
+          (LIST "~=" 'SHOENE) (LIST ".." 'SEG) (LIST "#" 'LENGTH)
+          (LIST "=>" 'EXIT) (LIST "->" 'ARROW) (LIST ":=" 'BEC)
+          (LIST "==" 'DEF) (LIST "==>" 'MDEF) (LIST "<=>" 'TDEF)
+          (LIST "(" 'OPAREN) (LIST ")" 'CPAREN) (LIST "(|" 'OBRACK)
+          (LIST "|)" 'CBRACK) (LIST "[" 'OBRACK) (LIST "]" 'CBRACK)
+          (LIST "suchthat" 'BAR) (LIST "'" 'QUOTE) (LIST "|" 'BAR)))
 
 (DEFUN |shoeKeyTableCons| ()
   (PROG (|KeyTable|)
@@ -169,7 +169,7 @@
                          (LIST 'OR '|or|) (LIST 'SLASH '/)
                          (LIST 'POWER '**) (LIST 'MINUS '-)
                          (LIST 'LT '<) (LIST 'GT '>) (LIST 'LE '<=)
-                         (LIST 'GE '>=) (LIST 'SHOENE '^=)))
+                         (LIST 'GE '>=) (LIST 'SHOENE '~=)))
         (|i| NIL))
     (LOOP
       (COND
@@ -204,7 +204,7 @@
                          (LIST '|cons| 'CONS) (LIST '|copy| 'COPY)
                          (LIST '|croak| 'CROAK) (LIST '|drop| 'DROP)
                          (LIST '|exit| 'EXIT) (LIST '|false| 'NIL)
-                         (LIST '|first| 'CAR)
+                         (LIST '|first| 'CAR) (LIST '|fourth| 'CADDDR)
                          (LIST '|function| 'FUNCTION)
                          (LIST '|genvar| 'GENVAR) (LIST 'IN 'MEMBER)
                          (LIST '|is| 'IS) (LIST '|isnt| 'ISNT)