* bin/autom4te.in (handle_output): Handle @__@.

diff --git a/ChangeLog b/ChangeLog
index 8d635574c66185f9e55a7364fafea1b7824eb90f..7085a34125b3e7cb00de90fe35ba8b315e2c8259 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2001-08-20  Akim Demaille  <akim@epita.fr>
+
+       * bin/autom4te.in (handle_output): Handle @__@.
+
 2001-08-20  Akim Demaille  <akim@epita.fr>
 
        * lib/autoconf/autoconf.m4, lib/autoconf/oldnames.m4,

diff --git a/bin/autom4te.in b/bin/autom4te.in
index b2223efef3d5a09eb11fd62df2f63bfec33378b4..b4e83a974265ced6be24799a25fc4f790d75c81f 100644 (file)
--- a/bin/autom4te.in
+++ b/bin/autom4te.in
@@ -581,6 +581,7 @@ sub handle_output ($$)
   my $separate = 0;
   my $oline = 0;
   my %prohibited;
+  my $res;
   while ($_ = $in->getline)
     {
       s/\s+$//;
@@ -599,12 +600,13 @@ sub handle_output ($$)
 
       $oline++;
       s/__oline__/$oline/g;
+
       s/\@<:\@/[/g;
       s/\@:>\@/]/g;
       s/\@S\|\@/\$/g;
       s/\@%:\@/#/g;
 
-      print $out "$_\n";
+      $res = $_;
 
       # Don't complain in comments.  Well, until we have something
       # better, don't consider `#include' etc. are comments.
@@ -615,6 +617,14 @@ sub handle_output ($$)
          $prohibited{$_} = $oline
            if /$forbidden/o && !/$allowed/o && ! exists $prohibited{$_};
        }
+
+      # Performed *last*: the empty quadrigraph.  Handling it last
+      # makes it possible to generate quadrigraphs, e.g. `@<@__@:@'
+      # produces `@<:@'.  In addition, it provides a means to
+      # explicitly allow some *occurrences* of forbidden patterns.
+      $res =~ s/\@__\@//g;
+
+      print $out "$res\n";
     }
 
   # If no forbidden words, we're done.