* tests/calc.at: Exercise prologue splitting.

* data/bison.simple, data/bison.c++: Use `b4_pre_prologue' and
`b4_post_prologue' instead of `b4_prologue'.
* src/output.c (prepare): Add the `pre_prologue' and `post_prologue'
muscles.
(output): Free pre_prologue_obstack and post_prologue_obstack.
* src/files.h, src/files.c (attrs_obstack): Remove.
(pre_prologue_obstack, post_prologue_obstack): New.
* src/reader.c (copy_definition): Add a parameter to specify the
obstack to fill, instead of using attrs_obstack unconditionally.
(read_declarations): Pass pre_prologue_obstack to copy_definition if
`%union' has not yet been seen, pass post_prologue_obstack otherwise.

diff --git a/ChangeLog b/ChangeLog
index 4c9dfd5f4adc0badc34611e337d4658ceb10f206..be8c74c39d0b0f98f0f9dbacfb4172f16f2e0615 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2002-04-24  Robert Anisko  <robert@lrde.epita.fr>
+
+       * tests/calc.at: Exercise prologue splitting.
+
+       * data/bison.simple, data/bison.c++: Use `b4_pre_prologue' and
+       `b4_post_prologue' instead of `b4_prologue'.
+
+       * src/output.c (prepare): Add the `pre_prologue' and `post_prologue'
+       muscles.
+       (output): Free pre_prologue_obstack and post_prologue_obstack.
+       * src/files.h, src/files.c (attrs_obstack): Remove.
+       (pre_prologue_obstack, post_prologue_obstack): New.
+       * src/reader.c (copy_definition): Add a parameter to specify the
+       obstack to fill, instead of using attrs_obstack unconditionally.
+       (read_declarations): Pass pre_prologue_obstack to copy_definition if
+       `%union' has not yet been seen, pass post_prologue_obstack otherwise.
+

 2002-04-23  Paul Eggert  <eggert@twinsun.com>
 
        * data/bison.simple: Remove unnecessary commentary and white
 2002-04-23  Paul Eggert  <eggert@twinsun.com>
 
        * data/bison.simple: Remove unnecessary commentary and white

diff --git a/data/bison.c++ b/data/bison.c++
index a0908554a4c776cc7f6319cb54511f9d0b7a0e17..463e1366f5e6863b4d43838771f81774b8ff3336 100644 (file)
--- a/data/bison.c++
+++ b/data/bison.c++
@@ -113,7 +113,8 @@ b4_copyright
 /* Using locations.  */
 #define YYLSP_NEEDED b4_locations_flag
 
 /* Using locations.  */
 #define YYLSP_NEEDED b4_locations_flag
 

-b4_prologue
+/* Copy the first part of user declarations.  */
+b4_pre_prologue

 
 /* Tokens.  */
 b4_token_defines(b4_tokens)
 
 /* Tokens.  */
 b4_token_defines(b4_tokens)


@@ -137,6 +138,9 @@ yystype;
 # define YYSTYPE yystype
 #endif
 
 # define YYSTYPE yystype
 #endif
 

+/* Copy the second part of user declarations.  */
+b4_post_prologue
+

 #line __oline__  "__ofile__"
 #ifndef YYLLOC_DEFAULT
 # define YYLLOC_DEFAULT(Current, Rhs, N) \
 #line __oline__  "__ofile__"
 #ifndef YYLLOC_DEFAULT
 # define YYLLOC_DEFAULT(Current, Rhs, N) \

diff --git a/data/bison.simple b/data/bison.simple
index d52c2e09d937de7b7f79924da80e2ad590c6847a..6b0dc0acf73d012ff0cb14a2ef227b38ea1f5a70 100644 (file)
--- a/data/bison.simple
+++ b/data/bison.simple
@@ -120,8 +120,8 @@ m4_if(b4_prefix[], [yy], [],
 #endif
 ])
 
 #endif
 ])
 

-/* Copy the user declarations.  */
-b4_prologue
+/* Copy the first part of user declarations.  */
+b4_pre_prologue

 
 /* Enabling traces.  */
 #ifndef YYDEBUG
 
 /* Enabling traces.  */
 #ifndef YYDEBUG


@@ -155,6 +155,9 @@ typedef struct yyltype
 # define YYLTYPE b4_ltype
 #endif
 
 # define YYLTYPE b4_ltype
 #endif
 

+/* Copy the second part of user declarations.  */
+b4_post_prologue
+

 /* Line __line__ of __file__.  */
 #line __oline__ "__ofile__"
 
 /* Line __line__ of __file__.  */
 #line __oline__ "__ofile__"
 

diff --git a/src/files.c b/src/files.c
index 22f29c1ed06c3f11a38a532900157a00b0e011ca..3c1a0ba2fb8104787c75a5be4d4f4eea55443e48 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -33,8 +33,9 @@ const char *base_name PARAMS ((char const *name));
 FILE *finput = NULL;
 
 struct obstack action_obstack;
 FILE *finput = NULL;
 
 struct obstack action_obstack;

-struct obstack attrs_obstack;

 struct obstack output_obstack;
 struct obstack output_obstack;

+struct obstack pre_prologue_obstack;
+struct obstack post_prologue_obstack;

 
 /* Initializing some values below (such SPEC_NAME_PREFIX to `yy') is
    tempting, but don't do that: for the time being our handling of the
 
 /* Initializing some values below (such SPEC_NAME_PREFIX to `yy') is
    tempting, but don't do that: for the time being our handling of the

diff --git a/src/files.h b/src/files.h
index 6d8f640f703717fdf461e5e370b1cc19096727f9..d8a8eb1f5b88506a7e37df35f3e47417d043d6b5 100644 (file)
--- a/src/files.h
+++ b/src/files.h
@@ -50,7 +50,8 @@ extern FILE *finput;
 extern struct obstack action_obstack;
 
 /* If semantic parser, output a .h file that defines YYSTYPE... */
 extern struct obstack action_obstack;
 
 /* If semantic parser, output a .h file that defines YYSTYPE... */

-extern struct obstack attrs_obstack;
+extern struct obstack pre_prologue_obstack;
+extern struct obstack post_prologue_obstack;

 
 /* The verbose output. */
 extern struct obstack output_obstack;
 
 /* The verbose output. */
 extern struct obstack output_obstack;

diff --git a/src/output.c b/src/output.c
index f8cb5350eff96bb1fbf1c178f39c76528a2de410..fa001ff8056d6cc10af571c61e4ffad7c13b00e6 100644 (file)
--- a/src/output.c
+++ b/src/output.c
@@ -1092,8 +1092,10 @@ prepare (void)
   MUSCLE_INSERT_INT ("defines_flag", defines_flag);
 
   /* Copy definitions in directive.  */
   MUSCLE_INSERT_INT ("defines_flag", defines_flag);
 
   /* Copy definitions in directive.  */

-  obstack_1grow (&attrs_obstack, 0);
-  muscle_insert ("prologue", obstack_finish (&attrs_obstack));
+  obstack_1grow (&pre_prologue_obstack, 0);
+  obstack_1grow (&post_prologue_obstack, 0);
+  muscle_insert ("pre_prologue", obstack_finish (&pre_prologue_obstack));
+  muscle_insert ("post_prologue", obstack_finish (&post_prologue_obstack));

 
   /* Find the right skeleton file.  */
   if (!skeleton)
 
   /* Find the right skeleton file.  */
   if (!skeleton)


@@ -1131,5 +1133,6 @@ output (void)
   obstack_free (&muscle_obstack, NULL);
   obstack_free (&format_obstack, NULL);
   obstack_free (&action_obstack, NULL);
   obstack_free (&muscle_obstack, NULL);
   obstack_free (&format_obstack, NULL);
   obstack_free (&action_obstack, NULL);

-  obstack_free (&attrs_obstack, NULL);
+  obstack_free (&pre_prologue_obstack, NULL);
+  obstack_free (&post_prologue_obstack, NULL);

 }
 }

diff --git a/src/reader.c b/src/reader.c
index 6a99cfffa79e0b57ceaeb46c3562a6c28710b639..099f32dabc63bf2b27269f0e83de0d73ede3e085 100644 (file)
--- a/src/reader.c
+++ b/src/reader.c
@@ -591,7 +591,7 @@ copy_dollar (FILE *fin, struct obstack *oout,
 `-------------------------------------------------------------------*/
 
 static void
 `-------------------------------------------------------------------*/
 
 static void

-copy_definition (void)
+copy_definition (struct obstack *oout)

 {
   int c;
   /* -1 while reading a character if prev char was %. */
 {
   int c;
   /* -1 while reading a character if prev char was %. */


@@ -599,7 +599,7 @@ copy_definition (void)
 
   if (!no_lines_flag)
     {
 
   if (!no_lines_flag)
     {

-      obstack_fgrow2 (&attrs_obstack, muscle_find ("linef"),
+      obstack_fgrow2 (oout, muscle_find ("linef"),

                      lineno, quotearg_style (c_quoting_style,
                                              muscle_find ("filename")));
     }
                      lineno, quotearg_style (c_quoting_style,
                                              muscle_find ("filename")));
     }


@@ -613,7 +613,7 @@ copy_definition (void)
       switch (c)
        {
        case '\n':
       switch (c)
        {
        case '\n':

-         obstack_1grow (&attrs_obstack, c);
+         obstack_1grow (oout, c);

          ++lineno;
          break;
 
          ++lineno;
          break;
 


@@ -623,18 +623,18 @@ copy_definition (void)
 
        case '\'':
        case '"':
 
        case '\'':
        case '"':

-         copy_string (finput, &attrs_obstack, c);
+         copy_string (finput, oout, c);

          break;
 
        case '/':
          break;
 
        case '/':

-         copy_comment (finput, &attrs_obstack);
+         copy_comment (finput, oout);

          break;
 
        case EOF:
          fatal ("%s", _("unterminated `%{' definition"));
 
        default:
          break;
 
        case EOF:
          fatal ("%s", _("unterminated `%{' definition"));
 
        default:

-         obstack_1grow (&attrs_obstack, c);
+         obstack_1grow (oout, c);

        }
 
       c = getc (finput);
        }
 
       c = getc (finput);


@@ -643,7 +643,7 @@ copy_definition (void)
        {
          if (c == '}')
            return;
        {
          if (c == '}')
            return;

-         obstack_1grow (&attrs_obstack, '%');
+         obstack_1grow (oout, '%');

        }
       after_percent = 0;
     }
        }
       after_percent = 0;
     }


@@ -1154,7 +1154,7 @@ parse_skel_decl (void)
 /*----------------------------------------------------------------.
 | Read from finput until `%%' is seen.  Discard the `%%'.  Handle |
 | any `%' declarations, and copy the contents of any `%{ ... %}'  |
 /*----------------------------------------------------------------.
 | Read from finput until `%%' is seen.  Discard the `%%'.  Handle |
 | any `%' declarations, and copy the contents of any `%{ ... %}'  |

-| groups to ATTRS_OBSTACK.                                        |
+| groups to PRE_PROLOGUE_OBSTACK or POST_PROLOGUE_OBSTACK.        |

 `----------------------------------------------------------------*/
 
 static void
 `----------------------------------------------------------------*/
 
 static void


@@ -1174,7 +1174,10 @@ read_declarations (void)
              return;
 
            case tok_percent_left_curly:
              return;
 
            case tok_percent_left_curly:

-             copy_definition ();
+              if (!typed)
+               copy_definition (&pre_prologue_obstack);
+             else
+               copy_definition (&post_prologue_obstack);

              break;
 
            case tok_token:
              break;
 
            case tok_token:


@@ -1854,8 +1857,9 @@ reader (void)
 
   /* Initialize the obstacks. */
   obstack_init (&action_obstack);
 
   /* Initialize the obstacks. */
   obstack_init (&action_obstack);

-  obstack_init (&attrs_obstack);

   obstack_init (&output_obstack);
   obstack_init (&output_obstack);

+  obstack_init (&pre_prologue_obstack);
+  obstack_init (&post_prologue_obstack);

 
   finput = xfopen (infile, "r");
 
 
   finput = xfopen (infile, "r");
 

diff --git a/tests/calc.at b/tests/calc.at
index ddc86464cdf823626e2a82a53742060457d59bf3..ecd4c67380249880ad98ff1e73ba537b40eb977f 100644 (file)
--- a/tests/calc.at
+++ b/tests/calc.at
@@ -61,14 +61,23 @@ static int yygetc (void);
 static void yyungetc (int c);
 
 extern void perror (const char *s);
 static void yyungetc (int c);
 
 extern void perror (const char *s);

+
+/* Exercise pre-prologue dependency to %union.  */
+typedef int value_t;
+

 %}
 
 /* Also exercise %union. */
 %union
 {
 %}
 
 /* Also exercise %union. */
 %union
 {

-  int ival; /* A comment to exercise an old bug. */
+  value_t ival; /* A comment to exercise an old bug. */

 };
 
 };
 

+/* Exercise post-prologue dependency to %union.  */
+%{
+static void id (YYSTYPE *lval);
+%}
+

 /* Bison Declarations */
 %token CALC_EOF 0 "end of file"
 %token <ival> NUM "number"
 /* Bison Declarations */
 %token CALC_EOF 0 "end of file"
 %token <ival> NUM "number"


@@ -236,6 +245,11 @@ power (int base, int exponent)
   return res;
 }
 
   return res;
 }
 

+void
+id (YYSTYPE* lval)
+{
+}
+

 int
 main (int argc, const char **argv)
 {
 int
 main (int argc, const char **argv)
 {