* tests/output.at: New test.

* src/files.c (compute_base_names): Don't map extensions when
the YACC flag is set, use defaults.
Reported by Evgeny Stambulchik.

diff --git a/ChangeLog b/ChangeLog
index 09e7ef71b872da4c5384fd1e95f5c833a3d77f29..e8ac01ea32b5b8ba4693af67d9d4c78fb40f5c42 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2002-01-19  Marc Autret  <marc@gnu.org>
+
+       * tests/output.at: New test.
+       * src/files.c (compute_base_names): Don't map extensions when
+       the YACC flag is set, use defaults.
+       Reported by Evgeny Stambulchik.
+

 2002-01-19  Marc Autret  <marc@gnu.org>
 
        * configure.in, doc/version.texi: Bump to 1.31a.
 2002-01-19  Marc Autret  <marc@gnu.org>
 
        * configure.in, doc/version.texi: Bump to 1.31a.

diff --git a/THANKS b/THANKS
index a88bd6a1a48ee08a3906b8025fbc6d49b4c219c6..c592a8f606ec7879d0b1ff59e619173380aa9842 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -10,6 +10,7 @@ Daniel Hagerty          hag@gnu.org
 David J. MacKenzie      djm@gnu.org
 Dick Streefland                dick.streefland@altium.nl
 Enrico Scholz           enrico.scholz@informatik.tu-chemnitz.de
 David J. MacKenzie      djm@gnu.org
 Dick Streefland                dick.streefland@altium.nl
 Enrico Scholz           enrico.scholz@informatik.tu-chemnitz.de

+Evgeny Stambulchik     fnevgeny@plasma-gate.weizmann.ac.il

 Fabrice Bauzac          noon@cote-dazur.com
 H. Merijn Brand         h.m.brand@hccnet.nl
 Hans Aberg              haberg@matematik.su.se
 Fabrice Bauzac          noon@cote-dazur.com
 H. Merijn Brand         h.m.brand@hccnet.nl
 Hans Aberg              haberg@matematik.su.se

diff --git a/src/files.c b/src/files.c
index c11420c838e13c05a7aebe44c73cde7b7e6fb222..2629dfbb2b3c2f363e206539e36ffad0e3fd6a03 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -419,8 +419,9 @@ compute_base_names (void)
 
       /* Computes the extensions from the grammar file name.  */
       filename_split (infile, &base, &tab, &ext);
 
       /* Computes the extensions from the grammar file name.  */
       filename_split (infile, &base, &tab, &ext);

-      if (ext)
-       compute_exts_from_gf (ext);
+      
+      if (ext && !yacc_flag)
+       compute_exts_from_gf (ext);

     }
 }
 
     }
 }
 

diff --git a/tests/output.at b/tests/output.at
index ee50d6a1643597967f9e5fe555209671988a99ab..4332372dd781f839c940e615a5bfe0e4b2e4bb8e 100644 (file)
--- a/tests/output.at
+++ b/tests/output.at
@@ -53,6 +53,9 @@ AT_CHECK_OUTPUT([foo.y], [%defines %verbose],      [],
 AT_CHECK_OUTPUT([foo.y], [%defines %verbose %yacc],[],
                 [y.output y.tab.c y.tab.h])
 
 AT_CHECK_OUTPUT([foo.y], [%defines %verbose %yacc],[],
                 [y.output y.tab.c y.tab.h])
 

+AT_CHECK_OUTPUT([foo.yy], [%defines %verbose %yacc],[],
+                [y.output y.tab.c y.tab.h])
+

 # Exercise %output and %file-prefix
 AT_CHECK_OUTPUT([foo.y], [%file-prefix="bar" %defines %verbose],      [],
                 [bar.output bar.tab.c bar.tab.h])
 # Exercise %output and %file-prefix
 AT_CHECK_OUTPUT([foo.y], [%file-prefix="bar" %defines %verbose],      [],
                 [bar.output bar.tab.c bar.tab.h])