diff options
| author | dos-reis <gdr@axiomatics.org> | 2011-08-16 06:35:55 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2011-08-16 06:35:55 +0000 |
| commit | 32bff5d4d40370d186e954ee90f31e7c2b20b50a (patch) | |
| tree | 5bc3e872c7d64990184d80bd7697836d37d1fc23 /src/interp/define.boot | |
| parent | db462564430f0d9eb4daa70a191d10e6bb5af528 (diff) | |
| download | open-axiom-32bff5d4d40370d186e954ee90f31e7c2b20b50a.tar.gz | |
* interp/modemap.boot (addModemap0): Don't special-case
CategoryDefaults.
* interp/define.boot (processFunctor): Fold into caller. Remove.
* interp/clam.boot (recordInstantiation1): Do not special case
CategoryDefaults and RepeatedSquaring.
* interp/functor.boot (DescendCode): Lose last argument, for it is
always $. Adjust body. Adjust caller.
* interp/nruncomp.boot (buildFunctor): $catNames should not be a
fluid variable. Rename to viewNames.
Diffstat (limited to 'src/interp/define.boot')
| -rw-r--r-- | src/interp/define.boot | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/src/interp/define.boot b/src/interp/define.boot index d78c5770..39c2abc1 100644 --- a/src/interp/define.boot +++ b/src/interp/define.boot @@ -1706,23 +1706,19 @@ compSubDomain1(domainForm,predicate,m,e) == compCapsuleInner(itemList,m,e) == e:= addInformation(m,e) --puts a new 'special' property of $Information - data:= ["PROGN",:itemList] + data := ["PROGN",:itemList] --RPLACd by compCapsuleItems and Friends - e:= compCapsuleItems(itemList,nil,e) + e := compCapsuleItems(itemList,nil,e) localParList:= $functorLocalParameters - if $addForm then data:= ['add,$addForm,data] - code:= + if $addForm ~= nil then + data := ['add,$addForm,data] + code := $insideCategoryIfTrue and not $insideCategoryPackageIfTrue => data - processFunctor($form,$signature,data,localParList,e) + buildFunctor($form,$signature,data,localParList,e) [MKPF([:$getDomainCode,code],"PROGN"),m,e] --% PROCESS FUNCTOR CODE -processFunctor(form,signature,data,localParList,e) == - form is ["CategoryDefaults"] => - error "CategoryDefaults is a reserved name" - buildFunctor(form,signature,data,localParList,e) - compCapsuleItems(itemlist,$predl,$e) == $signatureOfForm: local := nil $suffix: local:= 0 |