Add DB parameters to finalization functions.

3 files changed, 15 insertions, 15 deletions

diff --git a/src/interp/define.boot b/src/interp/define.boot
index 62114a90..dd496c09 100644
--- a/src/interp/define.boot
+++ b/src/interp/define.boot
@@ -1517,7 +1517,7 @@ compDefineFunctor1(df is ['DEF,form,signature,body],m,$e,$formalArgList) ==
     --  domain D in form.args,check its signature: if domain, its type is Join(A1,..,An);
     --  in this case, D is replaced by D1,..,Dn (gensyms) which are set
     --  to the A1,..,An view of D
-    makeFunctorArgumentParameters(form.args,signature'.source,signature'.target)
+    makeFunctorArgumentParameters(db,form.args,signature'.source,signature'.target)
     $functorLocalParameters := form.args
 
     --  4. compile body in environment of %type declarations for arguments
@@ -1610,7 +1610,7 @@ reportOnFunctorCompilation() ==
  
 --% domain view code
  
-makeFunctorArgumentParameters(argl,sigl,target) ==
+makeFunctorArgumentParameters(db,argl,sigl,target) ==
   $forceAdd: local:= true
   $ConditionalOperators: local := nil
   ("append"/[fn(a,augmentSig(s,findExtras(a,target)))
diff --git a/src/interp/functor.boot b/src/interp/functor.boot
index 06eac21d..2955caa6 100644
--- a/src/interp/functor.boot
+++ b/src/interp/functor.boot
@@ -349,8 +349,8 @@ mkTypeForm x ==
     MKQ x
   ['%list,MKQ x.op,:[mkTypeForm a for a in x.args]]
  
-DescendCodeAdd(base,flag) ==
-  base isnt [.,:.] => DescendCodeVarAdd(base,flag)
+DescendCodeAdd(db,base,flag) ==
+  base isnt [.,:.] => DescendCodeVarAdd(db,base,flag)
   modemap := get(base.op,'modemap,$CategoryFrame)
   modemap = nil  =>
       if getmode(base.op,$e) is ["Mapping",target,:formalArgModes]
@@ -358,13 +358,13 @@ DescendCodeAdd(base,flag) ==
                 --argument substitution if parameterized?
  
          else keyedSystemError("S2OR0001",[base.op])
-      DescendCodeAdd1(base,flag,target,formalArgs,formalArgModes)
+      DescendCodeAdd1(db,base,flag,target,formalArgs,formalArgModes)
   for [[[.,:formalArgs],target,:formalArgModes],.] in modemap repeat
-    (ans:= DescendCodeAdd1(base,flag,target,formalArgs,formalArgModes))=>
+    (ans:= DescendCodeAdd1(db,base,flag,target,formalArgs,formalArgModes)) =>
       return ans
   ans
  
-DescendCodeAdd1(base,flag,target,formalArgs,formalArgModes) ==
+DescendCodeAdd1(db,base,flag,target,formalArgs,formalArgModes) ==
   slist := pairList(formalArgs,rest $addFormLhs)
          --base = comp $addFormLhs-- bound in compAdd
   e:= $e
@@ -431,7 +431,7 @@ DescendCode(db,code,flag,viewAssoc,e) ==
     codelist:=
       [v for u in codelist | v := DescendCode(db,u,flag,viewAssoc,e)]
                   -- must do this first, to get this overriding Add code
-    ['PROGN,:DescendCodeAdd(base,flag),:codelist]
+    ['PROGN,:DescendCodeAdd(db,base,flag),:codelist]
   code is ['PROGN,:codelist] =>
     ['PROGN,:
             --Two REVERSEs leave original order, but ensure last guy wins
@@ -546,7 +546,7 @@ SetFunctionSlots(sig,body,flag,mode) == --mode is either "original" or "adding"
  
 --%  Under what conditions may views exist?
  
-InvestigateConditions(catvecListMaker,env) ==
+InvestigateConditions(db,catvecListMaker,env) ==
   -- given a principal view and a list of secondary views,
   -- discover under what conditions the secondary view are
   -- always present.
@@ -734,7 +734,7 @@ getViewsConditions u ==
       --the two lines marked  ensure that the principal view comes first
       --if you don't want it, rest it off
  
-DescendCodeVarAdd(base,flag) ==
+DescendCodeVarAdd(db,base,flag) ==
    [SetFunctionSlots(sig,implem,flag,'adding) repeat
        for i in 6..maxIndex $domainShell |
          categoryRef($domainShell,i) is [sig:=[op,types],:.] and
diff --git a/src/interp/nruncomp.boot b/src/interp/nruncomp.boot
index b22f65dc..c6c17ce0 100644
--- a/src/interp/nruncomp.boot
+++ b/src/interp/nruncomp.boot
@@ -467,7 +467,7 @@ buildFunctor(db,sig,code,$locals,$e) ==
   catvecListMaker := removeDuplicates
     [comp($catsig,$EmptyMode,$e).expr,
       :[compCategories(u,$e) for [u,:.] in categoryAncestors $domainShell]]
-  condCats := InvestigateConditions([$catsig,:rest catvecListMaker],$e)
+  condCats := InvestigateConditions(db,[$catsig,:rest catvecListMaker],$e)
   -- a list, one %for each element of catvecListMaker
   -- indicating under what conditions this
   -- category should be present.  true => always
@@ -480,7 +480,7 @@ buildFunctor(db,sig,code,$locals,$e) ==
   -- Do this now to create predicate vector; then DescendCode can refer
   -- to predicate vector if it can
   [$uncondAlist,:$condAlist] :=    --bound in compDefineFunctor1
-      NRTsetVector4Part1(viewNames,catvecListMaker,condCats)
+      NRTsetVector4Part1(db,viewNames,catvecListMaker,condCats)
   [$NRTslot1PredicateList,predBitVectorCode1,:predBitVectorCode2] :=
     makePredicateBitVector(db,[:ASSOCRIGHT $condAlist,:$NRTslot1PredicateList],$e)
 
@@ -527,13 +527,13 @@ buildFunctor(db,sig,code,$locals,$e) ==
   SAY ['"time taken in buildFunctor: ",TEMPUS_-FUGIT()-oldtime]
   ans
 
-NRTsetVector4Part1(siglist,formlist,condlist) ==
+NRTsetVector4Part1(db,siglist,formlist,condlist) ==
   $uncondList: local := nil
   $condList: local := nil
   $count: local := 0
   for sig in reverse siglist for form in reverse formlist
          for cond in reverse condlist repeat
-                  NRTsetVector4a(sig,form,cond)
+                  NRTsetVector4a(db,sig,form,cond)
   reducedUncondlist := removeDuplicates $uncondList
   reducedConlist :=
     [[x,:y] for [x,z] in $condList| y := SETDIFFERENCE(z,reducedUncondlist)]
@@ -551,7 +551,7 @@ reverseCondlist cl ==
       u.rest := [x,:rest u]
   alist
 
-NRTsetVector4a(sig,form,cond) ==
+NRTsetVector4a(db,sig,form,cond) ==
   sig is '$ =>
      domainList :=
        [optimize comp(d,$EmptyMode,$e).expr or d