Support a file name argument to %defines. Deprecate `=' in

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

diff --git a/src/parse-gram.y b/src/parse-gram.y
index 9933ecdad7e3574c13f9b1688c9a5f09d893e39b..aabace130e1c0f152c8e28af947ac816de3f53fe 100644 (file)
--- a/src/parse-gram.y
+++ b/src/parse-gram.y
@@ -23,6 +23,8 @@
 #include <config.h>
 #include "system.h"
 
 #include <config.h>
 #include "system.h"
 

+#include <strverscmp.h>
+

 #include "complain.h"
 #include "conflicts.h"
 #include "files.h"
 #include "complain.h"
 #include "conflicts.h"
 #include "files.h"


@@ -34,7 +36,6 @@
 #include "symlist.h"
 #include "scan-gram.h"
 #include "scan-code.h"
 #include "symlist.h"
 #include "scan-gram.h"
 #include "scan-code.h"

-#include "strverscmp.h"

 
 #define YYLLOC_DEFAULT(Current, Rhs, N)  (Current) = lloc_default (Rhs, N)
 static YYLTYPE lloc_default (YYLTYPE const *, int);
 
 #define YYLLOC_DEFAULT(Current, Rhs, N)  (Current) = lloc_default (Rhs, N)
 static YYLTYPE lloc_default (YYLTYPE const *, int);


@@ -53,26 +54,25 @@ static void gram_error (location const *, char const *);
 
 static char const *char_name (char);
 
 
 static char const *char_name (char);
 

-static void add_param (char const *, char *, location);
+/** Add a lex-param or a parse-param.
+ *
+ * \param type  \a lex_param or \a parse_param
+ * \param decl  the formal argument
+ * \param loc   the location in the source.
+ */
+static void add_param (char const *type, char *decl, location loc);
+

 
 static symbol_class current_class = unknown_sym;
 
 static symbol_class current_class = unknown_sym;

-static uniqstr current_type = 0;
+static uniqstr current_type = NULL;

 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
+#define YYTYPE_INT16 int_fast16_t
+#define YYTYPE_INT8 int_fast8_t
+#define YYTYPE_UINT16 uint_fast16_t
+#define YYTYPE_UINT8 uint_fast8_t

 %}
 
 %debug
 %}
 
 %debug


@@ -83,22 +83,23 @@ static int current_prec = 0;
 %error-verbose
 %defines
 %name-prefix="gram_"
 %error-verbose
 %defines
 %name-prefix="gram_"

+%expect 0

 
 %initial-action
 {
   /* Bison's grammar can initial empty locations, hence a default
      location is needed. */
 
 %initial-action
 {
   /* Bison's grammar can initial empty locations, hence a default
      location is needed. */

-  boundary_set (&@$.start, current_file, 1, 0);
-  boundary_set (&@$.end, current_file, 1, 0);
+  boundary_set (&@$.start, current_file, 1, 1);
+  boundary_set (&@$.end, current_file, 1, 1);

 }
 
 }
 

-/* Only NUMBERS have a value.  */

 %union
 {
   symbol *symbol;
   symbol_list *list;
   int integer;
 %union
 {
   symbol *symbol;
   symbol_list *list;
   int integer;

-  char *chars;
+  char const *chars;
+  char *code;

   assoc assoc;
   uniqstr uniqstr;
   unsigned char character;
   assoc assoc;
   uniqstr uniqstr;
   unsigned char character;


@@ -130,6 +131,8 @@ static int current_prec = 0;
 `----------------------*/
 
 %token
 `----------------------*/
 
 %token

+  PERCENT_CODE            "%code"
+  PERCENT_CODE_TOP        "%code-top"

   PERCENT_DEBUG           "%debug"
   PERCENT_DEFAULT_PREC    "%default-prec"
   PERCENT_DEFINE          "%define"
   PERCENT_DEBUG           "%debug"
   PERCENT_DEFAULT_PREC    "%default-prec"
   PERCENT_DEFINE          "%define"


@@ -149,8 +152,11 @@ static int current_prec = 0;
                          "%nondeterministic-parser"
   PERCENT_OUTPUT          "%output"
   PERCENT_PARSE_PARAM     "%parse-param"
                          "%nondeterministic-parser"
   PERCENT_OUTPUT          "%output"
   PERCENT_PARSE_PARAM     "%parse-param"

+  PERCENT_PROVIDES        "%provides"

   PERCENT_PURE_PARSER     "%pure-parser"
   PERCENT_PURE_PARSER     "%pure-parser"

+  PERCENT_PUSH_PARSER     "%push-parser"

   PERCENT_REQUIRE        "%require"
   PERCENT_REQUIRE        "%require"

+  PERCENT_REQUIRES        "%requires"

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


@@ -169,14 +175,20 @@ static int current_prec = 0;
 %token PROLOGUE        "%{...%}"
 %token SEMICOLON       ";"
 %token TYPE            "type"
 %token PROLOGUE        "%{...%}"
 %token SEMICOLON       ";"
 %token TYPE            "type"

+%token TYPE_TAG_ANY    "<*>"
+%token TYPE_TAG_NONE   "<>"

 
 %type <character> CHAR
 %printer { fputs (char_name ($$), stderr); } CHAR
 
 
 %type <character> CHAR
 %printer { fputs (char_name ($$), stderr); } CHAR
 

-%type <chars> STRING string_content "{...}" PROLOGUE EPILOGUE
+/* braceless is not to be used for rule or symbol actions, as it
+   calls translate_code. */
+%type <chars> STRING "%{...%}" EPILOGUE braceless content content.opt
+%type <code> "{...}"

 %printer { fputs (quotearg_style (c_quoting_style, $$), stderr); }
 %printer { fputs (quotearg_style (c_quoting_style, $$), stderr); }

-         STRING string_content
-%printer { fprintf (stderr, "{\n%s\n}", $$); } "{...}" PROLOGUE EPILOGUE
+        STRING
+%printer { fprintf (stderr, "{\n%s\n}", $$); }
+        braceless content content.opt "{...}" "%{...%}" EPILOGUE

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


@@ -191,11 +203,11 @@ static int current_prec = 0;
 %printer { fprintf (stderr, "%s:", $$->tag); } id_colon
 
 %type <assoc> precedence_declarator
 %printer { fprintf (stderr, "%s:", $$->tag); } id_colon
 
 %type <assoc> precedence_declarator

-%type <list>  symbols.1
+%type <list>  symbols.1 generic_symlist generic_symlist_item

 %%
 
 input:
 %%
 
 input:

-  declarations "%%" grammar epilogue.opt
+  prologue_declarations "%%" grammar epilogue.opt

 ;
 
 
 ;
 
 


@@ -203,27 +215,27 @@ input:
        | Declarations: before the first %%.  |
        `------------------------------------*/
 
        | Declarations: before the first %%.  |
        `------------------------------------*/
 

-declarations:
+prologue_declarations:

   /* Nothing */
   /* Nothing */

-| declarations declaration
+| prologue_declarations prologue_declaration

 ;
 
 ;
 

-declaration:
+prologue_declaration:

   grammar_declaration
   grammar_declaration

-| PROLOGUE                         { prologue_augment (translate_code ($1, @1),
-                                                      @1); }
-| "%debug"                                 { debug_flag = true; }
-| "%define" string_content
+| "%{...%}"     { prologue_augment (translate_code ($1, @1), @1, union_seen); }
+| "%debug"                         { debug_flag = true; }
+| "%define" STRING content.opt     { muscle_insert ($2, $3); }
+| "%defines"                       { defines_flag = true; }
+| "%defines" STRING

     {
     {

-      static char one[] = "1";
-      muscle_insert ($2, one);
+      defines_flag = true;
+      spec_defines_file = xstrdup ($2);

     }
     }

-| "%define" string_content string_content  { muscle_insert ($2, $3); }
-| "%defines"                               { defines_flag = true; }
-| "%error-verbose"                         { error_verbose = true; }
-| "%expect" INT                            { expected_sr_conflicts = $2; }
-| "%expect-rr" INT                        { expected_rr_conflicts = $2; }
-| "%file-prefix" "=" string_content        { spec_file_prefix = $3; }
+| "%error-verbose"                 { error_verbose = true; }
+| "%expect" INT                    { expected_sr_conflicts = $2; }
+| "%expect-rr" INT                { expected_rr_conflicts = $2; }
+| "%file-prefix" STRING            { spec_file_prefix = $2; }
+| "%file-prefix" "=" STRING        { spec_file_prefix = $3; } /* deprecated */

 | "%glr-parser"
     {
       nondeterministic_parser = true;
 | "%glr-parser"
     {
       nondeterministic_parser = true;


@@ -233,19 +245,22 @@ declaration:
     {
       muscle_code_grow ("initial_action", translate_symbol_action ($2, @2), @2);
     }
     {
       muscle_code_grow ("initial_action", translate_symbol_action ($2, @2), @2);
     }

-| "%lex-param" "{...}"                    { add_param ("lex_param", $2, @2); }
-| "%locations"                             { locations_flag = true; }
-| "%name-prefix" "=" string_content        { spec_name_prefix = $3; }
-| "%no-lines"                              { no_lines_flag = true; }
-| "%nondeterministic-parser"              { nondeterministic_parser = true; }
-| "%output" "=" string_content             { spec_outfile = $3; }
-| "%parse-param" "{...}"                  { add_param ("parse_param", $2, @2); }
-| "%pure-parser"                           { pure_parser = true; }
-| "%require" string_content                { version_check (&@2, $2); }
-| "%skeleton" string_content               { skeleton = $2; }
-| "%token-table"                           { token_table_flag = true; }
-| "%verbose"                               { report_flag = report_states; }
-| "%yacc"                                  { yacc_flag = true; }
+| "%lex-param" "{...}"         { add_param ("lex_param", $2, @2); }
+| "%locations"                  { locations_flag = true; }
+| "%name-prefix" STRING         { spec_name_prefix = $2; }
+| "%name-prefix" "=" STRING     { spec_name_prefix = $3; } /* deprecated */
+| "%no-lines"                   { no_lines_flag = true; }
+| "%nondeterministic-parser"   { nondeterministic_parser = true; }
+| "%output" STRING              { spec_outfile = $2; }
+| "%output" "=" STRING          { spec_outfile = $3; }  /* deprecated */
+| "%parse-param" "{...}"       { add_param ("parse_param", $2, @2); }
+| "%pure-parser"                { pure_parser = true; }
+| "%push-parser"                { push_parser = true; }
+| "%require" STRING             { version_check (&@2, $2); }
+| "%skeleton" STRING            { skeleton = $2; }
+| "%token-table"                { token_table_flag = true; }
+| "%verbose"                    { report_flag = report_states; }
+| "%yacc"                       { yacc_flag = true; }

 | /*FIXME: Err?  What is this horror doing here? */ ";"
 ;
 
 | /*FIXME: Err?  What is this horror doing here? */ ";"
 ;
 


@@ -256,20 +271,20 @@ grammar_declaration:
     {
       grammar_start_symbol_set ($2, @2);
     }
     {
       grammar_start_symbol_set ($2, @2);
     }

-| "%destructor" "{...}" symbols.1
+| "%destructor" "{...}" generic_symlist

     {
       symbol_list *list;
       const char *action = translate_symbol_action ($2, @2);
       for (list = $3; list; list = list->next)
     {
       symbol_list *list;
       const char *action = translate_symbol_action ($2, @2);
       for (list = $3; list; list = list->next)

-       symbol_destructor_set (list->sym, action, @2);
+       symbol_list_destructor_set (list, action, @2);

       symbol_list_free ($3);
     }
       symbol_list_free ($3);
     }

-| "%printer" "{...}" symbols.1
+| "%printer" "{...}" generic_symlist

     {
       symbol_list *list;
       const char *action = translate_symbol_action ($2, @2);
       for (list = $3; list; list = list->next)
     {
       symbol_list *list;
       const char *action = translate_symbol_action ($2, @2);
       for (list = $3; list; list = list->next)

-       symbol_printer_set (list->sym, action, @2);
+       symbol_list_printer_set (list, action, @2);

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


@@ -280,6 +295,10 @@ grammar_declaration:
     {
       default_prec = false;
     }
     {
       default_prec = false;
     }

+| "%code" braceless      { prologue_augment ($2, @2, true); }
+| "%code-top" braceless  { prologue_augment ($2, @2, false); }
+| "%provides" braceless  { muscle_code_grow ("provides", $2, @2); }
+| "%requires" braceless  { muscle_code_grow ("requires", $2, @2); }

 ;
 
 
 ;
 
 


@@ -299,16 +318,22 @@ grammar_declaration:
     {
       char const *body = $3;
 
     {
       char const *body = $3;
 

-      if (typed)
+      /* Concatenate the %union bodies.  If this is the first %union, make sure
+        the synchronization line appears after the opening '{' so as not to
+        confuse Doxygen.  Otherwise, turn the previous %union's trailing '}'
+        into '\n', and omit the new %union's leading '{'.  */
+      if (!union_seen)
+       {
+         muscle_grow ("stype", "{", "");
+       }
+      else

        {
        {

-         /* 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';
          char *code = muscle_find ("stype");
          code[strlen (code) - 1] = '\n';

-         body++;

        }
        }

+      body++;

 
 

-      typed = true;
+      union_seen = true;

       muscle_code_grow ("stype", body, @3);
     }
 ;
       muscle_code_grow ("stype", body, @3);
     }
 ;


@@ -330,8 +355,9 @@ symbol_declaration:
 | "%type" TYPE symbols.1
     {
       symbol_list *list;
 | "%type" TYPE symbols.1
     {
       symbol_list *list;

+      tag_seen = true;

       for (list = $3; list; list = list->next)
       for (list = $3; list; list = list->next)

-       symbol_type_set (list->sym, $2, @2);
+       symbol_type_set (list->content.sym, $2, @2);

       symbol_list_free ($3);
     }
 ;
       symbol_list_free ($3);
     }
 ;


@@ -343,8 +369,8 @@ precedence_declaration:
       ++current_prec;
       for (list = $3; list; list = list->next)
        {
       ++current_prec;
       for (list = $3; list; list = list->next)
        {

-         symbol_type_set (list->sym, current_type, @2);
-         symbol_precedence_set (list->sym, current_prec, $1, @1);
+         symbol_type_set (list->content.sym, current_type, @2);
+         symbol_precedence_set (list->content.sym, current_prec, $1, @1);

        }
       symbol_list_free ($3);
       current_type = NULL;
        }
       symbol_list_free ($3);
       current_type = NULL;


@@ -359,13 +385,27 @@ precedence_declarator:
 
 type.opt:
   /* Nothing. */ { current_type = NULL; }
 
 type.opt:
   /* Nothing. */ { current_type = NULL; }

-| TYPE           { current_type = $1; }
+| TYPE           { current_type = $1; tag_seen = true; }

 ;
 
 ;
 

-/* One or more nonterminals to be %typed. */
+/* One or more symbols to be %typed. */

 symbols.1:
 symbols.1:

-  symbol            { $$ = symbol_list_new ($1, @1); }
-| symbols.1 symbol  { $$ = symbol_list_prepend ($1, $2, @2); }
+  symbol
+    { $$ = symbol_list_sym_new ($1, @1); }
+| symbols.1 symbol
+    { $$ = symbol_list_prepend ($1, symbol_list_sym_new ($2, @2)); }
+;
+
+generic_symlist:
+  generic_symlist_item { $$ = $1; }
+| generic_symlist generic_symlist_item { $$ = symbol_list_prepend ($1, $2); }
+;
+
+generic_symlist_item:
+  symbol            { $$ = symbol_list_sym_new ($1, @1); }
+| TYPE              { $$ = symbol_list_type_new ($1, @1); }
+| "<*>"             { $$ = symbol_list_default_tagged_new (@1); }
+| "<>"             { $$ = symbol_list_default_tagless_new (@1); }

 ;
 
 /* One token definition.  */
 ;
 
 /* One token definition.  */


@@ -373,6 +413,7 @@ symbol_def:
   TYPE
      {
        current_type = $1;
   TYPE
      {
        current_type = $1;

+       tag_seen = true;

      }
 | id
      {
      }
 | id
      {


@@ -443,8 +484,7 @@ rhs:
 | rhs symbol
     { grammar_current_rule_symbol_append ($2, @2); }
 | rhs "{...}"
 | rhs symbol
     { grammar_current_rule_symbol_append ($2, @2); }
 | rhs "{...}"

-    { grammar_current_rule_action_append (gram_last_string,
-                                         gram_last_braced_code_loc); }
+    { 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


@@ -454,6 +494,35 @@ rhs:
 ;
 
 
 ;
 
 

+/*-----------*
+ | content.  |
+ *-----------*/
+
+content:
+  STRING
+| braceless
+;
+
+/* Some content or "1" by default. */
+content.opt:
+  /* Nothing. */
+    {
+      static char one[] = "1";
+      $$ = one;
+    }
+| content
+;
+
+
+braceless:
+  "{...}"
+    {
+      $1[strlen ($1) - 1] = '\n';
+      $$ = translate_code ($1 + 1, @1);
+    }
+;
+
+

 /*---------------*
  | Identifiers.  |
  *---------------*/
 /*---------------*
  | Identifiers.  |
  *---------------*/


@@ -491,13 +560,6 @@ string_as_id:
     }
 ;
 
     }
 ;
 

-/* A string used for its contents.  Don't quote it.  */
-string_content:
-  STRING
-    { $$ = $1; }
-;
-
-

 epilogue.opt:
   /* Nothing.  */
 | "%%" EPILOGUE
 epilogue.opt:
   /* Nothing.  */
 | "%%" EPILOGUE


@@ -591,6 +653,7 @@ add_param (char const *type, char *decl, location loc)
   gram_scanner_last_string_free ();
 }
 
   gram_scanner_last_string_free ();
 }
 

+

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