diff options
| author | dos-reis <gdr@axiomatics.org> | 2012-02-13 06:26:42 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2012-02-13 06:26:42 +0000 |
| commit | 722618d8f5ca5ba86289bb0e1a6e3b427ab0262f (patch) | |
| tree | 3b461a3df423d5f3f82d7d10d14b8d558bd8365e /src/interp/i-coerce.boot | |
| parent | e8e935c694c961342c781a6dcfbe636b85547449 (diff) | |
| download | open-axiom-722618d8f5ca5ba86289bb0e1a6e3b427ab0262f.tar.gz | |
* interp/g-util.boot (stripTags): Rename from stripUnionTags.
Adjust callers.
* interp/database.boot (genericInstanceForm): New.
* interp/buildom.boot (parentsOfBuiltinInstance): New.
(builtinInstanceForm): Likewise.
* interp/br-data.boot (genericParentsOf): New.
(parentsOfForm): Use it,
(ancestorsRecur): Likewise.
* interp/br-con.boot (originInOrder): Use parentsOfForm.
Diffstat (limited to 'src/interp/i-coerce.boot')
| -rw-r--r-- | src/interp/i-coerce.boot | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/interp/i-coerce.boot b/src/interp/i-coerce.boot index c668f46a..dc951db6 100644 --- a/src/interp/i-coerce.boot +++ b/src/interp/i-coerce.boot @@ -971,7 +971,7 @@ thisUnionBranch?(pred,val) == coerceUnion2Branch(object) == [.,:doms] := objMode object predList:= mkPredList doms - doms := stripUnionTags doms + doms := stripTags doms val' := objValUnwrap object predicate := nil targetType:= nil @@ -987,7 +987,7 @@ coerceBranch2Union(object,union) == -- assumes type is a member of doms doms := rest union predList:= mkPredList doms - doms := stripUnionTags doms + doms := stripTags doms p := position(objMode object,doms) p = -1 => keyedSystemError("S2IC0014",[objMode object,union]) val := objVal object @@ -998,7 +998,7 @@ coerceBranch2Union(object,union) == coerceInt2Union(object,union) == -- coerces to a Union type, adding numeric tags -- first cut - unionDoms := stripUnionTags rest union + unionDoms := stripTags rest union t1 := objMode object member(t1,unionDoms) => coerceBranch2Union(object,union) val := objVal object |