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

1 files changed, 22 insertions, 22 deletions

diff --git a/src/interp/c-doc.boot b/src/interp/c-doc.boot
index 9afdd7b0..3bf1365f 100644
--- a/src/interp/c-doc.boot
+++ b/src/interp/c-doc.boot
@@ -233,7 +233,7 @@ transDoc(conname,doclist) ==
 --          null expectedNumOfArgs =>
 --            checkDocError ['"Unknown constructor name?: ",opOf x]
 --            x
---          expectedNumOfArgs ^= (n := #(IFCDR x)) =>
+--          expectedNumOfArgs ~= (n := #(IFCDR x)) =>
 --            n = 0 => checkDocError1
 --              ['"You must give arguments to the _"Related Domain_": ",x]
 --            checkDocError
@@ -331,16 +331,16 @@ checkTexht u ==
         if not (IFCAR u = $charLbrace) then
            checkDocError '"First left brace after \texht missing"
         count := 1  -- drop first argument including braces of \texht
-        while ((y := IFCAR (u := rest u))^= $charRbrace or count > 1) repeat
+        while ((y := IFCAR (u := rest u))~= $charRbrace or count > 1) repeat
           if y = $charLbrace then count := count + 1
           if y = $charRbrace then count := count - 1
         x :=  IFCAR (u := rest u)  -- drop first right brace of 1st arg
     if x = '"\httex" and (u := IFCDR u) and (IFCAR u = $charLbrace) then
         acc := [IFCAR u,:acc]      --left  brace: add it
-        while (y := IFCAR (u := rest u)) ^= $charRbrace repeat (acc := [y,:acc])
+        while (y := IFCAR (u := rest u)) ~= $charRbrace repeat (acc := [y,:acc])
         acc := [IFCAR u,:acc]      --right brace: add it
         x :=  IFCAR (u := rest u)  --left brace:  forget it
-        while IFCAR (u := rest u) ^= $charRbrace repeat 'skip
+        while IFCAR (u := rest u) ~= $charRbrace repeat 'skip
         x :=  IFCAR (u := rest u)  --forget right brace: move to next char
     acc := [x,:acc]
     u := rest u
@@ -432,7 +432,7 @@ checkIsValidType form == main where
     null conname => nil
     fn(form,getDualSignatureFromDB conname)
   fn(form,coSig) ==
-    #form ^= #coSig => form
+    #form ~= #coSig => form
     or/[null checkIsValidType x for x in rest form for flag in rest coSig | flag]
       => nil
     'ok
@@ -470,7 +470,7 @@ checkGetStringBeforeRightBrace u ==
 --          (y := IFCAR (v := IFCDR v)) = $charRbrace =>
 --             w := IFCDR v
 --             middle := nil
---             while w and (z := first w) ^= '"\end" repeat
+--             while w and (z := first w) ~= '"\end" repeat
 --               middle := [z,:middle]
 --               w := rest w
 --             if (y := IFCAR (w := IFCDR w)) = $charLbrace and
@@ -491,7 +491,7 @@ checkGetStringBeforeRightBrace u ==
 --          (y := IFCAR (v := IFCDR v)) = $charRbrace =>
 --             w := IFCDR v
 --             middle := nil
---             while w and (z := first w) ^= '"\end" repeat
+--             while w and (z := first w) ~= '"\end" repeat
 --               middle := [z,:middle]
 --               w := rest w
 --             if (y := IFCAR (w := IFCDR w)) = $charLbrace and
@@ -529,7 +529,7 @@ checkTrimCommented line ==
   --line beginning with % is a comment
   k = 0 => '""
   --remarks beginning with %% are comments
-  k >= n - 1 or line.(k + 1) ^= char '_% => line
+  k >= n - 1 or line.(k + 1) ~= char '_% => line
   k < #line => SUBSTRING(line,0,k)
   line
 
@@ -538,7 +538,7 @@ htcharPosition(char,line,i) ==
   k := charPosition(char,line,i)
   k = m => k
   k > 0 =>
-    line.(k - 1) ^= $charBack => k
+    line.(k - 1) ~= $charBack => k
     htcharPosition(char,line,k + 1)
   0
 
@@ -564,7 +564,7 @@ checkComments(nameSig,lines) == main where
   main() ==
     $checkErrorFlag: local := false
     margin := checkGetMargin lines
-    if null $attribute? and nameSig ^= 'constructor then 
+    if null $attribute? and nameSig ~= 'constructor then 
       lines :=
         [checkTransformFirsts(first nameSig,first lines,margin),:rest lines]
     u := checkIndentedLines(lines, margin)
@@ -655,7 +655,7 @@ checkGetArgs u ==
     k := getMatchingRightPren(u,6,char '_{,char '_}) or m
     checkGetArgs SUBSTRING(u,6,k-6)
   (i := charPosition(char '_(,u,0)) > m => nil
-  (u . m) ^= char '_) => nil
+  (u . m) ~= char '_) => nil
   while (k := charPosition($charComma,u,i + 1)) < m repeat
     acc := [trimString SUBSTRING(u,i + 1,k - i - 1),:acc]
     i := k
@@ -675,7 +675,7 @@ firstNonBlankPosition(x,:options) ==
   start := IFCAR options or 0
   k := -1
   for i in start..MAXINDEX x repeat
-    if x.i ^= $charBlank then return (k := i)
+    if x.i ~= $charBlank then return (k := i)
   k
 
 checkAddIndented(x,margin) ==
@@ -706,7 +706,7 @@ checkTrim($x,lines) == main where
     [trim y for y in lines]
   wherePP(u) ==
     k := charPosition($charPlus,u,0)
-    k = #u or charPosition($charPlus,u,k + 1) ^= k + 1 =>
+    k = #u or charPosition($charPlus,u,k + 1) ~= k + 1 =>
       systemError '" Improper comment found"
     k
   trim(s) ==
@@ -728,7 +728,7 @@ checkExtract(header,lines) ==
   j := charPosition(char '_:,u,k)
   margin := k
   firstLines :=
-    (k := firstNonBlankPosition(u,j + 1)) ^= -1 =>
+    (k := firstNonBlankPosition(u,j + 1)) ~= -1 =>
       [SUBSTRING(u,j + 1,nil),:rest lines]
     rest lines
   --now look for another header; if found skip all rest of these lines
@@ -750,7 +750,7 @@ checkFixCommonProblem u ==
   while u repeat
     x := first u
     x = $charLbrace and member(next := IFCAR rest u,$HTspadmacros) and
-                       (IFCAR IFCDR rest u ^= $charLbrace) =>
+                       (IFCAR IFCDR rest u ~= $charLbrace) =>
       checkDocError ['"Reversing ",next,'" and left brace"]
       acc := [$charLbrace,next,:acc]  --reverse order of brace and command
       u := rest rest u
@@ -1008,7 +1008,7 @@ checkBalance u ==
         => stack := [CAR openClose,:stack]   --yes, push the open bracket
       open  := rassoc(x,$checkPrenAlist) =>  --it is a close bracket!
         stack is [top,:restStack] => --does corresponding open bracket match?
-          if open ^= top then          --yes: just pop the stack
+          if open ~= top then          --yes: just pop the stack
             checkDocError
               ['"Mismatch: left ",checkSayBracket top,'" matches right ",checkSayBracket open]
           stack := restStack
@@ -1088,7 +1088,7 @@ checkLookForLeftBrace(u) ==   --return line beginning with left brace
   while u repeat
     x := first u
     if x = $charLbrace then return u
-    x ^= $charBlank => return nil
+    x ~= $charBlank => return nil
     u := rest u
   u
 
@@ -1131,7 +1131,7 @@ checkTransformFirsts(opname,u,margin) ==
     open = char '_[ and (close := char '_]) or
           open = char '_(  and (close := char '_)) =>
       k := getMatchingRightPren(u,j + 1,open,close)
-      namestring ^= (firstWord := SUBSTRING(u,0,i)) =>
+      namestring ~= (firstWord := SUBSTRING(u,0,i)) =>
         checkDocError ['"Improper first word in comments: ",firstWord]
         u
       null k =>
@@ -1143,7 +1143,7 @@ checkTransformFirsts(opname,u,margin) ==
     k := checkSkipToken(u,j,m) or return u
     infixOp := INTERN SUBSTRING(u,j,k - j)
     not GETL(infixOp,'Led) =>                                     --case 3
-      namestring ^= (firstWord := SUBSTRING(u,0,i)) =>
+      namestring ~= (firstWord := SUBSTRING(u,0,i)) =>
         checkDocError ['"Improper first word in comments: ",firstWord]
         u
       #(p := PNAME infixOp) = 1 and (open := p.0) and
@@ -1154,13 +1154,13 @@ checkTransformFirsts(opname,u,margin) ==
       STRCONC('"\spad{",SUBSTRING(u,0,k),'"}",SUBSTRING(u,k,nil))
     l := checkSkipBlanks(u,k,m) or return u
     n := checkSkipToken(u,l,m) or return u
-    namestring ^= PNAME infixOp =>
+    namestring ~= PNAME infixOp =>
       checkDocError ['"Improper initial operator in comments: ",infixOp]
       u
     STRCONC('"\spad{",SUBSTRING(u,0,n),'"}",SUBSTRING(u,n,nil))   --case 5
   true =>          -- not ALPHA_-CHAR_-P u.0 =>
     i := checkSkipToken(u,0,m) or return u
-    namestring ^= (firstWord := SUBSTRING(u,0,i)) =>
+    namestring ~= (firstWord := SUBSTRING(u,0,i)) =>
       checkDocError ['"Improper first word in comments: ",firstWord]
       u
     prefixOp := INTERN SUBSTRING(u,0,i)
@@ -1172,7 +1172,7 @@ checkTransformFirsts(opname,u,margin) ==
       j > m => u
       STRCONC('"\spad{",SUBSTRING(u,0,j + 1),'"}",SUBSTRING(u,j + 1,nil))
     k := checkSkipToken(u,j,m) or return u
-    namestring ^= (firstWord := SUBSTRING(u,0,i)) =>
+    namestring ~= (firstWord := SUBSTRING(u,0,i)) =>
       checkDocError ['"Improper first word in comments: ",firstWord]
       u
     STRCONC('"\spad{",SUBSTRING(u,0,k),'"}",SUBSTRING(u,k,nil))