Index: mttroot/mtt/bin/trans/abg2sympar_m2txt ================================================================== --- mttroot/mtt/bin/trans/abg2sympar_m2txt +++ mttroot/mtt/bin/trans/abg2sympar_m2txt @@ -11,13 +11,13 @@ # Inform user #echo "Creating $1_sympar.txt" # Separation characters -SEPS='=*;+/()-^' +SEPS='^=*;+/()-' # Replace by , -REPS=',,,,,,,,,' +REPS='[,*]' SystemName=$2 UseLabelFile=$3 if [ -n "$UseLabelFile" ]; then ## Take input from lbl.txt Index: mttroot/mtt/bin/trans/mtt_make_sympar ================================================================== --- mttroot/mtt/bin/trans/mtt_make_sympar +++ mttroot/mtt/bin/trans/mtt_make_sympar @@ -11,10 +11,13 @@ ############################################################### ## Version control history ############################################################### ## $Id$ ## $Log$ +## Revision 1.7 2001/04/13 07:14:12 geraint +## Implemented lower level lbl.txt recognition of #NOT[V|P]AR +## ## Revision 1.6 2001/04/10 12:54:50 gawthrop ## Minor fixes for sensitivity versions ## ## Revision 1.5 2000/11/03 14:57:06 peterg ## Corrected regexp notvar @@ -40,11 +43,11 @@ # Inform user echo Creating $filename # Create list of all sympars including those that are aliased sh $1_type.sh 'echo ' ' ' ' ' |\ -awk '{print "abg2sympar_m2txt " $1, $2}' |\ +awk '{printf("abg2sympar_m2txt %s %s\n ", $1, $2)}' |\ sh | sort -u > mtt_all_sympar.txt # Sort the aliased list mtt_strip_args < $1_aliased.txt | sort -u > mtt_aliased_sort.txt Index: mttroot/mtt/bin/trans/mtt_strip_args ================================================================== --- mttroot/mtt/bin/trans/mtt_strip_args +++ mttroot/mtt/bin/trans/mtt_strip_args @@ -9,10 +9,13 @@ # Label file to symbolic parameters conversion # Copyright (C) 2000 by Peter J. Gawthrop ## $Id$ ## ## $Log$ +## Revision 1.5 2001/06/13 14:50:13 gawthrop +## Operator ^ now ok in args in abg and/or lbl +## ## Revision 1.4 2001/05/08 15:18:10 gawthrop ## Added trig and hyperbolic functions to argument exclusion list ## ## Revision 1.3 2000/10/17 12:33:13 peterg ## Added mtt_mod to the zapped list @@ -25,13 +28,14 @@ ## ## # Inform user #echo "Creating $1_sympar.txt" # Separation characters -SEPS='=*;+/()-^' +SEPS='^=*;+/()-' # Replace by , -REPS=',,,,,,,,,' +REPS='[,*]' + # This is the main transformation using gawk tr $SEPS $REPS | \ awk ' function exact_match(name1, name2) {