From af2310049a0f3c28da1b53ef0b667da77d9d7b9d Mon Sep 17 00:00:00 2001
From: dos-reis <gdr@axiomatics.org>
Date: Sat, 6 Aug 2011 01:42:04 +0000
Subject: 	* interp/define.boot (extendsCategoryBasic0): Fold into 
 extendsCategoryBasic.  Remove.

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

(limited to 'src/interp')

diff --git a/src/interp/define.boot b/src/interp/define.boot
index 5f9c4c83..d452065c 100644
--- a/src/interp/define.boot
+++ b/src/interp/define.boot
@@ -312,13 +312,13 @@ extendsCategory(dom,u,v) ==
   v is ["CATEGORY",.,:l] => and/[extendsCategory(dom,u,x) for x in l]
   v is ["SubsetCategory",cat,d] => extendsCategory(dom,u,cat) and isSubset(dom,d,$e)
   v := substSlotNumbers(v,$template,$functorForm)
-  extendsCategoryBasic0(dom,u,v) => true
+  extendsCategoryBasic(dom,u,v) => true
   $why :=
     v is ['SIGNATURE,op,sig] => [u,['"  has no ",:formatOpSignature(op,sig)]]
     [u,'" has no",v]
   nil
  
-extendsCategoryBasic0(dom,u,v) ==
+extendsCategoryBasic(dom,u,v) ==
   v is ['IF,p,['ATTRIBUTE,c],.] =>
     uVec := (compMakeCategoryObject(u,$EmptyEnvironment)).expr
     cons? c and isCategoryForm(c,nil) =>
@@ -326,9 +326,6 @@ extendsCategoryBasic0(dom,u,v) ==
       LASSOC(c,second slot4) is [=p,:.]
     slot2 := vectorRef(uVec,2)
     LASSOC(c,slot2) is [=p,:.]
-  extendsCategoryBasic(dom,u,v)
- 
-extendsCategoryBasic(dom,u,v) ==
   u is ["Join",:l] => or/[extendsCategoryBasic(dom,x,v) for x in l]
   u = v => true
   uVec := (compMakeCategoryObject(u,$EmptyEnvironment)).expr
@@ -337,8 +334,8 @@ extendsCategoryBasic(dom,u,v) ==
     or/[vectorRef(uVec,i) is [[=op,=sig],:.] for i in 6..maxIndex uVec]
   u is ['CATEGORY,.,:l] =>
     v is ['IF,:.] => listMember?(v,l)
-    nil
-  nil
+    false
+  false
  
 catExtendsCat?(u,v,uvec) ==
   u = v => true
-- 
cgit v1.2.3