diff options
| author | dos-reis <gdr@axiomatics.org> | 2011-08-06 01:42:04 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2011-08-06 01:42:04 +0000 |
| commit | af2310049a0f3c28da1b53ef0b667da77d9d7b9d (patch) | |
| tree | cf13efbbff861bbabd9663dcb9c31b8f7f5dfbcd | |
| parent | ec54e41af6a45f9e5399dc30672f67ba8ef19cde (diff) | |
| download | open-axiom-af2310049a0f3c28da1b53ef0b667da77d9d7b9d.tar.gz | |
* interp/define.boot (extendsCategoryBasic0): Fold into
extendsCategoryBasic. Remove.
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/interp/define.boot | 11 |
2 files changed, 9 insertions, 7 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 2cf0c419..d1f3b679 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,10 @@ 2011-08-05 Gabriel Dos Reis <gdr@cs.tamu.edu> + * interp/define.boot (extendsCategoryBasic0): Fold into + extendsCategoryBasic. Remove. + +2011-08-05 Gabriel Dos Reis <gdr@cs.tamu.edu> + * boot/tokens.boot: Remove unused and antiquated tokens. * interp/i-output.boot: Escape caret. 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 |