diff options
| author | dos-reis <gdr@axiomatics.org> | 2012-08-20 06:35:08 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2012-08-20 06:35:08 +0000 |
| commit | 1c6564be2725c2e68180cdd4c9899765c8452c7a (patch) | |
| tree | c0f6f815949ec53a13ec428064e9f9fb4ce12527 /src/interp/i-coerce.boot | |
| parent | 061c9b5988f1e535a61447c5c899f2d0f0fc2009 (diff) | |
| download | open-axiom-1c6564be2725c2e68180cdd4c9899765c8452c7a.tar.gz | |
* interp/i-coerfn.boot: Do not import i-coerce. Import i-analy
and i-resolv intead.
($CoerceTable): Fix embarrassing thinko.
* interp/i-coerce.boot: Import i-coerfn.
(coerceIntTableOrFunction): Tidy.
* boot/utility.boot (objectAssoc): Tidy.
Diffstat (limited to 'src/interp/i-coerce.boot')
| -rw-r--r-- | src/interp/i-coerce.boot | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/interp/i-coerce.boot b/src/interp/i-coerce.boot index 919a6979..4cddcbc7 100644 --- a/src/interp/i-coerce.boot +++ b/src/interp/i-coerce.boot @@ -32,8 +32,7 @@ -- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -import i_-analy -import i_-resolv +import i_-coerfn namespace BOOT $useCoerceOrCroak := true @@ -1133,13 +1132,13 @@ coerceIntTableOrFunction(triple,t2) == null isValidType t2 => nil -- added 9-18-85 by RSS null isLegitimateMode(t2,nil,nil) => nil -- added 6-28-87 by RSS t1 := objMode triple - p := objectAssoc(first t1,$CoerceTable) - p and objectAssoc(first t2,rest p) is [.,:[tag,fun]] => + p := symbolAssoc(first t1,$CoerceTable) + p and symbolTarget(first t2,rest p) is [tag,fun] => val := objVal triple fun='Identity => objNew(val,t2) tag='total => - coerceByTable(fun,val,t1,t2,'T) or coerceByFunction(triple,t2) - coerceByTable(fun,val,t1,t2,nil) or coerceByFunction(triple,t2) + coerceByTable(fun,val,t1,t2,true) or coerceByFunction(triple,t2) + coerceByTable(fun,val,t1,t2,false) or coerceByFunction(triple,t2) coerceByFunction(triple,t2) coerceCommuteTest(t1,t2) == |