Replace \*ANCESTORS-HASH\* with $AncestorsTable.

3 files changed, 16 insertions, 16 deletions

diff --git a/src/interp/cattable.boot b/src/interp/cattable.boot
index 24b5f11d..81b59fdb 100644
--- a/src/interp/cattable.boot
+++ b/src/interp/cattable.boot
@@ -56,7 +56,7 @@ displayCategoryTable(:options) ==
     PRINT val
 
 genCategoryTable() ==
-  SETQ(_*ANCESTORS_-HASH_*,  hashTable 'EQ)
+  $AncestorsTable := makeTable function symbolEq?
   $HasCategoryTable := makeTable function EQUAL
   genTempCategoryTable()
   domainTable :=
@@ -71,12 +71,12 @@ genCategoryTable() ==
     for [a,:b] in encodeCategoryAlist(id,entry) repeat
       tableValue($HasCategoryTable,[id,:a]) := b
   simpTempCategoryTable()
-  -- compressHashTable _*ANCESTORS_-HASH_*
+  -- compressHashTable $AncestorsTable
   simpCategoryTable()
   -- compressHashTable $HasCategoryTable
 
 simpTempCategoryTable() ==
-  for [id,:.] in entries _*ANCESTORS_-HASH_* repeat
+  for [id,:.] in entries $AncestorsTable repeat
     for (u:=[a,:b]) in getConstructorAncestorsFromDB id repeat
       u.rest := simpHasPred b
 
@@ -195,16 +195,16 @@ genTempCategoryTable() ==
   for con in allConstructors()  repeat
     getConstructorKindFromDB con is "category" =>
       addToCategoryTable con
-  for [id,:item] in entries _*ANCESTORS_-HASH_* repeat
+  for [id,:item] in entries $AncestorsTable repeat
     for (u:=[.,:b]) in item repeat
       u.rest := simpCatPredicate simpBool b
-    tableValue(_*ANCESTORS_-HASH_*,id) := listSort(function GLESSEQP,item)
+    tableValue($AncestorsTable,id) := listSort(function GLESSEQP,item)
 
 addToCategoryTable con ==
   -- adds an entry to $tempCategoryTable with key=con and alist entries
   u := getConstructorModemap(con).mmDC --domain
   alist := getCategoryExtensionAlist u
-  tableValue(_*ANCESTORS_-HASH_*,first u) := alist
+  tableValue($AncestorsTable,first u) := alist
   alist
 
 encodeCategoryAlist(id,alist) ==
@@ -442,7 +442,7 @@ updateCategoryTable(cname,kind) ==
 updateCategoryTableForCategory(cname) ==
   clearTempCategoryTable([[cname,'category]])
   addToCategoryTable(cname)
-  for [id,:.] in entries _*ANCESTORS_-HASH_* repeat
+  for [id,:.] in entries $AncestorsTable repeat
       for (u:=[.,:b]) in getConstructorAncestorsFromDB id repeat
         u.rest := simpCatPredicate simpBool b
 
@@ -462,11 +462,11 @@ clearCategoryTable1(key,val) ==
   nil
 
 clearTempCategoryTable(catNames) ==
-  for [key,:.] in entries _*ANCESTORS_-HASH_* repeat
+  for [key,:.] in entries $AncestorsTable repeat
     symbolMember?(key,catNames) => nil
     extensions:= nil
     for (extension:= [catForm,:.]) in getConstructorAncestorsFromDB key
       repeat
         symbolMember?(first catForm,catNames) => nil
         extensions:= [extension,:extensions]
-    tableValue(_*ANCESTORS_-HASH_*,key) := extensions
+    tableValue($AncestorsTable,key) := extensions
diff --git a/src/interp/daase.lisp b/src/interp/daase.lisp
index f346f63d..3c0ab977 100644
--- a/src/interp/daase.lisp
+++ b/src/interp/daase.lisp
@@ -88,12 +88,12 @@
 
 ;;TTT 7/2/97
 ; Regarding the 'ancestors field for a category: At database build
-; time there exists a *ancestors-hash* hash table that gets filled
+; time there exists a $AncestorsTable hash table that gets filled
 ; with CATEGORY (not domain) ancestor information. This later provides
-; the information that goes into interp.daase This *ancestors-hash*
+; the information that goes into interp.daase This $AncestorsTable
 ; does not exist at normal runtime (it can be made by a call to
 ; genCategoryTable). Note that the ancestor information in
-; *ancestors-hash* (and hence interp.daase) involves #1, #2, etc
+; $AncestorsTable (and hence interp.daase) involves #1, #2, etc
 ; instead of R, Coef, etc. The latter thingies appear in all
 ; .NRLIB/index.KAF files. So we need to be careful when we )lib
 ; categories and update the ancestor info.
@@ -1016,7 +1016,7 @@
                  (when (= (length d) (length (|dbConstructorForm| dbstruct)))
                        (format t "   ~a has a default domain of ~a~%" con (car d))
                        (setf (|dbDefaultDomain| dbstruct) (car d)))))))
-                                        ; note: genCategoryTable creates *ancestors-hash*. write-interpdb
+                                        ; note: genCategoryTable creates $AncestorsTable. write-interpdb
                                         ; does gethash calls into it rather than doing a getdatabase call.
   (write-interpdb)
 #+:AKCL  (write-warmdata)
@@ -1037,7 +1037,7 @@
 
 (defun write-interpdb ()
  "build interp.daase from hash tables"
- (declare (special *ancestors-hash*))
+ (declare (special |$AncestorsTable|))
  (let (opalistpos modemapspos cmodemappos master masterpos obj *print-pretty*
         concategory categorypos kind cosig abbrev defaultdomain
         ancestors ancestorspos superpos out)
@@ -1076,7 +1076,7 @@
     (setq cosig (|dbDualSignature| struct))
     (setq kind (|dbConstructorKind| struct))
     (setq defaultdomain (|dbDefaultDomain| struct))
-    (setq ancestors (gethash constructor *ancestors-hash*)) ;cattable.boot
+    (setq ancestors (gethash constructor |$AncestorsTable|)) ;cattable.boot
     (if ancestors
 	(progn
 	  (setq ancestorspos (file-position out))
diff --git a/src/interp/sys-globals.boot b/src/interp/sys-globals.boot
index 0accfa64..4e815fdd 100644
--- a/src/interp/sys-globals.boot
+++ b/src/interp/sys-globals.boot
@@ -305,7 +305,7 @@ $Echo := false
 ++ answers x has y category questions
 $HasCategoryTable := nil
 
-_*ANCESTORS_-HASH_* := nil
+$AncestorsTable := nil
 
 ++
 _*BUILD_-VERSION_* := nil