fixup: interaction between verbatim lines and line continuation

When line continuations were involved, our hack to pass lines verbatim
to the output Makefile didn't work as expected; for example, the input

    !$(call foo,=, \
    !   long continued line still in the call)

produced in the generated Makefile an output like

    $(call foo,=, \
    !   long continued line still in the call)

rather than as the expected

    $(call foo,=, \
       long continued line still in the call)

That bug severely limited the usefulness of our hack.  Luckily, it's
pretty easy to fix.

* automake.in (file_contents_internal): Handling of !-escaped
lines moved ...
(make_paragraphs): ... here, and adjusted to cope with line
continuations.
* lib/am/parallel-tests.am: Break overly long !-escaped lines,
now that we can.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>

diff --git a/automake.in b/automake.in
index d2d1551907d369017c2d8993746be2ebcf86e6c7..6d5b220c769b044f738f259a58117b35c7098587 100644 (file)
--- a/automake.in
+++ b/automake.in
@@ -6571,9 +6571,27 @@ sub make_paragraphs ($%)
   $transform{FIRST} = !$transformed_files{$file};
   $transformed_files{$file} = 1;
 
-  my @lines = split /(?<!\\)\n/, preprocess_file ($file, %transform);
-  my @res;
+  my @lines = split /\n/, preprocess_file ($file, %transform);
+
+  # A line starting with '!' must be passed verbatim to the output
+  # Makefile, placed after the variables' definitions and before the
+  # Makefile targets.  This is an hack to allow us to use tricky GNU
+  # make constructs (on which the dumb Automake parser would choke).
+  # It is not perfect, but seems good enough for the moment.
+  my @verbatim_lines = grep /^!/, @lines;
+  foreach (@verbatim_lines)
+    {
+      s/^!//;
+      $output_verbatim .= "$_\n";
+    }
+  @lines = grep !/^!/, @lines;
+
+  # Handle line continuations.
+  # FIXME: this could probably be done more efficiently, but I'd rather
+  # FIXME: not change working (and trickish) code for the moment.
+  @lines = split /(?<!\\)\n/, join ("\n", @lines);
 
+  my @res;
   while (defined ($_ = shift @lines))
     {
       my $paragraph = $_;
@@ -6639,16 +6657,8 @@ sub file_contents_internal ($$$%)
        # FIXME: no line number available.
        $where->set ($file);
 
-        # A line starting with '!' must be passed verbatim to the output
-        # Makefile, placed after the variables' definitions and before the
-        # Makefile targets.
-        if (s/^!//)
-          {
-            $output_verbatim .= "$_\n";
-          }
-
        # Sanity checks.
-       elsif (/\\$/)
+       if (/\\$/)
           {
            error $where, "blank line following trailing backslash:\n$_"
           }

diff --git a/lib/am/parallel-tests.am b/lib/am/parallel-tests.am
index 4f2e003a4d409276a343f082fef6f7ae56d0c6a3..0c3e9ff52a464ba5fca77351fcdbc5e9ea5ba3aa 100644 (file)
--- a/lib/am/parallel-tests.am
+++ b/lib/am/parallel-tests.am
@@ -91,10 +91,10 @@ am__tpfx = \
 ## FIXME: this will pick up the default from the environment; are we sure
 ## FIXME: we want that?
 !TEST_EXTENSIONS ?= .test
-!$(call am__maybe_invalid_test_extensions,$(filter-out .%,$(TEST_EXTENSIONS)))
-## FIXME: it would be nice to break these on multiple lines.  Unfortunately,
-## FIXME: our '!' is not yet smart enough to handle that :-(
-!$(foreach am__e,$(TEST_EXTENSIONS), $(eval $(call am__handle_per_suffix_test,$(am__e))))
+!$(call am__maybe_invalid_test_extensions,\
+!  $(filter-out .%,$(TEST_EXTENSIONS)))
+!$(foreach am__e,$(TEST_EXTENSIONS), \
+!  $(eval $(call am__handle_per_suffix_test,$(am__e))))
 ## It is *imperative* that the "empty" suffix goes last.  Otherwise, a
 ## declaration like "TESTS = all.test" would cause GNU make to mistakenly
 ## try to build the 'all.log' and 'all.trs' files from a non-existent