(nullable_compute): Do not subtract from the returned value of malloc.

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

diff --git a/src/parse-gram.y b/src/parse-gram.y
index dcdd9f52e530bb7e5d33191123c5f273d60a7ccf..3a6de2ff57ac6b8a0e50ce9c8a75d7f37cb279c2 100644 (file)
--- a/src/parse-gram.y
+++ b/src/parse-gram.y
@@ -30,65 +30,55 @@
 
 %{
 #include "system.h"
 
 %{
 #include "system.h"

+

 #include "complain.h"
 #include "complain.h"

-#include "muscle_tab.h"
+#include "conflicts.h"

 #include "files.h"
 #include "getargs.h"
 #include "files.h"
 #include "getargs.h"

-#include "output.h"
-#include "symlist.h"

 #include "gram.h"
 #include "gram.h"

+#include "muscle_tab.h"
+#include "output.h"

 #include "reader.h"
 #include "reader.h"

-#include "conflicts.h"
+#include "symlist.h"

 
 /* Produce verbose syntax errors.  */
 #define YYERROR_VERBOSE 1
 
 /* Produce verbose syntax errors.  */
 #define YYERROR_VERBOSE 1

-#define YYLLOC_DEFAULT(Current, Rhs, N)                        \
-do {                                                   \
-  if (N)                                               \
-  {                                                    \
-    Current.first_column  = Rhs[1].first_column;       \
-    Current.first_line    = Rhs[1].first_line;         \
-    Current.last_column   = Rhs[N].last_column;                \
-    Current.last_line     = Rhs[N].last_line;          \
-  }                                                    \
-  else                                                 \
-  {                                                    \
-    Current = Rhs[0];                                  \
-  }                                                    \
-} while (0)
+
+#define YYLLOC_DEFAULT(Current, Rhs, N)  (Current) = lloc_default (Rhs, N)
+static YYLTYPE lloc_default (YYLTYPE const *, int);

 
 /* Request detailed syntax error messages, and pass them to GRAM_ERROR.
    FIXME: depends on the undocumented availability of YYLLOC.  */
 #undef  yyerror
 #define yyerror(Msg) \
         gram_error (&yylloc, Msg)
 
 /* Request detailed syntax error messages, and pass them to GRAM_ERROR.
    FIXME: depends on the undocumented availability of YYLLOC.  */
 #undef  yyerror
 #define yyerror(Msg) \
         gram_error (&yylloc, Msg)

-static void gram_error (location_t const *, char const *);
+static void gram_error (location const *, char const *);

 
 #define YYPRINT(File, Type, Value) \
        print_token_value (File, Type, &Value)
 static void print_token_value (FILE *, int, YYSTYPE const *);
 
 
 #define YYPRINT(File, Type, Value) \
        print_token_value (File, Type, &Value)
 static void print_token_value (FILE *, int, YYSTYPE const *);
 

-static void add_param (char const *, char const *, location_t);
+static void add_param (char const *, char const *, location);

 
 symbol_class current_class = unknown_sym;
 
 symbol_class current_class = unknown_sym;

-struniq_t current_type = 0;
-symbol_t *current_lhs;
-location_t current_lhs_location;
-assoc_t current_assoc;
+uniqstr current_type = 0;
+symbol *current_lhs;
+location current_lhs_location;
+assoc current_assoc;

 int current_prec = 0;
 int current_prec = 0;

-braced_code_t current_braced_code = action_braced_code;
+braced_code current_braced_code = action_braced_code;

 %}
 
 
 /* Only NUMBERS have a value.  */
 %union
 {
 %}
 
 
 /* Only NUMBERS have a value.  */
 %union
 {

-  symbol_t *symbol;
-  symbol_list_t *list;
+  symbol *symbol;
+  symbol_list *list;

   int integer;
   int integer;

-  char *string;
-  assoc_t assoc;
-  struniq_t struniq;
+  char *chars;
+  assoc assoc;
+  uniqstr uniqstr;

 };
 
 /* Define the tokens together with their human representation.  */
 };
 
 /* Define the tokens together with their human representation.  */


@@ -143,21 +133,21 @@ braced_code_t current_braced_code = action_braced_code;
 %token TYPE            "type"
 %token EQUAL           "="
 %token SEMICOLON       ";"
 %token TYPE            "type"
 %token EQUAL           "="
 %token SEMICOLON       ";"

-%token COLON           ":"

 %token PIPE            "|"
 %token ID              "identifier"
 %token PIPE            "|"
 %token ID              "identifier"

+%token ID_COLON        "identifier:"

 %token PERCENT_PERCENT "%%"
 %token PROLOGUE        "%{...%}"
 %token EPILOGUE        "epilogue"
 %token BRACED_CODE     "{...}"
 
 
 %token PERCENT_PERCENT "%%"
 %token PROLOGUE        "%{...%}"
 %token EPILOGUE        "epilogue"
 %token BRACED_CODE     "{...}"
 
 

-%type <string> STRING string_content
-               BRACED_CODE code_content action
-               PROLOGUE EPILOGUE
-%type <struniq> TYPE
+%type <chars> STRING string_content
+             BRACED_CODE code_content action
+             PROLOGUE EPILOGUE
+%type <uniqstr> TYPE

 %type <integer> INT
 %type <integer> INT

-%type <symbol> ID symbol string_as_id
+%type <symbol> ID ID_COLON symbol string_as_id

 %type <assoc> precedence_declarator
 %type <list>  symbols.1
 %%
 %type <assoc> precedence_declarator
 %type <list>  symbols.1
 %%


@@ -173,7 +163,7 @@ input:
 
 declarations:
   /* Nothing */
 
 declarations:
   /* Nothing */

-| declarations declaration semi_colon.opt
+| declarations declaration

 ;
 
 declaration:
 ;
 
 declaration:


@@ -197,6 +187,7 @@ declaration:
 | "%token-table"                           { token_table_flag = 1; }
 | "%verbose"                               { report_flag = 1; }
 | "%yacc"                                  { yacc_flag = 1; }
 | "%token-table"                           { token_table_flag = 1; }
 | "%verbose"                               { report_flag = 1; }
 | "%yacc"                                  { yacc_flag = 1; }

+| ";"

 ;
 
 grammar_declaration:
 ;
 
 grammar_declaration:


@@ -209,14 +200,14 @@ grammar_declaration:
 | "%union" BRACED_CODE
     {
       typed = 1;
 | "%union" BRACED_CODE
     {
       typed = 1;

-      MUSCLE_INSERT_INT ("stype_line", @2.first_line);
+      MUSCLE_INSERT_INT ("stype_line", @2.start.line);

       muscle_insert ("stype", $2);
     }
 | "%destructor"
     { current_braced_code = destructor_braced_code; }
   BRACED_CODE symbols.1
     {
       muscle_insert ("stype", $2);
     }
 | "%destructor"
     { current_braced_code = destructor_braced_code; }
   BRACED_CODE symbols.1
     {

-      symbol_list_t *list;
+      symbol_list *list;

       for (list = $4; list; list = list->next)
        symbol_destructor_set (list->sym, $3, @3);
       symbol_list_free ($4);
       for (list = $4; list; list = list->next)
        symbol_destructor_set (list->sym, $3, @3);
       symbol_list_free ($4);


@@ -226,7 +217,7 @@ grammar_declaration:
     { current_braced_code = printer_braced_code; }
   BRACED_CODE symbols.1
     {
     { current_braced_code = printer_braced_code; }
   BRACED_CODE symbols.1
     {

-      symbol_list_t *list;
+      symbol_list *list;

       for (list = $4; list; list = list->next)
        symbol_printer_set (list->sym, $3, list->location);
       symbol_list_free ($4);
       for (list = $4; list; list = list->next)
        symbol_printer_set (list->sym, $3, list->location);
       symbol_list_free ($4);


@@ -247,7 +238,7 @@ symbol_declaration:
     }
 | "%type" TYPE symbols.1
     {
     }
 | "%type" TYPE symbols.1
     {

-      symbol_list_t *list;
+      symbol_list *list;

       for (list = $3; list; list = list->next)
        symbol_type_set (list->sym, $2, @2);
       symbol_list_free ($3);
       for (list = $3; list; list = list->next)
        symbol_type_set (list->sym, $2, @2);
       symbol_list_free ($3);


@@ -257,7 +248,7 @@ symbol_declaration:
 precedence_declaration:
   precedence_declarator type.opt symbols.1
     {
 precedence_declaration:
   precedence_declarator type.opt symbols.1
     {

-      symbol_list_t *list;
+      symbol_list *list;

       ++current_prec;
       for (list = $3; list; list = list->next)
        {
       ++current_prec;
       for (list = $3; list; list = list->next)
        {


@@ -322,9 +313,7 @@ symbol_def:
 /* One or more symbol definitions. */
 symbol_defs.1:
   symbol_def
 /* One or more symbol definitions. */
 symbol_defs.1:
   symbol_def

-    {;}

 | symbol_defs.1 symbol_def
 | symbol_defs.1 symbol_def

-    {;}

 ;
 
 
 ;
 
 


@@ -338,11 +327,10 @@ grammar:
 ;
 
 /* As a Bison extension, one can use the grammar declarations in the
 ;
 
 /* As a Bison extension, one can use the grammar declarations in the

-   body of the grammar.  But to remain LALR(1), they must be ended
-   with a semi-colon.  */
+   body of the grammar.  */

 rules_or_grammar_declaration:
   rules
 rules_or_grammar_declaration:
   rules

-| grammar_declaration ";"
+| grammar_declaration

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


@@ -351,11 +339,11 @@ rules_or_grammar_declaration:
     {
       yyerrok;
     }
     {
       yyerrok;
     }

+| ";"

 ;
 
 rules:
 ;
 
 rules:

-  ID ":" { current_lhs = $1; current_lhs_location = @1; } rhses.1 ";"
-    {;}
+  ID_COLON { current_lhs = $1; current_lhs_location = @1; } rhses.1

 ;
 
 rhses.1:
 ;
 
 rhses.1:


@@ -424,13 +412,44 @@ epilogue.opt:
     }
 ;
 
     }
 ;
 

-semi_colon.opt:
-  /* Nothing.  */
-| ";"
-;

 %%
 %%

+
+
+/* Return the location of the left-hand side of a rule whose
+   right-hand side is RHS[1] ... RHS[N].  Ignore empty nonterminals in
+   the right-hand side, and return an empty location equal to the end
+   boundary of RHS[0] if the right-hand side is empty.  */
+
+static YYLTYPE
+lloc_default (YYLTYPE const *rhs, int n)
+{
+  int i;
+  int j;
+  YYLTYPE r;
+  r.start = r.end = rhs[n].end;
+
+  for (i = 1; i <= n; i++)
+    if (! equal_boundaries (rhs[i].start, rhs[i].end))
+      {
+       r.start = rhs[i].start;
+
+       for (j = n; i < j; j--)
+         if (! equal_boundaries (rhs[j].start, rhs[j].end))
+           break;
+       r.end = rhs[j].end;
+
+       break;
+      }
+
+  return r;
+}
+
+
+/* Add a lex-param or a parse-param (depending on TYPE) with
+   declaration DECL and location LOC.  */
+

 static void
 static void

-add_param (char const *type, char const *decl, location_t loc)
+add_param (char const *type, char const *decl, location loc)

 {
   static char const alphanum[] =
     "0123456789"
 {
   static char const alphanum[] =
     "0123456789"


@@ -486,17 +505,17 @@ print_token_value (FILE *file, int type, YYSTYPE const *value)
       break;
 
     case STRING:
       break;
 
     case STRING:

-      fprintf (file, " = \"%s\"", value->string);
+      fprintf (file, " = \"%s\"", value->chars);

       break;
 
     case TYPE:
       break;
 
     case TYPE:

-      fprintf (file, " = <%s>", value->struniq);
+      fprintf (file, " = <%s>", value->uniqstr);

       break;
 
     case BRACED_CODE:
     case PROLOGUE:
     case EPILOGUE:
       break;
 
     case BRACED_CODE:
     case PROLOGUE:
     case EPILOGUE:

-      fprintf (file, " = {{ %s }}", value->string);
+      fprintf (file, " = {{ %s }}", value->chars);

       break;
 
     default:
       break;
 
     default:


@@ -506,7 +525,7 @@ print_token_value (FILE *file, int type, YYSTYPE const *value)
 }
 
 static void
 }
 
 static void

-gram_error (location_t const *loc, char const *msg)
+gram_error (location const *loc, char const *msg)

 {
   complain_at (*loc, "%s", msg);
 }
 {
   complain_at (*loc, "%s", msg);
 }