diff options
| author | Gabriel Dos Reis <gdr@axiomatics.org> | 2015-12-24 18:05:41 -0800 |
|---|---|---|
| committer | Gabriel Dos Reis <gdr@axiomatics.org> | 2015-12-24 18:05:41 -0800 |
| commit | 4dcf3f97d30a2b892716923ed4e916805ec87436 (patch) | |
| tree | 5b41b966349e3c4f9afacef3a2ad60a38d28a8c1 /src/interp/i-coerce.boot | |
| parent | bb81c833c0ff2ff8df936a0cd0182cf255729a41 (diff) | |
| download | open-axiom-4dcf3f97d30a2b892716923ed4e916805ec87436.tar.gz | |
Replace FUNCALL with apply.
Diffstat (limited to 'src/interp/i-coerce.boot')
| -rw-r--r-- | src/interp/i-coerce.boot | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/interp/i-coerce.boot b/src/interp/i-coerce.boot index 108b5eb8..e6a47b7a 100644 --- a/src/interp/i-coerce.boot +++ b/src/interp/i-coerce.boot @@ -271,7 +271,7 @@ coerceRetract(object,t2) == makeSymbol strconc('"retract",STRINGIMAGE D) functionp fun => property(D,'retract) := fun - c := CATCH('coerceFailure,FUNCALL(fun,object,t2)) + c := CATCH('coerceFailure,apply(fun,[object,t2])) (c = $coerceFailure) => nil c nil @@ -608,7 +608,7 @@ canCoerceLocal(t1,t2) == tag='partial => nil tag='total => true (functionp(fun) and - (v:=CATCH('coerceFailure,FUNCALL(fun,'_$fromCoerceable_$,t1,t2))) + (v:=CATCH('coerceFailure,apply(fun,['_$fromCoerceable_$,t1,t2]))) and v ~= $coerceFailure) or canCoerceByFunction(t1,t2) canCoerceByFunction(t1,t2) @@ -921,7 +921,7 @@ coerceSubDomain(val, tSuper, tSub) == val = '_$fromCoerceable_$ => nil pred := isSubDomain(tSub,tSuper) => predFun := getSubDomainPredicate(tSuper,tSub,pred) - FUNCALL(predFun,val) => objNew(val,tSub) + apply(predFun,[val]) => objNew(val,tSub) nil getSubDomainPredicate(tSuper, tSub, pred) == @@ -1171,7 +1171,7 @@ coerceIntCommute(obj,target) == functionp fun => property(D,'coerceCommute) := fun u := objValUnwrap obj - c := CATCH('coerceFailure,FUNCALL(fun,u,source,S,target,T)) + c := CATCH('coerceFailure,apply(fun,[u,source,S,target,T])) (c = $coerceFailure) => nil u = "$fromCoerceable$" => c objNewWrap(c,target) @@ -1285,7 +1285,7 @@ coerceByTable(fn,x,t1,t2,isTotalCoerce) == t2 = $OutputForm and not (newType? t1) => nil isWrapped x => x:= unwrap x - c:= CATCH('coerceFailure,FUNCALL(fn,x,t1,t2)) + c:= CATCH('coerceFailure,apply(fn,[x,t1,t2])) c=$coerceFailure => nil objNewWrap(c,t2) isTotalCoerce => objNew([fn,x,MKQ t1,MKQ t2],t2) @@ -1293,7 +1293,7 @@ coerceByTable(fn,x,t1,t2,isTotalCoerce) == catchCoerceFailure(fn,x,t1,t2) == -- compiles a catchpoint for compiling boot coercions - c:= CATCH('coerceFailure,FUNCALL(fn,x,t1,t2)) + c:= CATCH('coerceFailure,apply(fn,[x,t1,t2])) c = $coerceFailure => throwKeyedMsgCannotCoerceWithValue(wrap unwrap x,t1,t2) c |