diff options
| -rw-r--r-- | src/ChangeLog | 7 | ||||
| -rw-r--r-- | src/interp/define.boot | 19 | ||||
| -rw-r--r-- | src/interp/functor.boot | 4 | ||||
| -rw-r--r-- | src/interp/wi2.boot | 6 |
4 files changed, 11 insertions, 25 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index f97fcc9f..117ce374 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,12 @@ 2008-12-27 Gabriel Dos Reis <gdr@cs.tamu.edu> + * interp/define.boot (compDefineFunctor1): Remove dead code. + (compile): Likewise. + * interp/functor.boot (isPackageFunction): Remove. + * interp/wi2.boot (compDefineFunctor1): Remove dead code. + +2008-12-27 Gabriel Dos Reis <gdr@cs.tamu.edu> + * interp/c-util.boot (isSubset): Don't check for Object. * interp/cattable.boot (hasCat): Likewise. (simpTempCategoryTable): Don't substitute for Object. diff --git a/src/interp/define.boot b/src/interp/define.boot index 75e33ecc..4492e042 100644 --- a/src/interp/define.boot +++ b/src/interp/define.boot @@ -566,7 +566,7 @@ compMakeCategoryObject(c,$e) == nil compDefineFunctor(df,m,e,prefix,fal) == - $domainShell: local -- holds the category of the object being compiled + $domainShell: local := nil -- holds the category of the object being compiled $profileCompiler: local := true $profileAlist: local := nil $mutableDomain: fluid := false @@ -660,17 +660,9 @@ compDefineFunctor1(df is ['DEF,form,signature,$functorSpecialCases,body], -- domain D in argl,check its signature: if domain, its type is Join(A1,..,An); -- in this case, D is replaced by D1,..,Dn (gensyms) which are set -- to the A1,..,An view of D - if isPackageFunction() then $functorLocalParameters:= - [nil,: - [nil - for i in 6..MAXINDEX $domainShell | - $domainShell.i is [.,.,['ELT,'_$,.]]]] - --leave space for vector ops and package name to be stored - $functorLocalParameters:= - argPars := - makeFunctorArgumentParameters(argl,rest signature',first signature') - -- must do above to bring categories into scope --see line 5 of genDomainView - argl + makeFunctorArgumentParameters(argl,rest signature',first signature') + $functorLocalParameters := argl + -- 4. compile body in environment of %type declarations for arguments op':= $op rettype:= signature'.target @@ -1266,9 +1258,6 @@ compile u == isLocalFunction op => if opexport then userError ['%b,op,'%d,'" is local and exported"] INTERN STRCONC(encodeItem $prefix,'";",encodeItem op) - isPackageFunction() and KAR $functorForm^="CategoryDefaults" => - if null opmodes then userError ['"no modemap for ",op] - encodeFunctionName(op,$functorForm,$signatureOfForm,";",$suffix) encodeFunctionName(op,$functorForm,$signatureOfForm,";",$suffix) where isLocalFunction op == diff --git a/src/interp/functor.boot b/src/interp/functor.boot index da85828f..5d2409f5 100644 --- a/src/interp/functor.boot +++ b/src/interp/functor.boot @@ -986,10 +986,6 @@ resolvePatternVars(p,args) == --% Code Processing Packages -isPackageFunction() == - -- called by compile/putInLocalDomainReferences - nil - isCategoryPackageName nam == p := PNAME opOf nam p.(MAXINDEX p) = char '_& diff --git a/src/interp/wi2.boot b/src/interp/wi2.boot index 8b3967f5..613a2ebf 100644 --- a/src/interp/wi2.boot +++ b/src/interp/wi2.boot @@ -155,12 +155,6 @@ compDefineFunctor1(df, m,$e,$prefix,$formalArgList) == -- domain D in argl,check its signature: if domain, its type is Join(A1,..,An); -- in this case, D is replaced by D1,..,Dn (gensyms) which are set -- to the A1,..,An view of D - if isPackageFunction() then $functorLocalParameters:= - [nil,: - [nil - for i in 6..MAXINDEX $domainShell | - $domainShell.i is [.,.,['ELT,'_$,.]]]] - --leave space for vector ops and package name to be stored --+ $functorLocalParameters:= argPars := |