From abf2e9a984ff37dc292233d79bd64b7460427788 Mon Sep 17 00:00:00 2001
From: Gabriel Dos Reis <gdr@axiomatics.org>
Date: Thu, 7 Jan 2016 11:02:41 -0800
Subject: Remove 'parentsOf'; adjust users.

---
 src/ChangeLog           |  4 ++++
 src/interp/br-con.boot  |  2 +-
 src/interp/br-data.boot | 15 +++------------
 3 files changed, 8 insertions(+), 13 deletions(-)

(limited to 'src')

diff --git a/src/ChangeLog b/src/ChangeLog
index 9c1205bb..ff786850 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2016-01-07  Gabriel Dos Reis  <gdr@axiomatics.org>
+
+	* interp/br-data.boot (parentsOf): Remove.  Adjust users.
+
 2016-01-06  Gabriel Dos Reis  <gdr@axiomatics.org>
 
 	* interp/c-util.boot (dbForCategory?): New.  Use in lieu of
diff --git a/src/interp/br-con.boot b/src/interp/br-con.boot
index db83fbaf..99e9cb34 100644
--- a/src/interp/br-con.boot
+++ b/src/interp/br-con.boot
@@ -436,7 +436,7 @@ kcpPage(htPage,junk) ==
   conform := htpProperty(htPage,'conform)
   conname := opOf conform
   page := htInitPage(['"Parents of ",:heading],htCopyProplist htPage)
-  parents := parentsOf conname --was listSort(function GLESSEQP, =this)
+  parents := getConstructorParentsFromDB conname
   if domname then
     parents := applySubst(pairList(conform.args,domname.args),parents)
   htpSetProperty(htPage,'cAlist,parents)
diff --git a/src/interp/br-data.boot b/src/interp/br-data.boot
index 1d03c0ec..8d8e7635 100644
--- a/src/interp/br-data.boot
+++ b/src/interp/br-data.boot
@@ -492,20 +492,11 @@ getImports conname == --called by mkUsersHashTable
 --                 Get Hierarchical Information
 --============================================================================
 
-$parentsCache := nil
-
-parentsOf con == --called by kcpPage, ancestorsRecur
-  if null $parentsCache then 
-     $parentsCache := hashTable 'EQ
-  tableValue($parentsCache,con) or
-    parents := getParentsFor loadDBIfNecessary constructorDB con
-    tableValue($parentsCache,con) := parents
-    parents
-
-++ Like `parentsOf', except that also handles builtin constructors.
+++ Like `getConstructorParentsFromDB', except that also handles
+++ builtin constructors.
 genericParentsOf form ==
   builtinConstructor? form.op => parentsOfBuiltinInstance form
-  parentsOf form.op
+  getConstructorParentsFromDB form.op
 
 parentsOfForm(form is [op,:argl]) ==
   parents := genericParentsOf form
-- 
cgit v1.2.3