From a41b74b5a5981d91c4e196cbcb5daa96e4123d36 Mon Sep 17 00:00:00 2001
From: Gabriel Dos Reis <gdr@axiomatics.org>
Date: Sun, 31 Jan 2016 18:58:34 -0800
Subject: Tidy noteCapsuleFunctionDefinition

---
 src/interp/define.boot | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/interp/define.boot b/src/interp/define.boot
index 53f588b9..dfdf79f0 100644
--- a/src/interp/define.boot
+++ b/src/interp/define.boot
@@ -682,18 +682,20 @@ emitSubdomainInfo(form,super,pred) ==
 
 ++ List of operations defined in a given capsule
 ++ Each item on this list is of the form
-++    (op sig pred)
+++    (((op . sig) . pred) . (slot . func))
 ++ where
 ++   op:   name of the operation
 ++   sig:  signature of the operation
 ++   pred: scope predicate of the operation.
+++   slot: the slot number of the implementation of this operation.
+++   func: implementation of the signature under specified predicate.
 ++
-++ record that the operation `op' with signature `sig' and predicate
-++ `pred' is defined in the current capsule of the current domain
-++ being compiled.
-noteCapsuleFunctionDefinition(db,op,sig,pred,impl) ==
-  spec := [[op,:sig],:pred]
+++ record that the specificattion of an operation `op' with signature `sig'
+++ and predicate `pred' is implemented in a `slot' occupied by the
+++ function `func' in the capsule of the domain being compiled.
+noteCapsuleFunctionDefinition(db,spec,impl) ==
   assoc(spec,dbCapsuleDefinitions db) =>
+    [[op,:sig],:pred] := spec
     stackAndThrow('"redefinition of %1b: %2 %3",
       [op,formatUnabbreviated ["Mapping",:sig],formatIf pred])
   dbCapsuleDefinitions(db) := [[spec,:impl],:dbCapsuleDefinitions db]
@@ -1982,7 +1984,7 @@ compDefineCapsuleFunction(db,df is ['DEF,form,signature,body],
         makeSymbol strconc(symbolName $prefix,'";",symbolName $op) 
       encodeFunctionName(db,$op,signature,$suffix)
     pred := mkpf($predl,'and)
-    noteCapsuleFunctionDefinition(db,$op,signature,pred,op')
+    noteCapsuleFunctionDefinition(db,[[$op,:signature],:pred],[n,:op'])
     if n ~= nil and not $insideCategoryPackageIfTrue then
       updateCapsuleDirectory([n,:op'],pred)
     -- Let the backend know about this function's type
-- 
cgit v1.2.3