From d2afe2366c2c592327cd0eb6593a3536a6eff54d Mon Sep 17 00:00:00 2001
From: dos-reis <gdr@axiomatics.org>
Date: Fri, 14 Aug 2009 10:48:09 +0000
Subject: 	* 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.

---
 src/interp/br-op2.boot | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/interp/br-op2.boot')

diff --git a/src/interp/br-op2.boot b/src/interp/br-op2.boot
index c1f8ac28..2171a7ae 100644
--- a/src/interp/br-op2.boot
+++ b/src/interp/br-op2.boot
@@ -177,7 +177,7 @@ dbChooseOperandName(typ) ==
     name = "$" => 'domain
     getConstructorKindFromDB name
   s := PNAME opOf typ
-  kind ^= 'category =>
+  kind ~= 'category =>
     anySubstring?('"Integer",s,0) or anySubstring?('"Number",s,0) =>
       x := first $NumberList
       $NumberList := rest $NumberList
@@ -238,7 +238,7 @@ getSubstSignature sig ==
     newsig
 
 getSubstQualify(x,i,sig) ==
-    or/[CONTAINED(x,y) for y in sig for j in 1.. | j ^= i] => x
+    or/[CONTAINED(x,y) for y in sig for j in 1.. | j ~= i] => x
     false
 
 getSubstInsert(x,candidates) ==
@@ -352,7 +352,7 @@ koAttrs(conform,domname) ==
   $predvec: local :=
     $domain => $domain . 3
     getConstructorPredicatesFromDB conname
-  u := [[a,:pred] for [a,:i] in $infovec . 2 | a ^= 'nil and (pred := sublisFormal(args,kTestPred i))]
+  u := [[a,:pred] for [a,:i] in $infovec . 2 | a ~= 'nil and (pred := sublisFormal(args,kTestPred i))]
                                                ---------  CHECK for a = nil
   listSort(function GLESSEQP,fn u) where fn u ==
     alist := nil
@@ -403,7 +403,7 @@ koOps(conform,domname,:options) == main where
       op1 := zeroOneConvert op
       acc :=
        [[op1,:[[sig,npred,:exposureTail] for [sig,slot,pred,key,:.] in sublisFormal(subargs,u) |
-         (key ^= 'Subsumed) and (npred := simpHasPred pred)]],:acc]
+         (key ~= 'Subsumed) and (npred := simpHasPred pred)]],:acc]
     acc
   merge(alist,alist1) == --alist1 takes precedence
     for [op,:al] in alist1 repeat
@@ -586,7 +586,7 @@ modemap2SigConds conds ==
   [conds]
 
 hasPatternVar x ==
-  IDENTP x and (x ^= "**") => isPatternVar x
+  IDENTP x and (x ~= "**") => isPatternVar x
   atom x => false
   or/[hasPatternVar y for y in x]
 
-- 
cgit v1.2.3