[Automake-commit] [SCM] GNU Automake branch, yacc-work, updated. v1.11-287-g0f4005f

[Stefano Lattarini]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=0f4005f0838abb58e77a5a352225efebdb28464c

The branch, yacc-work has been updated
       via  0f4005f0838abb58e77a5a352225efebdb28464c (commit)
       via  da7f6125bd8dffa08c10a0fc7baeb812f8c6aada (commit)
      from  06efe9c467768a25c374b5d47dc8f1412874352d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 0f4005f0838abb58e77a5a352225efebdb28464c
Author: Stefano Lattarini <address@hidden>
Date:   Sun Apr 10 11:13:54 2011 +0200

    cosmetics: fix typos and wording in some yacc tests
    
    * tests/yacc-cxx.test (foo.cc): Clarify comment about the content
    of this file being valid C++ but invalid C.
    (parse1.yy): Likewise.  Also, remove redundant parentheses in a
    `return' statement.
    * tests/yacc-d-cxx.test (write_parse): Clarify comment about the
    content of the generated files being valid C++ but invalid C.
    (write_main): Likewise.
    * tests/yacc-basic.test: Remove redundant parentheses in a
    `return' statement.
    * tests/yacc-d-vpath.test: Adjust spacing around curly brackets.
    * tests/yaccvpath.test: Likewise.
    * tests/yaccdry.test: Likewise.
    * tests/yacc8.test: Likewise.
    * tests/yacc4.test: Likewise.
    
    Suggested by Ralf Wildenhues.

commit da7f6125bd8dffa08c10a0fc7baeb812f8c6aada
Author: Stefano Lattarini <address@hidden>
Date:   Sat Apr 9 10:48:42 2011 +0200

    yacc: update NEWS and docs about yacc-generated headers extensions
    
    * doc/automake.texi (Yacc and Lex): Document explicitly that
    extensions of yacc-generated headers are modelled after the
    extension of the corresponding sources.
    * NEWS: Update.

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog               |   27 +++++++++++++++++++++++++++
 NEWS                    |   10 ++++++++++
 doc/automake.texi       |   16 ++++++++++------
 tests/yacc-basic.test   |    2 +-
 tests/yacc-cxx.test     |    6 +++---
 tests/yacc-d-cxx.test   |    4 ++--
 tests/yacc-d-vpath.test |    6 +++---
 tests/yacc8.test        |    2 +-
 tests/yaccdry.test      |    2 +-
 tests/yaccvpath.test    |    6 +++---
 10 files changed, 61 insertions(+), 20 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f81eeaf..daba1c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,30 @@
+2011-04-10  Stefano Lattarini  <address@hidden>
+
+       cosmetics: fix typos and wording in some yacc tests
+       * tests/yacc-cxx.test (foo.cc): Clarify comment about the content
+       of this file being valid C++ but invalid C.
+       (parse1.yy): Likewise.  Also, remove redundant parentheses in a
+       `return' statement.
+       * tests/yacc-d-cxx.test (write_parse): Clarify comment about the
+       content of the generated files being valid C++ but invalid C.
+       (write_main): Likewise.
+       * tests/yacc-basic.test: Remove redundant parentheses in a
+       `return' statement.
+       * tests/yacc-d-vpath.test: Adjust spacing around curly brackets.
+       * tests/yaccvpath.test: Likewise.
+       * tests/yaccdry.test: Likewise.
+       * tests/yacc8.test: Likewise.
+       * tests/yacc4.test: Likewise.
+       Suggested by Ralf Wildenhues.
+
+2011-04-10  Stefano Lattarini  <address@hidden>
+
+       yacc: update NEWS and docs about yacc-generated headers extensions
+       * doc/automake.texi (Yacc and Lex): Document explicitly that
+       extensions of yacc-generated headers are modelled after the
+       extension of the corresponding sources.
+       * NEWS: Update.
+
 2011-01-28   Stefano Lattarini  <address@hidden>
 
        yacc: extension of headers modelled after extension of sources
diff --git a/NEWS b/NEWS
index a947af9..b014749 100644
--- a/NEWS
+++ b/NEWS
@@ -5,9 +5,19 @@ New in 1.11.0a:
   - The `lzma' compression scheme and associated automake option `dist-lzma'
     is obsoleted by `xz' and `dist-xz' due to upstream changes.
 
+* Changes to Yacc support:
+
   - C source and header files derived from non-distributed Yacc sources are
     now removed by "make clean", not only by "make maintainer-clean".
 
+  - Slightly backward-incompatible change, relevant only for use of Yacc
+    with C++: the extensions of the header files produced by the Yacc
+    rules are now modelled after extension of the sources corresponding
+    sources.  For example, yacc files named "foo.y++" and "bar.yy" will
+    produce header files named respectively "foo.h++" and "bar.hh", where
+    they would have previously produced header files named simply "foo.h"
+    and "bar.h".  This change offers better compatibility with `bison -o'.
+
 Bugs fixed in 1.11.0a:
 
 * Bugs introduced by 1.11:
diff --git a/doc/automake.texi b/doc/automake.texi
index dfd0019..701a888 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -6048,12 +6048,16 @@ cause the intermediate file to be named @file{foo.c} 
(as opposed to
 @file{y.tab.c}, which is more traditional).
 
 The extension of a yacc source file is used to determine the extension
-of the resulting C or C++ file.  Files with the extension @file{.y}
-will be turned into @file{.c} files; likewise, @file{.yy} will become
address@hidden; @file{.y++}, @file{c++}; @file{.yxx}, @file{.cxx}; and
address@hidden, @file{.cpp}.
-
-Likewise, lex source files can be used to generate C or C++; the
+of the resulting C or C++ source and header files.  Note that header
+files are generated only when the @option{-d} Yacc option is used; see
+below for more information about this flag, and how to specify it.
+Files with the extension @file{.y} will thus be turned into @file{.c}
+sources and @file{.h} headers; likewise, @file{.yy} will become
address@hidden and @file{.hh}, @file{.y++} will become @file{c++} and
address@hidden, @file{.yxx} will become @file{.cxx} and @file{.hxx},
+and @file{.ypp} will become @file{.cpp} and @file{.hpp}.
+
+Similarly, lex source files can be used to generate C or C++; the
 extensions @file{.l}, @file{.ll}, @file{.l++}, @file{.lxx}, and
 @file{.lpp} are recognized.
 
diff --git a/tests/yacc-basic.test b/tests/yacc-basic.test
index 845a861..96625cc 100755
--- a/tests/yacc-basic.test
+++ b/tests/yacc-basic.test
@@ -45,7 +45,7 @@ cat > parse.y << 'END'
 %{
 #include <stdio.h>
 #include <stdlib.h>
-int yylex () { return (getchar ()); }
+int yylex () { return getchar (); }
 void yyerror (char *s) {}
 %}
 %%
diff --git a/tests/yacc-cxx.test b/tests/yacc-cxx.test
index 86693d6..a6682e5 100755
--- a/tests/yacc-cxx.test
+++ b/tests/yacc-cxx.test
@@ -45,10 +45,10 @@ END
 
 cat > parse1.yy << 'END'
 %{
-// Valid as C++, but deliberatly invalid as C.
+// Valid C++, but deliberately invalid C.
 #include <cstdio>
 #include <cstdlib>
-int yylex (void) { return (getchar ()); }
+int yylex (void) { return getchar (); }
 void yyerror (const char *s) { return; }
 %}
 %%
@@ -59,7 +59,7 @@ cp parse1.yy parse3.yxx
 cp parse1.yy parse4.ypp
 
 cat > foo.cc << 'END'
-// Valid as C++, but deliberatly invalid as C.
+// Valid C++, but deliberately invalid C.
 using namespace std;
 int main (int argc, char **argv)
 {
diff --git a/tests/yacc-d-cxx.test b/tests/yacc-d-cxx.test
index b94b14d..a8de6b3 100755
--- a/tests/yacc-d-cxx.test
+++ b/tests/yacc-d-cxx.test
@@ -31,7 +31,7 @@ write_parse ()
   header=$1
   sed 's/^ *//' <<END
     %{
-    // Valid as C++, but deliberatly invalid as C.
+    // Valid C++, but deliberately invalid C.
     #include <cstdlib>
     #include "$header"
     int yylex (void) { return 0; }
@@ -47,7 +47,7 @@ write_main ()
 {
   header=$1
   sed 's/^ *//' <<END
-    // Valid as C++, but deliberatly invalid as C.
+    // Valid C++, but deliberately invalid C.
     #include <cstdio>
     #include "$header"
     int main (int argc, char **argv)
diff --git a/tests/yacc-d-vpath.test b/tests/yacc-d-vpath.test
index bb09990..0efa61e 100755
--- a/tests/yacc-d-vpath.test
+++ b/tests/yacc-d-vpath.test
@@ -44,7 +44,7 @@ END
 # Original parser, with `foobar'
 cat > parse.y << 'END'
 %{
-int yylex () {return 0;}
+int yylex () { return 0; }
 void yyerror (char *s) {}
 %}
 %token FOOBAR
@@ -77,7 +77,7 @@ $sleep
 # New parser, with `fubar'
 cat > ../parse.y << 'END'
 %{
-int yylex () {return 0;}
+int yylex () { return 0; }
 void yyerror (char *s) {}
 %}
 %token FUBAR
@@ -97,7 +97,7 @@ $sleep
 # New parser, with `maude'
 cat > ../parse.y << 'END'
 %{
-int yylex () {return 0;}
+int yylex () { return 0; }
 void yyerror (char *s) {}
 %}
 %token MAUDE
diff --git a/tests/yacc8.test b/tests/yacc8.test
index a683c8d..ca1ac68 100755
--- a/tests/yacc8.test
+++ b/tests/yacc8.test
@@ -52,7 +52,7 @@ mkdir foo
 
 cat > foo/parse.y << 'END'
 %{
-int yylex () {return 0;}
+int yylex () { return 0; }
 void yyerror (char *s) {}
 %}
 %%
diff --git a/tests/yaccdry.test b/tests/yaccdry.test
index d30fb80..3ad4f75 100755
--- a/tests/yaccdry.test
+++ b/tests/yaccdry.test
@@ -39,7 +39,7 @@ END
 
 cat > parse.y << 'END'
 %{
-int yylex () {return 0;}
+int yylex () { return 0; }
 void yyerror (char *s) {}
 %}
 %%
diff --git a/tests/yaccvpath.test b/tests/yaccvpath.test
index 52092fa..77df917 100755
--- a/tests/yaccvpath.test
+++ b/tests/yaccvpath.test
@@ -44,7 +44,7 @@ END
 # Original parser, with `foobar'
 cat > parse.y << 'END'
 %{
-int yylex () {return 0;}
+int yylex () { return 0; }
 void yyerror (char *s) {}
 %}
 %%
@@ -71,7 +71,7 @@ $sleep
 # New parser, with `fubar'
 cat > ../parse.y << 'END'
 %{
-int yylex () {return 0;}
+int yylex () { return 0; }
 void yyerror (char *s) {}
 %}
 %%
@@ -89,7 +89,7 @@ $sleep
 # New parser, with `maude'
 cat > ../parse.y << 'END'
 %{
-int yylex () {return 0;}
+int yylex () { return 0; }
 void yyerror (char *s) {}
 %}
 %%


hooks/post-receive
-- 
GNU Automake