From 0062eb960026efdf72e3ecb301aa46054e0d5ca2 Mon Sep 17 00:00:00 2001
From: dos-reis <gdr@axiomatics.org>
Date: Mon, 7 Nov 2011 05:28:24 +0000
Subject: 	* interp/compiler.boot ($compileOnlyCertainItems): Remove. 
 * interp/define.boot ($NRTslot1Info): Likewise. 	(getInfovecCode): Add
 additional environment argument.  Adjust caller. 	Call NRTmakeSlot1Info
 here. 	(NRTgetLookupFunction): Lose second and third arguments.  They are 
 derivable from the DB argument.  Adjust caller. 	(compDefineFunctor1):
 Do not bind $NRTslot1Info. 	(compDefineCapsuleFunction): Adjust. 
 (compile): Likewise. 	* interp/i-syscmd.boot
 (compilerDoitWithScreenedLisplib): 	Remove. Adjust caller. 	*
 interp/nruncomp.boot (NRTmakeSlot1Info): Tak a DB argument. 	Adjust caller.
 	(mkSlot1sublis): Remove.

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

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

diff --git a/src/interp/nruncomp.boot b/src/interp/nruncomp.boot
index 2375b8d7..2ccdbd25 100644
--- a/src/interp/nruncomp.boot
+++ b/src/interp/nruncomp.boot
@@ -614,7 +614,7 @@ NRTsetVector4a(sig,form,cond) ==
     $uncondList := [form,:append(categoryPrincipals evalform,$uncondList)]
   $condList := [[cond,[form,:categoryPrincipals evalform]],:$condList]
 
-NRTmakeSlot1Info() ==
+NRTmakeSlot1Info db ==
 -- 4 cases:
 -- a:T == b add c  --- slot1 directory has #s for entries defined in c
 -- a:T == b        --- slot1 has all slot #s = nil (see compFunctorBody)
@@ -622,9 +622,8 @@ NRTmakeSlot1Info() ==
 -- a == b          --- $NRTderivedTargetIfTrue = true; set directory to nil
   pairlis :=
     $insideCategoryPackageIfTrue =>
-      [:argl,dollarName] := rest $form
-      [[dollarName,:'_$],:mkSlot1sublis argl]
-    mkSlot1sublis rest $form
+      [[first dbParameters db,:'_$],:dbFormalSubst db]
+    dbFormalSubst db
   exports :=
     transformOperationAlist applySubst(pairlis,categoryExports $domainShell)
   opList :=
@@ -632,10 +631,7 @@ NRTmakeSlot1Info() ==
     $insideCategoryPackageIfTrue => slot1Filter exports
     exports
   addList := applySubst(pairlis,$NRTaddForm)
-  [$form.op,[addList,:opList]]
-
-mkSlot1sublis argl ==
-  pairList(argl,$FormalMapVariableList)
+  [dbConstructor db,[addList,:opList]]
 
 slot1Filter opList ==
 --include only those ops which are defined within the capsule
-- 
cgit v1.2.3