From 44936f3d978b3a47cc67a3a51fe43030b24e0a9e Mon Sep 17 00:00:00 2001
From: dos-reis <gdr@axiomatics.org>
Date: Thu, 18 Aug 2011 14:03:04 +0000
Subject: 	* interp/c-util.boot (categoryAssociatedTypes): Rename from 
 categoryHierarchy.  Adjust callers. 	(categoryPrincipals): New. 
 (categoryAncestors): Likewise. 	(categoryLocals): Likewise. 
 (categoryParameters): Likewise. 	(extendsCategoryForm): Use them. 
 * interp/category.boot: Likewise. 	* interp/cattable.boot: Likewise. 
 * interp/define.boot: Likewise. 	* interp/functor.boot: Likewise. 
 * interp/modemap.boot: Likewise. 	* interp/nruncomp.boot: Likewise. 
 * interp/database.boot (getCategoryAttributes): Remove. 
 (getPrincipalAncestors): Likewise. 	(getCategoryParents): Likewise. 
 * algebra/domain.spad.pamphlet (Category): Adjust.

---
 src/interp/nruncomp.boot | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'src/interp/nruncomp.boot')

diff --git a/src/interp/nruncomp.boot b/src/interp/nruncomp.boot
index 0752edc4..d8703729 100644
--- a/src/interp/nruncomp.boot
+++ b/src/interp/nruncomp.boot
@@ -503,7 +503,8 @@ buildFunctor($definition is [name,:args],sig,code,$locals,$e) ==
     --we will clobber elements; copy since $domainShell may be a cached vector
   $template := newShell($NRTbase + $NRTdeltaLength)
   $SetFunctions := newShell # domainShell
-  $catvecList := [domainShell,:[emptyVector for u in second domainShell.4]]
+  $catvecList :=
+    [domainShell,:[emptyVector for u in categoryAncestors domainShell]]
   -- list of names n1..nn for each view
   viewNames := ['$,:[genvar() for u in rest catvecListMaker]]
   domname := 'dv_$
@@ -607,13 +608,14 @@ NRTsetVector4a(sig,form,cond) ==
   sig is '$ =>
      domainList :=
        [simplifyVMForm COPY comp(d,$EmptyMode,$e).expr or d
-         for d in $domainShell.4.0]
+         for d in categoryPrincipals $domainShell]
      $uncondList := append(domainList,$uncondList)
      if isCategoryForm(form,$e) then $uncondList := [form,:$uncondList]
      $uncondList
   evalform := eval mkEvalableCategoryForm form
-  cond = true => $uncondList := [form,:append(evalform.4.0,$uncondList)]
-  $condList := [[cond,[form,:evalform.4.0]],:$condList]
+  cond = true =>
+    $uncondList := [form,:append(categoryPrincipals evalform,$uncondList)]
+  $condList := [[cond,[form,:categoryPrincipals evalform]],:$condList]
 
 NRTmakeSlot1Info() ==
 -- 4 cases:
-- 
cgit v1.2.3