Various DJGGP specific issues in /djgpp.

[bison.git] / src / parse-gram.y

diff --git a/src/parse-gram.y b/src/parse-gram.y
index db63e5082d863784d2fc6d2a77237a98cc2929ac..11cd489e36f578999f3d6e5c5ddc9b040385d23f 100644 (file)
--- a/src/parse-gram.y
+++ b/src/parse-gram.y
@@ -1,6 +1,6 @@
 %{/* Bison Grammar Parser                             -*- C -*-
 
 %{/* Bison Grammar Parser                             -*- C -*-
 

-   Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.

 
    This file is part of Bison, the GNU Compiler Compiler.
 
 
    This file is part of Bison, the GNU Compiler Compiler.
 


@@ -39,7 +39,7 @@
 static YYLTYPE lloc_default (YYLTYPE const *, int);
 
 #define YY_LOCATION_PRINT(File, Loc) \
 static YYLTYPE lloc_default (YYLTYPE const *, int);
 
 #define YY_LOCATION_PRINT(File, Loc) \

-          location_print (File, Loc)
+         location_print (File, Loc)

 
 static void version_check (location const *loc, char const *version);
 
 
 static void version_check (location const *loc, char const *version);
 


@@ -47,7 +47,7 @@ static void version_check (location const *loc, char const *version);
    FIXME: depends on the undocumented availability of YYLLOC.  */
 #undef  yyerror
 #define yyerror(Msg) \
    FIXME: depends on the undocumented availability of YYLLOC.  */
 #undef  yyerror
 #define yyerror(Msg) \

-        gram_error (&yylloc, Msg)
+       gram_error (&yylloc, Msg)

 static void gram_error (location const *, char const *);
 
 static void add_param (char const *, char *, location);
 static void gram_error (location const *, char const *);
 
 static void add_param (char const *, char *, location);


@@ -57,6 +57,19 @@ static uniqstr current_type = 0;
 static symbol *current_lhs;
 static location current_lhs_location;
 static int current_prec = 0;
 static symbol *current_lhs;
 static location current_lhs_location;
 static int current_prec = 0;

+
+#ifdef UINT_FAST8_MAX
+# define YYTYPE_UINT8 uint_fast8_t
+#endif
+#ifdef INT_FAST8_MAX
+# define YYTYPE_INT8 int_fast8_t
+#endif
+#ifdef UINT_FAST16_MAX
+# define YYTYPE_UINT16 uint_fast16_t
+#endif
+#ifdef INT_FAST16_MAX
+# define YYTYPE_INT16 int_fast16_t
+#endif

 %}
 
 %debug
 %}
 
 %debug


@@ -132,11 +145,11 @@ static int current_prec = 0;
   PERCENT_NO_DEFAULT_PREC "%no-default-prec"
   PERCENT_NO_LINES        "%no-lines"
   PERCENT_NONDETERMINISTIC_PARSER
   PERCENT_NO_DEFAULT_PREC "%no-default-prec"
   PERCENT_NO_LINES        "%no-lines"
   PERCENT_NONDETERMINISTIC_PARSER

-                          "%nondeterministic-parser"
+                         "%nondeterministic-parser"

   PERCENT_OUTPUT          "%output"
   PERCENT_PARSE_PARAM     "%parse-param {...}"
   PERCENT_PURE_PARSER     "%pure-parser"
   PERCENT_OUTPUT          "%output"
   PERCENT_PARSE_PARAM     "%parse-param {...}"
   PERCENT_PURE_PARSER     "%pure-parser"

-  PERCENT_REQUIRE        "%require"
+  PERCENT_REQUIRE        "%require"

   PERCENT_SKELETON        "%skeleton"
   PERCENT_START           "%start"
   PERCENT_TOKEN_TABLE     "%token-table"
   PERCENT_SKELETON        "%skeleton"
   PERCENT_START           "%start"
   PERCENT_TOKEN_TABLE     "%token-table"


@@ -163,10 +176,9 @@ static int current_prec = 0;
              "%parse-param {...}"
              "%printer {...}"
              "%union {...}"
              "%parse-param {...}"
              "%printer {...}"
              "%union {...}"

-             BRACED_CODE action

              PROLOGUE EPILOGUE
 %printer { fprintf (stderr, "\"%s\"", $$); }
              PROLOGUE EPILOGUE
 %printer { fprintf (stderr, "\"%s\"", $$); }

-              STRING string_content
+             STRING string_content

 %printer { fprintf (stderr, "{\n%s\n}", $$); }
              "%destructor {...}"
              "%initial-action {...}"
 %printer { fprintf (stderr, "{\n%s\n}", $$); }
              "%destructor {...}"
              "%initial-action {...}"


@@ -174,7 +186,6 @@ static int current_prec = 0;
              "%parse-param {...}"
              "%printer {...}"
              "%union {...}"
              "%parse-param {...}"
              "%printer {...}"
              "%union {...}"

-             BRACED_CODE action

              PROLOGUE EPILOGUE
 %type <uniqstr> TYPE
 %printer { fprintf (stderr, "<%s>", $$); } TYPE
              PROLOGUE EPILOGUE
 %type <uniqstr> TYPE
 %printer { fprintf (stderr, "<%s>", $$); } TYPE


@@ -206,7 +217,11 @@ declaration:
   grammar_declaration
 | PROLOGUE                                 { prologue_augment ($1, @1); }
 | "%debug"                                 { debug_flag = true; }
   grammar_declaration
 | PROLOGUE                                 { prologue_augment ($1, @1); }
 | "%debug"                                 { debug_flag = true; }

-| "%define" string_content                 { muscle_insert ($2, "1"); }
+| "%define" string_content
+    {
+      static char one[] = "1";
+      muscle_insert ($2, one);
+    }

 | "%define" string_content string_content  { muscle_insert ($2, $3); }
 | "%defines"                               { defines_flag = true; }
 | "%error-verbose"                         { error_verbose = true; }
 | "%define" string_content string_content  { muscle_insert ($2, $3); }
 | "%defines"                               { defines_flag = true; }
 | "%error-verbose"                         { error_verbose = true; }


@@ -214,14 +229,14 @@ declaration:
 | "%expect-rr" INT                        { expected_rr_conflicts = $2; }
 | "%file-prefix" "=" string_content        { spec_file_prefix = $3; }
 | "%glr-parser"
 | "%expect-rr" INT                        { expected_rr_conflicts = $2; }
 | "%file-prefix" "=" string_content        { spec_file_prefix = $3; }
 | "%glr-parser"

-  {
-    nondeterministic_parser = true;
-    glr_parser = true;
-  }
+    {
+      nondeterministic_parser = true;
+      glr_parser = true;
+    }

 | "%initial-action {...}"
 | "%initial-action {...}"

-  {
-    muscle_code_grow ("initial_action", $1, @1);
-  }
+    {
+      muscle_code_grow ("initial_action", $1, @1);
+    }

 | "%lex-param {...}"                      { add_param ("lex_param", $1, @1); }
 | "%locations"                             { locations_flag = true; }
 | "%name-prefix" "=" string_content        { spec_name_prefix = $3; }
 | "%lex-param {...}"                      { add_param ("lex_param", $1, @1); }
 | "%locations"                             { locations_flag = true; }
 | "%name-prefix" "=" string_content        { spec_name_prefix = $3; }


@@ -247,9 +262,19 @@ grammar_declaration:
     }
 | "%union {...}"
     {
     }
 | "%union {...}"
     {

+      char const *body = $1;
+
+      if (typed)
+       {
+         /* Concatenate the union bodies, turning the first one's
+            trailing '}' into '\n', and omitting the second one's '{'.  */
+         char *code = muscle_find ("stype");
+         code[strlen (code) - 1] = '\n';
+         body++;
+       }
+

       typed = true;
       typed = true;

-      MUSCLE_INSERT_INT ("stype_line", @1.start.line);
-      muscle_insert ("stype", $1);
+      muscle_code_grow ("stype", body, @1);

     }
 | "%destructor {...}" symbols.1
     {
     }
 | "%destructor {...}" symbols.1
     {


@@ -262,7 +287,7 @@ grammar_declaration:
     {
       symbol_list *list;
       for (list = $2; list; list = list->next)
     {
       symbol_list *list;
       for (list = $2; list; list = list->next)

-       symbol_printer_set (list->sym, $1, list->location);
+       symbol_printer_set (list->sym, $1, @1);

       symbol_list_free ($2);
     }
 | "%default-prec"
       symbol_list_free ($2);
     }
 | "%default-prec"


@@ -336,24 +361,24 @@ symbol_def:
      }
 | ID
      {
      }
 | ID
      {

-       symbol_class_set ($1, current_class, @1);
+       symbol_class_set ($1, current_class, @1, true);

        symbol_type_set ($1, current_type, @1);
      }
 | ID INT
     {
        symbol_type_set ($1, current_type, @1);
      }
 | ID INT
     {

-      symbol_class_set ($1, current_class, @1);
+      symbol_class_set ($1, current_class, @1, true);

       symbol_type_set ($1, current_type, @1);
       symbol_user_token_number_set ($1, $2, @2);
     }
 | ID string_as_id
     {
       symbol_type_set ($1, current_type, @1);
       symbol_user_token_number_set ($1, $2, @2);
     }
 | ID string_as_id
     {

-      symbol_class_set ($1, current_class, @1);
+      symbol_class_set ($1, current_class, @1, true);

       symbol_type_set ($1, current_type, @1);
       symbol_make_alias ($1, $2, @$);
     }
 | ID INT string_as_id
     {
       symbol_type_set ($1, current_type, @1);
       symbol_make_alias ($1, $2, @$);
     }
 | ID INT string_as_id
     {

-      symbol_class_set ($1, current_class, @1);
+      symbol_class_set ($1, current_class, @1, true);

       symbol_type_set ($1, current_type, @1);
       symbol_user_token_number_set ($1, $2, @2);
       symbol_make_alias ($1, $3, @$);
       symbol_type_set ($1, current_type, @1);
       symbol_user_token_number_set ($1, $2, @2);
       symbol_make_alias ($1, $3, @$);


@@ -381,10 +406,6 @@ grammar:
 rules_or_grammar_declaration:
   rules
 | grammar_declaration ";"
 rules_or_grammar_declaration:
   rules
 | grammar_declaration ";"

-    {
-      if (yacc_flag)
-       complain_at (@$, _("POSIX forbids declarations in the grammar"));
-    }

 | error ";"
     {
       yyerrok;
 | error ";"
     {
       yyerrok;


@@ -407,7 +428,6 @@ rhs:
 | rhs symbol
     { grammar_current_rule_symbol_append ($2, @2); }
 | rhs action
 | rhs symbol
     { grammar_current_rule_symbol_append ($2, @2); }
 | rhs action

-    { grammar_current_rule_action_append ($2, @2); }

 | rhs "%prec" symbol
     { grammar_current_rule_prec_set ($3, @3); }
 | rhs "%dprec" INT
 | rhs "%prec" symbol
     { grammar_current_rule_prec_set ($3, @3); }
 | rhs "%dprec" INT


@@ -421,9 +441,21 @@ symbol:
 | string_as_id    { $$ = $1; }
 ;
 
 | string_as_id    { $$ = $1; }
 ;
 

+/* Handle the semantics of an action specially, with a mid-rule
+   action, so that grammar_current_rule_action_append is invoked
+   immediately after the braced code is read by the scanner.
+
+   This implementation relies on the LALR(1) parsing algorithm.
+   If grammar_current_rule_action_append were executed in a normal
+   action for this rule, then when the input grammar contains two
+   successive actions, the scanner would have to read both actions
+   before reducing this rule.  That wouldn't work, since the scanner
+   relies on all preceding input actions being processed by
+   grammar_current_rule_action_append before it scans the next
+   action.  */

 action:
 action:

+    { grammar_current_rule_action_append (last_string, last_braced_code_loc); }

   BRACED_CODE
   BRACED_CODE

-    { $$ = $1; }

 ;
 
 /* A string used as an ID: quote it.  */
 ;
 
 /* A string used as an ID: quote it.  */


@@ -431,7 +463,7 @@ string_as_id:
   STRING
     {
       $$ = symbol_get (quotearg_style (c_quoting_style, $1), @1);
   STRING
     {
       $$ = symbol_get (quotearg_style (c_quoting_style, $1), @1);

-      symbol_class_set ($$, token_sym, @1);
+      symbol_class_set ($$, token_sym, @1, false);

     }
 ;
 
     }
 ;