diff options
| author | dos-reis <gdr@axiomatics.org> | 2011-08-06 21:17:36 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2011-08-06 21:17:36 +0000 |
| commit | 89674096006b286c3c20e0969c493e7f42b56365 (patch) | |
| tree | fe8fe5485d0fed3e41943833f387f1dccd57148a /src/interp/category.boot | |
| parent | 2a44af7ae10c039f26cea6767df41d73a3d795a0 (diff) | |
| download | open-axiom-89674096006b286c3c20e0969c493e7f42b56365.tar.gz | |
cleanup
Diffstat (limited to 'src/interp/category.boot')
| -rw-r--r-- | src/interp/category.boot | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/interp/category.boot b/src/interp/category.boot index ab079f88..1a9073e2 100644 --- a/src/interp/category.boot +++ b/src/interp/category.boot @@ -55,7 +55,7 @@ categoryObject? a == ++ envronement `e'. isCategoryForm: (%Form,%Env) -> %Boolean isCategoryForm(x,e) == - atom x => + x isnt [.,:.] => u := macroExpand(x,e) cons? u and categoryForm? u categoryForm? x @@ -95,7 +95,7 @@ mkCategory(domainOrPackage,sigList,attList,domList,PrincipalAncestor) == Prepare2 v == v is '$ => nil string? v => nil - atom v => [v] + v isnt [.,:.] => [v] v.op is 'Union => "union"/[Prepare2 x for x in stripUnionTags v.args] v.op is 'Mapping => "union"/[Prepare2 x for x in v.args] @@ -376,7 +376,7 @@ JoinInner(l,$e) == for u in l repeat for at in u.2 repeat at2:= first at - if atom at2 then at2:=[at2] + if at2 isnt [.,:.] then at2 := [at2] -- the variable $Attributes is built globally, so that true -- attributes can be detected without calling isCategoryForm symbolMember?(first at2,$Attributes) => nil |