diff options
| author | dos-reis <gdr@axiomatics.org> | 2007-10-16 16:03:14 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2007-10-16 16:03:14 +0000 |
| commit | 004d25ab39f6f6867eb767bc7ba9b3fcce4e47a8 (patch) | |
| tree | 8d0dbf9d56040f709a86a5d8de888a90b4081e1b /src/interp/clammed.boot.pamphlet | |
| parent | cead691f140a05967d095a596c0b1a41674669f8 (diff) | |
| download | open-axiom-004d25ab39f6f6867eb767bc7ba9b3fcce4e47a8.tar.gz | |
* Makefile.pamphlet (INOBJS): Lose xrun.$(FASLEXT).
* clammed.boot.pamphlet (coerceConvertMmSelection): Merge
modification in late xrun.boot.
* i-coerce.boot.pamphlet (equalOne): Likewise.
(equalZero): Likewise.
(algEqual): Likewise.
(coerceByFunction): Likewise.
* i-eval.boot.pamphlet (evalFrom): Likewise.
(findFunctionInDomain): Likewise.
(findFunctionInDomain1): Likewise.
(findFunctionInCategory): Likewise.
* nrunfast.boot.pamphlet (replaceGoGetSlot): Likewise.
(lazyMatchArg2): Likewise.
(newExpandTypeSlot): Likewise.
(newExpandLocalTypeForm): Likewise.
(newExpandLocalTypeArgs): Likewise.
(sigDomainVal): Likewise.
* nrungo.boot.pamphlet (lazyCompareSigEqual): Likewise.
* nrunopt.boot.pamphlet (NRTmakeCategoryAlist): Likewise.
* sys-globals.boot ($noSubsumption): Likewise.
* template.boot (evalSlotDomain): Likewise.
* xrun.boot: Remove.
Diffstat (limited to 'src/interp/clammed.boot.pamphlet')
| -rw-r--r-- | src/interp/clammed.boot.pamphlet | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/interp/clammed.boot.pamphlet b/src/interp/clammed.boot.pamphlet index d0689739..af4ea229 100644 --- a/src/interp/clammed.boot.pamphlet +++ b/src/interp/clammed.boot.pamphlet @@ -65,15 +65,14 @@ canCoerce(t1, t2) == canCoerce1(t1, newMode) and canCoerce1(newMode, t2) nil ---------------------> NEW DEFINITION (see interop.boot.pamphlet) coerceConvertMmSelection(funName,m1,m2) == -- calls selectMms with $Coerce=NIL and tests for required -- target type. funName is either 'coerce or 'convert. $declaredMode : local:= NIL $reportBottomUpFlag : local:= NIL l := selectMms1(funName,m2,[m1],[m1],NIL) - mmS := [x for x in l | x is [sig,:.] and hasCorrectTarget(m2,sig) and - isEqualOrSubDomain(m1, first rest rest sig)] + mmS := [[sig,[targ,arg],:pred] for x in l | x is [sig,[.,arg],:pred] and + hasCorrectTarget(m2,sig) and sig is [dc,targ,oarg] and oarg = m1] mmS and CAR mmS hasFileProperty(p,id,abbrev) == hasFilePropertyNoCache(p,id,abbrev) |