* interp/define.boot: Tidy.

	* interp/functor.boot: Likewise.
	* interp/g-util.boot: Likewise.
	* interp/slam.boot: Likewise.
	* interp/topics.boot: Likewise.
	* interp/trace.boot: Likewise.

7 files changed, 17 insertions, 8 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index acb9f170..a75fbc9f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,14 @@
 2011-11-24  Gabriel Dos Reis  <gdr@cs.tamu.edu>
 
+	* interp/define.boot: Tidy.
+	* interp/functor.boot: Likewise.
+	* interp/g-util.boot: Likewise.
+	* interp/slam.boot: Likewise.
+	* interp/topics.boot: Likewise.
+	* interp/trace.boot: Likewise.
+
+2011-11-24  Gabriel Dos Reis  <gdr@cs.tamu.edu>
+
 	* interp/nruncomp.boot (changeDirectoryInSlot1,sigloc): Add first
 	parameter as a DB.  Adjust caller.
 	(NRTsubstDelta): Tidy.
diff --git a/src/interp/define.boot b/src/interp/define.boot
index 9bddd837..a54ac15a 100644
--- a/src/interp/define.boot
+++ b/src/interp/define.boot
@@ -1657,7 +1657,7 @@ compDefWhereClause(['DEF,form,signature,body],m,e) ==
  
   -- 4. construct a WhereList which declares and/or defines the xi's in
   --    the order constructed in step 3
-  whereList := [addSuchthat(x,[":",x,LASSOC(x,argSigAlist)]) for x in varList]
+  whereList := [addSuchthat(x,[":",x,symbolTarget(x,argSigAlist)]) for x in varList]
      where addSuchthat(x,y) ==
              p := LASSOC(x,$predAlist) => ["|",y,p]
              y
diff --git a/src/interp/functor.boot b/src/interp/functor.boot
index 35737a60..1cf807a9 100644
--- a/src/interp/functor.boot
+++ b/src/interp/functor.boot
@@ -473,7 +473,7 @@ DescendCode(db,code,flag,viewAssoc,e) ==
   code is ['CodeDefine,sig,implem] =>
              --Generated by doIt in COMPILER BOOT
     dom :=
-      u := LASSOC('$,viewAssoc) => ['getDomainView,'$,u]
+      u := symbolTarget('$,viewAssoc) => ['getDomainView,'$,u]
       '$
     body:= ['CONS,implem,dom]
     u := SetFunctionSlots(sig,body,flag,'original)
diff --git a/src/interp/g-util.boot b/src/interp/g-util.boot
index f4adb422..d826627c 100644
--- a/src/interp/g-util.boot
+++ b/src/interp/g-util.boot
@@ -308,7 +308,7 @@ get1(x,prop,e) ==
   prop = "modemap" and $insideCapsuleFunctionIfTrue =>
     symbolTarget("modemap",getProplist(x,$CapsuleModemapFrame))
       or get2(x,prop)
-  LASSOC(prop,getProplist(x,e)) or get2(x,prop)
+  symbolTarget(prop,getProplist(x,e)) or get2(x,prop)
 
 get2(x,prop) ==
   prop = "modemap" and ident? x and constructor? x =>
@@ -784,7 +784,7 @@ searchTailEnv(x,e) ==
 augProplist(proplist,prop,val) ==
   $InteractiveMode => augProplistInteractive(proplist,prop,val)
   while (proplist is [[ =prop,:.],:proplist']) repeat proplist:= proplist'
-  val=(u:= LASSOC(prop,proplist)) => proplist
+  val = (u := symbolTarget(prop,proplist)) => proplist
   null val =>
     null u => proplist
     DELLASOS(prop,proplist)
diff --git a/src/interp/slam.boot b/src/interp/slam.boot
index fc54d770..1f1f7d9e 100644
--- a/src/interp/slam.boot
+++ b/src/interp/slam.boot
@@ -204,7 +204,7 @@ reportFunctionCompilation(op,nam,argl,body,isRecursive) ==
   nam
  
 getCacheCount fn ==
-  n:= LASSOC(fn,$cacheAlist) => n
+  n:= symbolTarget(fn,$cacheAlist) => n
   $cacheCount
  
 reportFunctionCacheAll(op,nam,argl,body) ==
@@ -446,7 +446,7 @@ clearAllSlams x ==
         symbolValue(slamListName) := nil
         thoseCleared:= ADJOIN(x,thoseCleared)
         someMoreToClear:=
-          setDifference(LASSOC(x,$functorDependencyAlist),[:thoseToClear,:
+          setDifference(symbolTarget(x,$functorDependencyAlist),[:thoseToClear,:
             thoseCleared])
         append!(thoseToClear,someMoreToClear)
  
diff --git a/src/interp/topics.boot b/src/interp/topics.boot
index 191606aa..d30a5eaf 100644
--- a/src/interp/topics.boot
+++ b/src/interp/topics.boot
@@ -254,7 +254,7 @@ filterByTopic(opAlist,topic) ==
 
 listOfTopics(conname) ==
   doc := getConstructorDocumentationFromDB conname
-  u := ASSOC('constructor,doc) or return nil
+  u := symbolTarget('constructor,doc) or return nil
   code := myLastAtom u
 --not integer? code => nil
   mySort [key for [key,:val] in entries $topicHash | LOGBITP(val,code)]
diff --git a/src/interp/trace.boot b/src/interp/trace.boot
index 010c4fe0..64ddbcc8 100644
--- a/src/interp/trace.boot
+++ b/src/interp/trace.boot
@@ -145,7 +145,7 @@ trace1 l ==
         traceList => [["ops",:traceList]]
         nil
       varList:=
-        y:= LASSOC("vars",optionList) => [["vars",:y]]
+        y := symbolTarget("vars",optionList) => [["vars",:y]]
         nil
       [:domainList,:opList,:varList]
     optionList => [:traceList,:optionList]