m4 1.4.7 trace line number differences

[Ralf Wildenhues]

Hi Eric,

I happen to be testing git Autoconf under MinGW with its m4 1.4.7.
Since that still uses different tracing line number output (so far;
it's halfway through), I get these two test failures:


#                             -*- compilation -*-
7. tools.at:229: testing ...
../../autoconf/tests/tools.at:239: autom4te --language=m4sugar -t 'm4_echo' 
file.m4
--- -   2009-07-25 15:18:11 +0200
+++ /home/ralf/ac/build/tests/testsuite.dir/at-groups/7/stdout  2009-07-25 
15:18:11 +0200
@@ -1,2 +1,2 @@
-file.m4:1:m4_echo: a b c :d
+file.m4:4:m4_echo: a b c :d
 
7. tools.at:229: 7. autom4te --trace and whitespace (tools.at:229): FAILED 
(tools.at:239)

#                             -*- compilation -*-
42. m4sugar.at:510: testing ...
../../autoconf/tests/m4sugar.at:531: autom4te --language=m4sugar script.4s -o 
script -o-
../../autoconf/tests/m4sugar.at:553: autom4te --language=m4sugar script.4s -o 
script -o-
../../autoconf/tests/m4sugar.at:574: autom4te --language=m4sugar script.4s -o 
script -o-
../../autoconf/tests/m4sugar.at:607: autom4te --language=m4sugar script.4s -o 
script -o-
stderr:
script.4s:14: warning: m4_require: `a' was expanded before it was required
script.4s:5: b is expanded from...
script.4s:6: c is expanded from...
script.4s:13: outer is expanded from...
script.4s:14: the top level
../../autoconf/tests/m4sugar.at:607: sed 's/^[^:]*m4[.ex]*: *\([^:]*:\) 
*\([0-9][0-9]*: \)/m4:\1\2/
        s/^\([^:]*:\) *\([0-9][0-9]*:\)[^:]*m4[.ex]*: /m4:\1\2 /
        s/: C\(annot open \)\([^`:]*\):/: c\1`\2'\'':/
        s/: include:\( cannot open\)/:\1/
        s/^autom4te: [^ ]*m4[.ex]* /autom4te: m4 /
        s/ (E[A-Z]*)$//
    ' stderr >&2
--- -   2009-07-25 15:26:18 +0200
+++ /home/ralf/ac/build/tests/testsuite.dir/at-groups/42/stderr 2009-07-25 
15:26:18 +0200
@@ -1,6 +1,6 @@
 script.4s:14: warning: m4_require: `a' was expanded before it was required
 script.4s:5: b is expanded from...
 script.4s:6: c is expanded from...
-script.4s:7: outer is expanded from...
+script.4s:13: outer is expanded from...
 script.4s:14: the top level
 
42. m4sugar.at:510: 42. m4_require: nested (m4sugar.at:510): FAILED 
(m4sugar.at:607)


Cheers,
Ralf