* 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.

7 files changed, 31 insertions, 25 deletions

diff --git a/src/boot/ast.boot b/src/boot/ast.boot
index 95d7cbc5..8fe59706 100644
--- a/src/boot/ast.boot
+++ b/src/boot/ast.boot
@@ -756,7 +756,7 @@ bfReName x==
     x
   $translatingOldBoot and not bfSameMeaning x =>
     oldName := bfGetOldBootName x
-    if newName ^= oldName then
+    if newName ~= oldName then
        warn [PNAME x, '" as `", PNAME newName, _
              '"_' differs from Old Boot `", PNAME oldName,_
              '"_' at ", diagnosticLocation $stok]
@@ -1192,7 +1192,7 @@ bfCI(g,x,y)==
     if null a
     then [first x,y]
     else
-       b:=[[i,bfCARCDR(j,g)] for i in a for j in 0.. | i ^= "DOT"]
+       b:=[[i,bfCARCDR(j,g)] for i in a for j in 0.. | i ~= "DOT"]
        null b => [first x,y]
        [first x,["LET",b,y]]
 
@@ -1419,7 +1419,7 @@ nativeArgumentType t ==
   -- Allow 'string'  for `pass-by-value'
   t = "string" => nativeType t
   -- anything else must use a modified reference type.
-  atom t or #t ^= 2 => 
+  atom t or #t ~= 2 => 
      coreError '"invalid argument type for a native function"
   [m,[c,t']] := t
   -- Require a modifier.
@@ -1469,7 +1469,7 @@ genGCLnativeTranslation(op,s,t,op') ==
     ccode := 
       "strconc"/[gclTypeInC t, '" ", cop, '"(",
 	 :[cparm(x,a) for x in tails s for a in tails cargs],
-	   '") { ", (t ^= "void" => '"return "; ""),
+	   '") { ", (t ~= "void" => '"return "; ""),
 	     SYMBOL_-NAME op', '"(",
 	       :[gclArgsInC(x,a) for x in tails s for a in tails cargs],
 		  '"); }" ]
diff --git a/src/boot/includer.boot b/src/boot/includer.boot
index 481f099c..86f3a648 100644
--- a/src/boot/includer.boot
+++ b/src/boot/includer.boot
@@ -1,6 +1,6 @@
 -- Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd.
 -- All rights reserved.
--- Copyright (C) 2007-2008, Gabriel Dos Reis.
+-- Copyright (C) 2007-2009, Gabriel Dos Reis.
 -- All rights reserved.
 --
 -- Redistribution and use in source and binary forms, with or without
@@ -285,7 +285,7 @@ shoePrefix?(prefix,whole) ==
  
 shoePlainLine?(s) ==
          #s = 0 =>  true
-         s.0 ^= char ")"
+         s.0 ~= char ")"
  
 shoeSay?          s  == shoePrefix?('")say",         s)
 shoeEval?         s  == shoePrefix?('")eval",        s)
diff --git a/src/boot/scanner.boot b/src/boot/scanner.boot
index 5e939d99..8872c9df 100644
--- a/src/boot/scanner.boot
+++ b/src/boot/scanner.boot
@@ -389,7 +389,7 @@ shoeW(b)==
        $n:=$n+1
        l:=$sz
        endid:=shoeIdEnd($ln,$n)
-       if endid=l or QENUM($ln,endid)^=shoeESCAPE
+       if endid=l or QENUM($ln,endid)~=shoeESCAPE
        then
            $n:=endid
            [b,SUBSTRING($ln,n1,endid-n1)]
@@ -421,7 +421,7 @@ shoeInteger1(zro) ==
        n:=$n
        l:= $sz
        while $n<l and shoeDigit($ln.$n) repeat $n:=$n+1
-       if $n=l or QENUM($ln,$n)^=shoeESCAPE
+       if $n=l or QENUM($ln,$n)~=shoeESCAPE
        then if n=$n and zro
             then '"0"
             else SUBSTRING($ln,n,$n-n)
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)
diff --git a/src/boot/tokens.boot b/src/boot/tokens.boot
index a51fe58b..1623d61e 100644
--- a/src/boot/tokens.boot
+++ b/src/boot/tokens.boot
@@ -78,7 +78,8 @@ shoeKeyWords == [  _
             ['">=","GE" ], _
             ['"=", "SHOEEQ"], _
             ['"^", "NOT"], _
-            ['"^=","SHOENE" ], _
+            ['"^=","SHOENERETIRED" ], _
+            ['"~=","SHOENE" ], _
             ['"..","SEG" ], _
             ['"#", "LENGTH"], _
             ['"=>","EXIT" ], _
@@ -194,7 +195,7 @@ for i in [      _
         ["GT"    ,">"], _
         ["LE"   ,"<="], _
         ["GE"   ,">="], _
-        ["SHOENE"  ,"^="] _
+        ["SHOENE"  ,"~="] _
                    ]_
        repeat SETF (GET(first i,'SHOEINF),second i)
  
diff --git a/src/boot/translator.boot b/src/boot/translator.boot
index 50574ee5..c3e50f44 100644
--- a/src/boot/translator.boot
+++ b/src/boot/translator.boot
@@ -427,7 +427,7 @@ translateToplevel(b,export?) ==
         :[first translateToplevel(d,true) for d in ds]]
 
     Import(m) => 
-      if getOptionValue "import" ^= '"skip" then
+      if getOptionValue "import" ~= '"skip" then
         bootImport STRING m
       [["IMPORT-MODULE", STRING m]]
 
@@ -755,7 +755,7 @@ defaultBootToLispFile file ==
 
 getIntermediateLispFile(file,options) ==
   out := NAMESTRING getOutputPathname(options)
-  out ^= nil => 
+  out ~= nil => 
     strconc(shoeRemoveStringIfNec
        (strconc('".",$effectiveFaslType),out),'".clisp")
   defaultBootToLispFile file
@@ -766,7 +766,7 @@ translateBootFile(progname, options, file) ==
 
 compileBootHandler(progname, options, file) ==
   intFile := BOOTTOCL(file, getIntermediateLispFile(file,options))
-  errorCount() ^= 0 => nil
+  errorCount() ~= 0 => nil
   intFile => 
     objFile := compileLispHandler(progname, options, intFile)
     DELETE_-FILE intFile