diff options
| author | dos-reis <gdr@axiomatics.org> | 2011-10-30 21:14:11 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2011-10-30 21:14:11 +0000 |
| commit | 8bb918e72e98092b6e927828d2ca66198608de4f (patch) | |
| tree | 492fa74760d305c4dfaab44c334794af4cee715f /src/interp/define.boot | |
| parent | 91e29dea40e9ca5a2d7d566bdc91c9542492ac14 (diff) | |
| download | open-axiom-8bb918e72e98092b6e927828d2ca66198608de4f.tar.gz | |
* interp/define.boot (compDefineCategory2): Compute dual signature
early on.
(compDefineFunctor1): Likewise.
* interp/database.boot (modemapsFromCategory): Take a first
argument as a DB. Tidy. Adjust caller.
(modemapsFromFunctor): Likewise. Lose last argument.
(mkDatabasePred): Remove.
(formal2Pattern): Likewise.
Diffstat (limited to 'src/interp/define.boot')
| -rw-r--r-- | src/interp/define.boot | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/interp/define.boot b/src/interp/define.boot index 8c8a5562..ce4b8bbc 100644 --- a/src/interp/define.boot +++ b/src/interp/define.boot @@ -1380,8 +1380,11 @@ compDefineFunctor1(df is ['DEF,form,signature,body], signature':= [signature.target,:[getArgumentModeOrMoan(a,form,$e) for a in argl]] $functorForm := $form := [$op,:argl] - if null signature'.target then signature':= - modemap2Signature getModemap($form,$e) + if signature'.target = nil then + signature' := modemap2Signature getModemap($form,$e) + dbDualSignature(db) := + [false,:[isCategoryForm(t,$e) for t in signature'.source]] + $functorTarget := target := signature'.target $e := giveFormalParametersValues(argl,$e) [ds,.,$e] := compMakeCategoryObject(target,$e) or return @@ -1414,8 +1417,6 @@ compDefineFunctor1(df is ['DEF,form,signature,body], modemap := [[parForm,:parSignature],[buildConstructorCondition db,$op]] dbConstructorModemap(db) := modemap dbCategory(db) := modemap.mmTarget - dbDualSignature(db) := - [false,:[isCategoryForm(t,$e) for t in modemap.mmSource]] -- (3.1) now make a list of the functor's local parameters; for -- domain D in argl,check its signature: if domain, its type is Join(A1,..,An); @@ -1448,7 +1449,7 @@ compDefineFunctor1(df is ['DEF,form,signature,body], fun := compile dbSubstituteFormals(db,[op',[lamOrSlam,argl,body']]) --The above statement stops substitutions gettting in one another's way operationAlist := dbSubstituteFormals(db,$lisplibOperationAlist) - dbModemaps(db) := modemapsFromFunctor(parForm,operationAlist,parSignature) + dbModemaps(db) := modemapsFromFunctor(db,parForm,operationAlist) reportOnFunctorCompilation() -- 5. |