diff options
| author | dos-reis <gdr@axiomatics.org> | 2008-05-09 14:50:06 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2008-05-09 14:50:06 +0000 |
| commit | 2e3759ab9fa0e0962408ddf39f88f892f0fed1de (patch) | |
| tree | 40ac6bb417681037e89b15c9797c41539342ccb6 /src/interp/i-resolv.boot | |
| parent | 9a48778ee366536ba772e3c23b1e95ef63af6c5a (diff) | |
| download | open-axiom-2e3759ab9fa0e0962408ddf39f88f892f0fed1de.tar.gz | |
* interp/c-util.boot: Remove Old Boot semantics.
* interp/database.boot: Likewise.
* interp/format.boot: Likewise.
* interp/g-timer.boot: Likewise.
* interp/i-analy.boot: Likewise.
* interp/i-coerce.boot: Likewise.
* interp/i-coerfn.boot: Likewise.
* interp/i-eval.boot: Likewise.
* interp/i-intern.boot: Likewise.
* interp/i-output.boot: Likewise.
* interp/i-resolv.boot: Likewise.
* interp/i-spec1.boot: Likewise.
* interp/i-syscmd.boot: Likewise.
* interp/msgdb.boot: Likewise.
* interp/newfort.boot: Likewise.
* boot/includer.boot (diagnosticLocation): New.
* boot/ast.boot (bfReName): Use it.
Diffstat (limited to 'src/interp/i-resolv.boot')
| -rw-r--r-- | src/interp/i-resolv.boot | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/interp/i-resolv.boot b/src/interp/i-resolv.boot index 56561df3..7b8acc7f 100644 --- a/src/interp/i-resolv.boot +++ b/src/interp/i-resolv.boot @@ -363,7 +363,7 @@ resolveTCat(t,c) == rest(t) and (tc := resolveTCat1(t,c)) => tc -- now check some specific niladic categories - c in '((Field) (EuclideanDomain)) and ofCategory(t,'(IntegralDomain))=> + member(c,'((Field) (EuclideanDomain))) and ofCategory(t,'(IntegralDomain))=> eqType [$QuotientField, t] c = '(Field) and t = $Symbol => ['RationalFunction,$Integer] @@ -427,12 +427,12 @@ getConditionalCategoryOfType1(cat,conditions,match,seen) == conditions conditions cat is [catName,:.] and (getConstructorKindFromDB catName = "category") => - cat in CDR seen => conditions + member(cat, CDR seen) => conditions RPLACD(seen,[cat,:CDR seen]) subCat := getConstructorCategoryFromDB catName -- substitute vars of cat into category for v in rest cat for vv in $TriangleVariableList repeat - subCat := SUBST(v,vv,subCat) + subCat := substitute(v,vv,subCat) getConditionalCategoryOfType1(subCat,conditions,match,seen) conditions |