style: avoid %{...%} in our parser

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

diff --git a/src/parse-gram.y b/src/parse-gram.y
index e4d36cc7425a79ac83f019922cc5045dd5135877..8b57ce80b4c636080c806b1fdf25c5246a0e2a84 100644 (file)
--- a/src/parse-gram.y
+++ b/src/parse-gram.y
@@ -1,4 +1,4 @@
-%{/* Bison Grammar Parser                             -*- C -*-
+/* Bison Grammar Parser                             -*- C -*-

 
    Copyright (C) 2002-2013 Free Software Foundation, Inc.
 
 
    Copyright (C) 2002-2013 Free Software Foundation, Inc.
 


@@ -17,41 +17,30 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 

-#include <config.h>
-#include "system.h"
-
-#include "c-ctype.h"
-#include "complain.h"
-#include "conflicts.h"
-#include "files.h"
-#include "getargs.h"
-#include "gram.h"
-#include "muscle-tab.h"
-#include "named-ref.h"
-#include "quotearg.h"
-#include "reader.h"
-#include "symlist.h"
-#include "symtab.h"
-#include "scan-gram.h"
-#include "scan-code.h"
-#include "xmemdup0.h"
-
-#define YYLLOC_DEFAULT(Current, Rhs, N)  (Current) = lloc_default (Rhs, N)
-static YYLTYPE lloc_default (YYLTYPE const *, int);
-
-#define YY_LOCATION_PRINT(File, Loc) \
-          location_print (Loc, File)
-
-static void version_check (location const *loc, char const *version);
-
-static void gram_error (location const *, char const *);
-
-/* A string that describes a char (e.g., 'a' -> "'a'").  */
-static char const *char_name (char);
-%}
+%code requires
+{
+  #include "symlist.h"
+  #include "symtab.h"
+}

 
 %code
 {
 
 %code
 {

+  #include <config.h>
+  #include "system.h"
+
+  #include "c-ctype.h"
+  #include "complain.h"
+  #include "conflicts.h"
+  #include "files.h"
+  #include "getargs.h"
+  #include "gram.h"
+  #include "named-ref.h"
+  #include "quotearg.h"
+  #include "reader.h"
+  #include "scan-gram.h"
+  #include "scan-code.h"
+  #include "xmemdup0.h"
+

   static int current_prec = 0;
   static location current_lhs_location;
   static named_ref *current_lhs_named_ref;
   static int current_prec = 0;
   static location current_lhs_location;
   static named_ref *current_lhs_named_ref;


@@ -62,20 +51,21 @@ static char const *char_name (char);
   /** Set the new current left-hand side symbol, possibly common
    * to several right-hand side parts of rule.
    */
   /** Set the new current left-hand side symbol, possibly common
    * to several right-hand side parts of rule.
    */

-  static
-  void
-  current_lhs (symbol *sym, location loc, named_ref *ref)
-  {
-    current_lhs_symbol = sym;
-    current_lhs_location = loc;
-    /* In order to simplify memory management, named references for lhs
-       are always assigned by deep copy into the current symbol_list
-       node.  This is because a single named-ref in the grammar may
-       result in several uses when the user factors lhs between several
-       rules using "|".  Therefore free the parser's original copy.  */
-    free (current_lhs_named_ref);
-    current_lhs_named_ref = ref;
-  }
+  static void current_lhs (symbol *sym, location loc, named_ref *ref);
+
+  #define YYLLOC_DEFAULT(Current, Rhs, N)         \
+    (Current) = lloc_default (Rhs, N)
+  static YYLTYPE lloc_default (YYLTYPE const *, int);
+
+  #define YY_LOCATION_PRINT(File, Loc)            \
+    location_print (Loc, File)
+
+  static void version_check (location const *loc, char const *version);
+
+  static void gram_error (location const *, char const *);
+
+  /* A string that describes a char (e.g., 'a' -> "'a'").  */
+  static char const *char_name (char);

 
   #define YYTYPE_INT16 int_fast16_t
   #define YYTYPE_INT8 int_fast8_t
 
   #define YYTYPE_INT16 int_fast16_t
   #define YYTYPE_INT8 int_fast8_t


@@ -83,7 +73,7 @@ static char const *char_name (char);
   #define YYTYPE_UINT8 uint_fast8_t
 }
 
   #define YYTYPE_UINT8 uint_fast8_t
 }
 

-%define api.prefix "gram_"
+%define api.prefix {gram_}

 %define api.pure full
 %define locations
 %define parse.error verbose
 %define api.pure full
 %define locations
 %define parse.error verbose


@@ -101,23 +91,9 @@ static char const *char_name (char);
   boundary_set (&@$.end, current_file, 1, 1);
 }
 
   boundary_set (&@$.end, current_file, 1, 1);
 }
 

-%union
-{
-  assoc assoc;
-  char *code;
-  char const *chars;
-  int integer;
-  named_ref *named_ref;
-  symbol *symbol;
-  symbol_list *list;
-  uniqstr uniqstr;
-  unsigned char character;
-};
-

 /* Define the tokens together with their human representation.  */
 %token GRAM_EOF 0 "end of file"
 %token STRING     "string"
 /* Define the tokens together with their human representation.  */
 %token GRAM_EOF 0 "end of file"
 %token STRING     "string"

-%token INT        "integer"

 
 %token PERCENT_TOKEN       "%token"
 %token PERCENT_NTERM       "%nterm"
 
 %token PERCENT_TOKEN       "%token"
 %token PERCENT_NTERM       "%nterm"


@@ -182,18 +158,25 @@ static char const *char_name (char);
 %token TAG_ANY         "<*>"
 %token TAG_NONE        "<>"
 
 %token TAG_ANY         "<*>"
 %token TAG_NONE        "<>"
 

+%union {unsigned char character;}

 %type <character> CHAR
 %printer { fputs (char_name ($$), yyo); } CHAR
 
 /* braceless is not to be used for rule or symbol actions, as it
    calls code_props_plain_init.  */
 %type <character> CHAR
 %printer { fputs (char_name ($$), yyo); } CHAR
 
 /* braceless is not to be used for rule or symbol actions, as it
    calls code_props_plain_init.  */

-%type <chars> STRING "%{...%}" EPILOGUE braceless content.opt
+%union
+{
+  char *code;
+  char const *chars;
+};
+%type <chars> STRING "%{...%}" EPILOGUE braceless

 %type <code> "{...}" "%?{...}"
 %printer { fputs (quotearg_style (c_quoting_style, $$), yyo); }
          STRING
 %printer { fprintf (yyo, "{\n%s\n}", $$); }
 %type <code> "{...}" "%?{...}"
 %printer { fputs (quotearg_style (c_quoting_style, $$), yyo); }
          STRING
 %printer { fprintf (yyo, "{\n%s\n}", $$); }

-         braceless content.opt "{...}" "%{...%}" EPILOGUE
+         braceless "{...}" "%{...%}" EPILOGUE

 
 

+%union {uniqstr uniqstr;}

 %type <uniqstr> BRACKETED_ID ID ID_COLON PERCENT_FLAG TAG tag variable
 %printer { fputs ($$, yyo); } <uniqstr>
 %printer { fprintf (yyo, "[%s]", $$); } BRACKETED_ID
 %type <uniqstr> BRACKETED_ID ID ID_COLON PERCENT_FLAG TAG tag variable
 %printer { fputs ($$, yyo); } <uniqstr>
 %printer { fprintf (yyo, "[%s]", $$); } BRACKETED_ID


@@ -201,15 +184,22 @@ static char const *char_name (char);
 %printer { fprintf (yyo, "%%%s", $$); } PERCENT_FLAG
 %printer { fprintf (yyo, "<%s>", $$); } TAG tag
 
 %printer { fprintf (yyo, "%%%s", $$); } PERCENT_FLAG
 %printer { fprintf (yyo, "<%s>", $$); } TAG tag
 

-%type <integer> INT
+%union {int integer;};
+%token <integer> INT "integer"

 %printer { fprintf (yyo, "%d", $$); } <integer>
 
 %printer { fprintf (yyo, "%d", $$); } <integer>
 

+%union {symbol *symbol;}

 %type <symbol> id id_colon string_as_id symbol symbol.prec
 %printer { fprintf (yyo, "%s", $$->tag); } <symbol>
 %printer { fprintf (yyo, "%s:", $$->tag); } id_colon
 
 %type <symbol> id id_colon string_as_id symbol symbol.prec
 %printer { fprintf (yyo, "%s", $$->tag); } <symbol>
 %printer { fprintf (yyo, "%s:", $$->tag); } id_colon
 

+%union {assoc assoc;};

 %type <assoc> precedence_declarator
 %type <assoc> precedence_declarator

+
+%union {symbol_list *list;}

 %type <list>  symbols.1 symbols.prec generic_symlist generic_symlist_item
 %type <list>  symbols.1 symbols.prec generic_symlist generic_symlist_item

+
+%union {named_ref *named_ref;}

 %type <named_ref> named_ref.opt
 
 /*---------.
 %type <named_ref> named_ref.opt
 
 /*---------.


@@ -217,8 +207,6 @@ static char const *char_name (char);
 `---------*/
 %code requires
 {
 `---------*/
 %code requires
 {

-# ifndef PARAM_TYPE
-#  define PARAM_TYPE

   typedef enum
   {
     param_none   = 0,
   typedef enum
   {
     param_none   = 0,


@@ -226,7 +214,6 @@ static char const *char_name (char);
     param_parse  = 1 << 1,
     param_both   = param_lex | param_parse
   } param_type;
     param_parse  = 1 << 1,
     param_both   = param_lex | param_parse
   } param_type;

-# endif

 };
 %code
 {
 };
 %code
 {


@@ -239,17 +226,14 @@ static char const *char_name (char);
   static void add_param (param_type type, char *decl, location loc);
   static param_type current_param = param_none;
 };
   static void add_param (param_type type, char *decl, location loc);
   static param_type current_param = param_none;
 };

-%union
-{
-  param_type param;
-}
+%union {param_type param;}

 %token <param> PERCENT_PARAM "%param";
 %printer
 {
   switch ($$)
     {
 #define CASE(In, Out)                                           \
 %token <param> PERCENT_PARAM "%param";
 %printer
 {
   switch ($$)
     {
 #define CASE(In, Out)                                           \

-      case param_ ## In: fputs ("%" #Out, stderr); break
+      case param_ ## In: fputs ("%" #Out, yyo); break

       CASE (lex,   lex-param);
       CASE (parse, parse-param);
       CASE (both,  param);
       CASE (lex,   lex-param);
       CASE (parse, parse-param);
       CASE (both,  param);


@@ -294,9 +278,9 @@ prologue_declaration:
     {
       muscle_percent_define_ensure ($1, @1, true);
     }
     {
       muscle_percent_define_ensure ($1, @1, true);
     }

-| "%define" variable content.opt
+| "%define" variable value

     {
     {

-      muscle_percent_define_insert ($2, @2, $3,
+      muscle_percent_define_insert ($2, @2, $3.kind, $3.chars,

                                     MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE);
     }
 | "%defines"                       { defines_flag = true; }
                                     MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE);
     }
 | "%defines"                       { defines_flag = true; }


@@ -307,7 +291,8 @@ prologue_declaration:
     }
 | "%error-verbose"
     {
     }
 | "%error-verbose"
     {

-      muscle_percent_define_insert ("parse.error", @1, "verbose",
+      muscle_percent_define_insert ("parse.error", @1, muscle_keyword,
+                                    "verbose",

                                     MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE);
     }
 | "%expect" INT                    { expected_sr_conflicts = $2; }
                                     MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE);
     }
 | "%expect" INT                    { expected_sr_conflicts = $2; }


@@ -640,9 +625,9 @@ named_ref.opt:
 | BRACKETED_ID   { $$ = named_ref_new($1, @1); }
 ;
 
 | BRACKETED_ID   { $$ = named_ref_new($1, @1); }
 ;
 

-/*---------------------------.
-| variable and content.opt.  |
-`---------------------------*/
+/*---------------------.
+| variable and value.  |
+`---------------------*/

 
 /* The STRING form of variable is deprecated and is not M4-friendly.
    For example, M4 fails for '%define "[" "value"'.  */
 
 /* The STRING form of variable is deprecated and is not M4-friendly.
    For example, M4 fails for '%define "[" "value"'.  */


@@ -652,10 +637,31 @@ variable:
 ;
 
 /* Some content or empty by default. */
 ;
 
 /* Some content or empty by default. */

-content.opt:
-  %empty    { $$ = ""; }
-| ID        { $$ = $1; }
-| STRING    { $$ = $1; }
+%code requires {#include "muscle-tab.h"};
+%union
+{
+  struct
+  {
+    char const *chars;
+    muscle_kind kind;
+  } value;
+};
+%type <value> value;
+%printer
+{
+  switch ($$.kind)
+    {
+    case muscle_code:    fprintf (yyo,  "{%s}",  $$.chars); break;
+    case muscle_keyword: fprintf (yyo,   "%s",   $$.chars); break;
+    case muscle_string:  fprintf (yyo, "\"%s\"", $$.chars); break;
+    }
+} <value>;
+
+value:
+  %empty    { $$.kind = muscle_keyword; $$.chars = ""; }
+| ID        { $$.kind = muscle_keyword; $$.chars = $1; }
+| STRING    { $$.kind = muscle_string;  $$.chars = $1; }
+| braceless { $$.kind = muscle_code;    $$.chars = $1; }

 ;
 
 
 ;
 
 


@@ -667,7 +673,7 @@ braceless:
   "{...}"
     {
       code_props plain_code;
   "{...}"
     {
       code_props plain_code;

-      $1[strlen ($1) - 1] = '\n';
+      $1[strlen ($1) - 1] = '\0';

       code_props_plain_init (&plain_code, $1+1, @1);
       code_props_translate_code (&plain_code);
       gram_scanner_last_string_free ();
       code_props_plain_init (&plain_code, $1+1, @1);
       code_props_translate_code (&plain_code);
       gram_scanner_last_string_free ();


@@ -839,3 +845,18 @@ char_name (char c)
       return quotearg_style (escape_quoting_style, buf);
     }
 }
       return quotearg_style (escape_quoting_style, buf);
     }
 }

+
+static
+void
+current_lhs (symbol *sym, location loc, named_ref *ref)
+{
+  current_lhs_symbol = sym;
+  current_lhs_location = loc;
+  /* In order to simplify memory management, named references for lhs
+     are always assigned by deep copy into the current symbol_list
+     node.  This is because a single named-ref in the grammar may
+     result in several uses when the user factors lhs between several
+     rules using "|".  Therefore free the parser's original copy.  */
+  free (current_lhs_named_ref);
+  current_lhs_named_ref = ref;
+}