Re: Bug fix for rewriting of traces without arguments.

[Alexandre Duret-Lutz]

>>> "adl" == Alexandre Duret-Lutz <address@hidden> writes:

[...]

 adl> Index: ChangeLog
 adl> from  Alexandre Duret-Lutz  <address@hidden>

 adl> * bin/autom4te.in (handle_traces): Fix rewriting of traces without
 adl> arguments.

Sorry, I didn't send the right patch.

Index: bin/autom4te.in
===================================================================
RCS file: /cvsroot/autoconf/autoconf/bin/autom4te.in,v
retrieving revision 1.14
diff -u -r1.14 autom4te.in
--- bin/autom4te.in     2001/08/01 15:10:36     1.14
+++ bin/autom4te.in     2001/08/02 10:34:06
@@ -833,12 +833,14 @@
     or die "$me: cannot open $me.cache/" . $req->cache . ": $!\n";
   while ($_ = $traces->getline)
     {
-      # Multiline traces.
+      # Trace with arguments, as the example above.  We don't try
+      # to match the trailing parenthesis as it might be on a
+      # separate line.
       s{^m4trace:(.+):(\d+): -(\d+)- ([^(]+)\((.*)$}
        {AT_$4([$1], [$2], [$3], [$4], $5};
-      # Single line traces, as the example above.
-      s{^m4trace:(.+):(\d+): -(\d+)- (.*)$}
-       {AT_$4([$1], [$2], [$3], [$4]};
+      # Traces without arguments, always on a single line.
+      s{^m4trace:(.+):(\d+): -(\d+)- ([^)]*)\n$}
+       {AT_$4([$1], [$2], [$3], [$4])\n};
       print $trace_m4 "$_";
     }
   $trace_m4->close;

-- 
Alexandre Duret-Lutz