detect a syntax error

diff --git a/ChangeLog b/ChangeLog
index 2f811f9f37c4a304c8be98e2201c5869badb9dc1..fc844c514db689d249fd5c1855a6c2fe7e2c2a0c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Jun  2 13:27:34 1998  Tom Tromey  <tromey@cygnus.com>
+
+       * automake.in (read_am_file): Error if blank line or comment
+       follows trailing backslash.  Test syntax.test.
+       (file_contents_with_transform): Likewise.
+
 Thu May 28 18:49:47 1998  Ian Lance Taylor  <ian@cygnus.com>
 
        * automake.in (handle_configure): Always use $(SHELL) when running

diff --git a/TODO b/TODO
index e79c4c926da5c471dfd98d550139306fb6848a8a..9c5142df2dd393716c252d0f8759532aea11fdb3 100644 (file)
--- a/TODO
+++ b/TODO
@@ -8,14 +8,6 @@
        LL_info_TEXINFOS = ...
   will put info files for language LL into $(infodir)/LL.
 
-* something like this fails:
-
-       foo = q \
-
-       lib_LTLIBRARIES = foo.la
-
-  this should give an error.
-
 * dependency tracking doesn't work well when a file is removed
   the new code to track header dependencies exacerbates this
   what is the fix?

diff --git a/automake.in b/automake.in
index 46385d6349e5f3e5319b7e8be117ce7cc2f00c99..a91bf4638250e45076d9ff33fce4dd77a50ea09a 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -5217,12 +5217,16 @@ sub read_am_file
        {
            # Stick a single white line before the incoming macro or rule.
            $spacing = "\n";
+           &am_line_error ($., "blank line following trailing backslash")
+               if $saw_bk;
        }
        elsif (/$COMMENT_PATTERN/o)
        {
            # Stick comments before the incoming macro or rule.
            $comment .= $spacing . $_;
            $spacing = '';
+           &am_line_error ($., "comment following trailing backslash")
+               if $saw_bk;
        }
        elsif ($saw_bk)
        {
@@ -5734,12 +5738,16 @@ sub file_contents_with_transform
        {
            # Stick a single white line before the incoming macro or rule.
            $spacing = "\n";
+           &am_line_error ($., "blank line following trailing backslash")
+               if $saw_bk;
        }
        elsif (/$COMMENT_PATTERN/o)
        {
            # Stick comments before the incoming macro or rule.
            $comment .= $spacing . $_;
            $spacing = '';
+           &am_line_error ($., "comment following trailing backslash")
+               if $saw_bk;
        }
        elsif ($saw_bk)
        {