diff options
| author | dos-reis <gdr@axiomatics.org> | 2009-10-31 23:35:17 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2009-10-31 23:35:17 +0000 |
| commit | 43e4aa26464a27fdd5d80272f72839653a0f6cf9 (patch) | |
| tree | eaf2ecc325c8a72b3c3a9c0ed8d936d1f11a9d5f /src/interp/define.boot | |
| parent | 402e10d38c81689647ae1004c80acb9841798e9b (diff) | |
| download | open-axiom-43e4aa26464a27fdd5d80272f72839653a0f6cf9.tar.gz | |
* interp/br-op2.boot (pairlis): Remove.
(modemap2Sig): Use pairList.
* interp/compiler.boot (applyMapping): Likewise.
* interp/database.boot (augLisplibModemapsFromCategory): Likewise.
(getOplistForConstructorForm): Likewise.
* interp/define.boot (compDefineCategory2): Likewise.
(compDefineFunctor1): Likewise.
(mkOpVec): Likewise.
* interp/lisplib.boot (finalizeLisplib): Likewise.
* interp/nruncomp.boot (mkSlot1sublis): Likewise.
* interp/wi1.boot (compDefineCategory2): Likewise.
* interp/wi2.boot (compDefineFunctor1): Likewise.
Diffstat (limited to 'src/interp/define.boot')
| -rw-r--r-- | src/interp/define.boot | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/interp/define.boot b/src/interp/define.boot index b21cdb7e..ce5bf8d7 100644 --- a/src/interp/define.boot +++ b/src/interp/define.boot @@ -479,7 +479,7 @@ compDefineCategory2(form,signature,specialCases,body,m,e, sargl:= TAKE(# argl, $TriangleVariableList) $functorForm:= $form:= [$op,:sargl] $formalArgList:= [:sargl,:$formalArgList] - aList:= [[a,:sa] for a in argl for sa in sargl] + aList := pairList(argl,sargl) formalBody:= SUBLIS(aList,body) signature' := SUBLIS(aList,signature') --Begin lines for category default definitions @@ -511,7 +511,7 @@ compDefineCategory2(form,signature,specialCases,body,m,e, fun:= compile [op',["LAM",sargl,body]] -- 5. give operator a 'modemap property - pairlis:= [[a,:v] for a in argl for v in $FormalMapVariableList] + pairlis := pairList(argl,$FormalMapVariableList) parSignature:= SUBLIS(pairlis,signature') parForm:= SUBLIS(pairlis,form) -- If we are only interested in the defaults, there is no point @@ -609,7 +609,7 @@ compDefineFunctor1(df is ['DEF,form,signature,nils,body], originale:= $e [$op,:argl]:= form $formalArgList:= [:argl,:$formalArgList] - $pairlis := [[a,:v] for a in argl for v in $FormalMapVariableList] + $pairlis := pairList(argl,$FormalMapVariableList) $mutableDomain: local := -- all defaulting packages should have caching turned off isCategoryPackageName $op or MEMQ($op,$mutableDomains) @@ -858,8 +858,7 @@ genDomainViewList(id,catlist) == mkOpVec(dom,siglist) == dom:= getPrincipalView dom - substargs:= [['$,:dom.0],: - [[a,:x] for a in $FormalMapVariableList for x in rest dom.0]] + substargs:= [['$,:dom.0],:pairList($FormalMapVariableList,rest dom.0)] oplist:= getOperationAlistFromLisplib opOf dom.0 --new form is (<op> <signature> <slotNumber> <condition> <kind>) ops:= MAKE_-VEC (#siglist) |