Index: mttroot/mtt/bin/trans/def2write_r
==================================================================
--- mttroot/mtt/bin/trans/def2write_r
+++ mttroot/mtt/bin/trans/def2write_r
@@ -1,7 +1,7 @@
 #!/bin/sh
-
+set -x
      ###################################### 
      ##### Model Transformation Tools #####
      ######################################
 
 # Bourne shell script: def2write.r
@@ -11,10 +11,13 @@
 ###############################################################
 ## Version control history
 ###############################################################
 ## $Id$
 ## $Log$
+## Revision 1.11.2.3  2002/06/05 18:23:38  geraint
+## Cosmetic change.
+##
 ## Revision 1.11.2.2  2002/06/05 17:57:47  geraint
 ## Main part of optimisation routine moved to separate file.
 ##
 ## Revision 1.11.2.1  2002/06/05 11:14:51  geraint
 ## ae.r now generated using def2write_r like cse?.r
@@ -168,17 +171,21 @@
     lhs="$2"
 
     lhs=`echo $lhs | sed 's/MTTEdX/MTTdX/'`
     
     dae="${sys}_dae.r"
+    tmp=mtt_optimise.tmp
 
-    exp=`grep -i -e "^$lhs" $dae`
-    rhs=`echo $exp | sed 's/.*:=\ \(.*\)/\1/'`
-    rhs=`echo $rhs | sed 's/[;$]*$//'`
+    rhs=`eval "grep -i -e \"^$lhs\"" $dae`
+    rhs=`eval echo "\"$rhs"\" | gawk -v FS=":=" '{ print $2 }'`
+    rhs=`eval echo "\"$rhs"\" | eval "sed 's/\([.]*\)[;$]*$/\1/'"`
+    rhs=`eval echo "\"$rhs"\" | eval "sed 's/\ //g'"`
 
     if [ ! -z "${rhs}" ]; then
-	mtt_optimise.sh "$lhs" "$rhs" | mtt_fix_integers
+	eval echo \"$lhs\" \"$rhs\" > $tmp
+	eval mtt_optimise.sh $tmp
+	cat $tmp #| mtt_fix_integers
     fi
 
     return
 }
 

Index: mttroot/mtt/bin/trans/mtt_optimise.sh
==================================================================
--- mttroot/mtt/bin/trans/mtt_optimise.sh
+++ mttroot/mtt/bin/trans/mtt_optimise.sh
@@ -1,20 +1,23 @@
 #! /bin/sh
 
 set -e
+
+filename="$1"
 
 # get expression to optimise
 
-lhs="$1"
-rhs="$2"
-
-create_reduce_script ()
-{
-    lhs="$1"
-    rhs="$2"
-
-    cat <<EOF
+lhs=`cat ${filename} | gawk '{ print $1 }'`
+rhs=`cat ${filename} | gawk '{ print $2 }'`
+
+# set work file names
+
+tmp="$0.tmp"
+log="$0.log"
+
+
+cat <<EOF | reduce > $log
 off echo$
 load scope$
 on double$
 on noconvert$
 on rounded$
@@ -21,25 +24,14 @@
 off int$
 off nat$
 
 out "${tmp}"$
 optimize mtt_tmp0 :=: ${rhs} iname mtt_tmp$
-write "${lhs} := mtt_tmp0 $"$
+write "${lhs} := mtt_tmp0"$
 shut "${tmp}"$
 
 ;end;
 EOF
-    return
-}
-
-
-# set work file names
-
-tmp="$0.tmp"
-log="$0.log"
-
-create_reduce_script "${lhs}" "${rhs}" | reduce > ${log}
-
-cat ${tmp}
-rm -f ${tmp}
+
+mv ${tmp} ${filename}
 
 exit 0