From 32efd3b0691918cf1d662b095c653d5a0a17ff7b Mon Sep 17 00:00:00 2001 From: dos-reis Date: Fri, 22 Apr 2011 15:51:57 +0000 Subject: more cleanup --- src/interp/fortcall.boot | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/interp/fortcall.boot') diff --git a/src/interp/fortcall.boot b/src/interp/fortcall.boot index a4ed15dd..5f7096d6 100644 --- a/src/interp/fortcall.boot +++ b/src/interp/fortcall.boot @@ -757,7 +757,7 @@ multiToUnivariate f == newVariable := gensym() for index in 0..#vars-1 repeat -- Remember that AXIOM lists, vectors etc are indexed from 1 - body := NSUBST(["elt",newVariable,index+1],vars.index,body) + body := substitute!(["elt",newVariable,index+1],vars.index,body) -- We want a Vector DoubleFloat -> DoubleFloat target := [["DoubleFloat"],["Vector",["DoubleFloat"]]] rest interpret ["ADEF",[newVariable],target,[[],[]],body] @@ -780,8 +780,8 @@ functionAndJacobian f == newVariable := gensym() for index in 0..#vars-1 repeat -- Remember that AXIOM lists, vectors etc are indexed from 1 - funBodies := NSUBST(["elt",newVariable,index+1],vars.index,funBodies) - jacBodies := NSUBST(["elt",newVariable,index+1],vars.index,jacBodies) + funBodies := substitute!(["elt",newVariable,index+1],vars.index,funBodies) + jacBodies := substitute!(["elt",newVariable,index+1],vars.index,jacBodies) target := [["Vector",["DoubleFloat"]],["Vector",["DoubleFloat"]],["Integer"]] rest interpret ["ADEF",[newVariable,"flag"],target,[[],[],[]],_ @@ -802,7 +802,7 @@ vectorOfFunctions f == newVariable := gensym() for index in 0..#vars-1 repeat -- Remember that AXIOM lists, vectors etc are indexed from 1 - funBodies := NSUBST(["elt",newVariable,index+1],vars.index,funBodies) + funBodies := substitute!(["elt",newVariable,index+1],vars.index,funBodies) target := [["Vector",["DoubleFloat"]],["Vector",["DoubleFloat"]]] rest interpret ["ADEF",[newVariable],target,[[],[]],["vector",["construct",:funBodies]]] -- cgit v1.2.3