aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog6
-rw-r--r--src/interp/c-util.boot3
-rw-r--r--src/interp/cattable.boot5
3 files changed, 9 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 27706129..f97fcc9f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,11 @@
2008-12-27 Gabriel Dos Reis <gdr@cs.tamu.edu>
+ * interp/c-util.boot (isSubset): Don't check for Object.
+ * interp/cattable.boot (hasCat): Likewise.
+ (simpTempCategoryTable): Don't substitute for Object.
+
+2008-12-27 Gabriel Dos Reis <gdr@cs.tamu.edu>
+
* algebra/catdef.spad.pamphlet (OrderedFinite): Export `min' and
`max' values.
* algebra/si.spad.pamphlet (SingleInteger): Now satisfies
diff --git a/src/interp/c-util.boot b/src/interp/c-util.boot
index bec24a42..29debb01 100644
--- a/src/interp/c-util.boot
+++ b/src/interp/c-util.boot
@@ -500,8 +500,7 @@ isSomeDomainVariable s ==
isSubset(x,y,e) ==
($useRepresentationHack and x="$" and y="Rep") or x=y or
LASSOC(opOf x,get(opOf y,"Subsets",e) or GETL(opOf y,"Subsets")) or
- LASSOC(opOf x,get(opOf y,"SubDomain",e)) or
- opOf(y)='Type or opOf(y)='Object
+ LASSOC(opOf x,get(opOf y,"SubDomain",e)) or opOf(y)="Type"
isDomainInScope(domain,e) ==
domainList:= getDomainsInScope e
diff --git a/src/interp/cattable.boot b/src/interp/cattable.boot
index 671b4f8d..1a3312c6 100644
--- a/src/interp/cattable.boot
+++ b/src/interp/cattable.boot
@@ -37,8 +37,8 @@ import g_-util
namespace BOOT
hasCat(domainOrCatName,catName) ==
- catName='Object or catName='Type -- every domain is a Type (Object)
- or constructorHasCategoryFromDB [domainOrCatName,:catName]
+ catName="Type" -- every domain is a Type
+ or constructorHasCategoryFromDB [domainOrCatName,:catName]
showCategoryTable con ==
[[b,:val] for (key :=[a,:b]) in HKEYS _*HASCATEGORY_-HASH_*
@@ -77,7 +77,6 @@ genCategoryTable() ==
simpTempCategoryTable() ==
for id in HKEYS _*ANCESTORS_-HASH_* repeat
for (u:=[a,:b]) in getConstructorAncestorsFromDB id repeat
- RPLACA(u,substitute('Type,'Object,a))
RPLACD(u,simpHasPred b)
simpCategoryTable() == main where