Don't `touch' the files gettextize modified.

[bison.git] / src / reader.c

diff --git a/src/reader.c b/src/reader.c
index f76f5c8487a0fbe25636831d0689bf9f3305aed9..099f32dabc63bf2b27269f0e83de0d73ede3e085 100644 (file)
--- a/src/reader.c
+++ b/src/reader.c
@@ -199,13 +199,13 @@ symbol_pack (symbol_t *this)
       /* This symbol and its alias are a single token defn.
         Allocate a tokno, and assign to both check agreement of
         prec and assoc fields and make both the same */
       /* This symbol and its alias are a single token defn.
         Allocate a tokno, and assign to both check agreement of
         prec and assoc fields and make both the same */

-      if (this->number == -1)
+      if (this->number == NUMBER_UNDEFINED)

        {
          if (this == eoftoken || this->alias == eoftoken)
            this->number = this->alias->number = 0;
          else
            {
        {
          if (this == eoftoken || this->alias == eoftoken)
            this->number = this->alias->number = 0;
          else
            {

-             assert (this->alias->number != -1);
+             assert (this->alias->number != NUMBER_UNDEFINED);

              this->number = this->alias->number;
            }
        }
              this->number = this->alias->number;
            }
        }


@@ -215,7 +215,7 @@ symbol_pack (symbol_t *this)
     }
   else /* this->class == token_sym */
     {
     }
   else /* this->class == token_sym */
     {

-      assert (this->number != -1);
+      assert (this->number != NUMBER_UNDEFINED);

     }
 
   symbols[this->number] = this;
     }
 
   symbols[this->number] = this;


@@ -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;
     }


@@ -705,7 +705,7 @@ parse_token_decl (symbol_class what_is, symbol_class what_is_not)
          symbol->class = what_is;
          if (what_is == nterm_sym && oldclass != nterm_sym)
            symbol->number = nvars++;
          symbol->class = what_is;
          if (what_is == nterm_sym && oldclass != nterm_sym)
            symbol->number = nvars++;

-         if (what_is == token_sym && symbol->number == -1)
+         if (what_is == token_sym && symbol->number == NUMBER_UNDEFINED)

            symbol->number = ntokens++;
 
          if (typename)
            symbol->number = ntokens++;
 
          if (typename)


@@ -857,7 +857,7 @@ parse_assoc_decl (associativity assoc)
          symval->assoc = assoc;
          if (symval->class == nterm_sym)
            complain (_("symbol %s redefined"), symval->tag);
          symval->assoc = assoc;
          if (symval->class == nterm_sym)
            complain (_("symbol %s redefined"), symval->tag);

-         if (symval->number == -1)
+         if (symval->number == NUMBER_UNDEFINED)

            {
              symval->number = ntokens++;
              symval->class = token_sym;
            {
              symval->number = ntokens++;
              symval->class = token_sym;


@@ -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:


@@ -1678,15 +1681,37 @@ read_additionnal_code (void)
 static void
 token_translations_init (void)
 {
 static void
 token_translations_init (void)
 {

-  int last_user_token_number = 256;
+  int num_256_available_p = TRUE;

   int i;
 
   int i;
 

-  /* Set the user numbers. */
+  /* Find the highest user token number, and whether 256, the POSIX
+     preferred user token number for the error token, is used.  */
+  max_user_token_number = 0;
+  for (i = 0; i < ntokens; ++i)
+    {
+      symbol_t *this = symbols[i];
+      if (this->user_token_number != SUNDEF)
+       {
+         if (this->user_token_number > max_user_token_number)
+           max_user_token_number = this->user_token_number;
+         if (this->user_token_number == 256)
+           num_256_available_p = FALSE;
+       }
+    }
+
+  /* If 256 is not used, assign it to error, to follow POSIX.  */
+  if (num_256_available_p && errtoken->user_token_number == SUNDEF)
+    errtoken->user_token_number = 256;
+
+  /* Set the missing user numbers. */
+  if (max_user_token_number < 256)
+    max_user_token_number = 256;
+

   for (i = 0; i < ntokens; ++i)
     {
       symbol_t *this = symbols[i];
       if (this->user_token_number == SUNDEF)
   for (i = 0; i < ntokens; ++i)
     {
       symbol_t *this = symbols[i];
       if (this->user_token_number == SUNDEF)

-       this->user_token_number = ++last_user_token_number;
+       this->user_token_number = ++max_user_token_number;

       if (this->user_token_number > max_user_token_number)
        max_user_token_number = this->user_token_number;
     }
       if (this->user_token_number > max_user_token_number)
        max_user_token_number = this->user_token_number;
     }


@@ -1698,7 +1723,6 @@ token_translations_init (void)
      inputs.  */
   for (i = 0; i < max_user_token_number + 1; i++)
     token_translations[i] = undeftoken->number;
      inputs.  */
   for (i = 0; i < max_user_token_number + 1; i++)
     token_translations[i] = undeftoken->number;

-

   symbols_do (symbol_translation, NULL);
 }
 
   symbols_do (symbol_translation, NULL);
 }
 


@@ -1763,7 +1787,9 @@ packgram (void)
       p = p->next;
       while (p && p->sym)
        {
       p = p->next;
       while (p && p->sym)
        {

-         ritem[itemno++] = p->sym->number;
+         /* item_number_t = token_number_t.
+            But the former needs to contain more: negative rule numbers. */
+         ritem[itemno++] = token_number_as_item_number (p->sym->number);

          /* A rule gets by default the precedence and associativity
             of the last token in it.  */
          if (p->sym->class == token_sym)
          /* A rule gets by default the precedence and associativity
             of the last token in it.  */
          if (p->sym->class == token_sym)


@@ -1822,7 +1848,6 @@ reader (void)
   errtoken = getsym ("error");
   errtoken->class = token_sym;
   errtoken->number = ntokens++;
   errtoken = getsym ("error");
   errtoken->class = token_sym;
   errtoken->number = ntokens++;

-  errtoken->user_token_number = 256;   /* Value specified by POSIX.  */

 
   /* Construct a token that represents all undefined literal tokens.
      It is always token number 2.  */
 
   /* Construct a token that represents all undefined literal tokens.
      It is always token number 2.  */


@@ -1832,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");