make ugly regexp a bit more robust to corner cases

diff --git a/src/smpi/smpif90.in b/src/smpi/smpif90.in
index dbb5313..fc75375 100644 (file)
--- a/src/smpi/smpif90.in
+++ b/src/smpi/smpif90.in
@@ -34,7 +34,7 @@ trap 'cleanup' EXIT
 filter_and_compile() {
     list_add TMPFILES "${TMPFILE}"
     #replace "program main_name by subroutine user_main (and the end clause as well)"
 filter_and_compile() {
     list_add TMPFILES "${TMPFILE}"
     #replace "program main_name by subroutine user_main (and the end clause as well)"

-    sed 's/[[:space:]]*[pP][rR][oO][gG][rR][aA][mM][[:space:]][[:space:]]*\([a-zA-Z0-9_]*\)/ subroutine user_main /g' "${ARG}" > "${TMPFILE}"
+    sed 's/^\([[:space:]]*\)\([eE][nN][dD] \)\{0,1\}[pP][rR][oO][gG][rR][aA][mM][^a-zA-Z0-9]*\([a-zA-Z0-9_]*\)/\1\2subroutine user_main /g' "${ARG}" >> "${TMPFILE}"

     SRCFILE="${TMPFILE}"
     list_add CMDLINE "${SRCFILE}"
 }
     SRCFILE="${TMPFILE}"
     list_add CMDLINE "${SRCFILE}"
 }

diff --git a/src/smpi/smpiff.in b/src/smpi/smpiff.in
index eeefe89..3e94eb9 100644 (file)
--- a/src/smpi/smpiff.in
+++ b/src/smpi/smpiff.in
@@ -38,7 +38,7 @@ filter_and_compile_f77() {
       echo "#include \"@includedir@/smpi/smpi_extended_traces_fortran.h\"" > ${TMPFILE}
       echo "#line 1 \"${ARG}\"" >> ${TMPFILE}
     fi
       echo "#include \"@includedir@/smpi/smpi_extended_traces_fortran.h\"" > ${TMPFILE}
       echo "#line 1 \"${ARG}\"" >> ${TMPFILE}
     fi

-    sed 's/[[:space:]]\{6\}[[:space:]]*\([eE][nN][dD] \)\{0,1\}[pP][rR][oO][gG][rR][aA][mM][[:space:]][[:space:]]*\([a-zA-Z0-9_]*\)/      \1subroutine user_main /g' "${ARG}" >> "${TMPFILE}"
+    sed 's/^[[:space:]]\{6\}[[:space:]]*\([eE][nN][dD] \)\{0,1\}[pP][rR][oO][gG][rR][aA][mM][^a-zA-Z0-9]*\([a-zA-Z0-9_]*\)/      \1subroutine user_main /g' "${ARG}" >> "${TMPFILE}"

     SRCFILE="${TMPFILE}"
     list_add CMDLINE "${SRCFILE}"
 }
     SRCFILE="${TMPFILE}"
     list_add CMDLINE "${SRCFILE}"
 }


@@ -49,7 +49,7 @@ filter_and_compile_f90() {
       echo "#include \"@includedir@/smpi/smpi_extended_traces_fortran.h\"" > ${TMPFILE}
       echo "#line 1 \"${ARG}\"" >> ${TMPFILE}
     fi
       echo "#include \"@includedir@/smpi/smpi_extended_traces_fortran.h\"" > ${TMPFILE}
       echo "#line 1 \"${ARG}\"" >> ${TMPFILE}
     fi

-    sed 's/[[:space:]]*[pP][rR][oO][gG][rR][aA][mM][[:space:]][[:space:]]*\([a-zA-Z0-9_]*\)/ subroutine user_main /g' "${ARG}" > "${TMPFILE}"
+    sed 's/^\([[:space:]]*\)\([eE][nN][dD] \)\{0,1\}[pP][rR][oO][gG][rR][aA][mM][^a-zA-Z0-9]*\([a-zA-Z0-9_]*\)/\1\2subroutine user_main /g' "${ARG}" >> "${TMPFILE}"

     SRCFILE="${TMPFILE}"
     list_add CMDLINE "${SRCFILE}"
 }
     SRCFILE="${TMPFILE}"
     list_add CMDLINE "${SRCFILE}"
 }