parser: use api.pure full

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

diff --git a/src/parse-gram.y b/src/parse-gram.y
index fbb9b54645addc40f365c052e552bd665023459e..a5094350a1bdc8e074d92427b63f3d241ac5ba96 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-2012 Free Software Foundation, Inc.
+   Copyright (C) 2002-2013 Free Software Foundation, Inc.

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


@@ -20,6 +20,7 @@
 #include <config.h>
 #include "system.h"
 
 #include <config.h>
 #include "system.h"
 

+#include "c-ctype.h"

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


@@ -39,17 +40,13 @@
 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 (Loc, File)

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

-/* 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 const *, char const *);
 
 static void gram_error (location const *, char const *);
 

+/// A string that describes a char (e.g., 'a' -> "'a'").

 static char const *char_name (char);
 %}
 
 static char const *char_name (char);
 %}
 


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

-%debug
-%verbose
-%defines
-%locations
-%pure-parser
-%define parse.error "verbose"
+%define api.prefix "gram_"
+%define api.pure full
+%define locations
+%define parse.error verbose

 %define parse.lac full
 %define parse.lac full

-%name-prefix="gram_"
+%define parse.trace
+%defines

 %expect 0
 %expect 0

+%verbose

 
 %initial-action
 {
 
 %initial-action
 {


@@ -316,7 +313,6 @@ prologue_declaration:
 | "%expect" INT                    { expected_sr_conflicts = $2; }
 | "%expect-rr" INT                 { expected_rr_conflicts = $2; }
 | "%file-prefix" STRING            { spec_file_prefix = $2; }
 | "%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;


@@ -333,11 +329,9 @@ prologue_declaration:
     }
 | "%language" STRING            { language_argmatch ($2, grammar_prio, @1); }
 | "%name-prefix" STRING         { spec_name_prefix = $2; }
     }
 | "%language" STRING            { language_argmatch ($2, grammar_prio, @1); }
 | "%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; }
 | "%no-lines"                   { no_lines_flag = true; }
 | "%nondeterministic-parser"    { nondeterministic_parser = true; }
 | "%output" STRING              { spec_outfile = $2; }

-| "%output" "=" STRING          { spec_outfile = $3; }  /* deprecated */

 | "%param" { current_param = $1; } params { current_param = param_none; }
 | "%require" STRING             { version_check (&@2, $2); }
 | "%skeleton" STRING
 | "%param" { current_param = $1; } params { current_param = param_none; }
 | "%require" STRING             { version_check (&@2, $2); }
 | "%skeleton" STRING


@@ -505,7 +499,7 @@ symbols.prec:
   symbol.prec
     { $$ = symbol_list_sym_new ($1, @1); }
 | symbols.prec symbol.prec
   symbol.prec
     { $$ = symbol_list_sym_new ($1, @1); }
 | symbols.prec symbol.prec

-    { $$ = symbol_list_prepend ($1, symbol_list_sym_new ($2, @2)); }
+    { $$ = symbol_list_append ($1, symbol_list_sym_new ($2, @2)); }

 ;
 
 symbol.prec:
 ;
 
 symbol.prec:


@@ -518,12 +512,12 @@ symbols.1:
   symbol
     { $$ = symbol_list_sym_new ($1, @1); }
 | symbols.1 symbol
   symbol
     { $$ = symbol_list_sym_new ($1, @1); }
 | symbols.1 symbol

-    { $$ = symbol_list_prepend ($1, symbol_list_sym_new ($2, @2)); }
+    { $$ = symbol_list_append ($1, symbol_list_sym_new ($2, @2)); }

 ;
 
 generic_symlist:
   generic_symlist_item { $$ = $1; }
 ;
 
 generic_symlist:
   generic_symlist_item { $$ = $1; }

-| generic_symlist generic_symlist_item { $$ = symbol_list_prepend ($1, $2); }
+| generic_symlist generic_symlist_item { $$ = symbol_list_append ($1, $2); }

 ;
 
 generic_symlist_item:
 ;
 
 generic_symlist_item:


@@ -540,15 +534,15 @@ tag:
 /* One token definition.  */
 symbol_def:
   TAG
 /* One token definition.  */
 symbol_def:
   TAG

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

 | id
 | id

-     {
-       symbol_class_set ($1, current_class, @1, true);
-       symbol_type_set ($1, current_type, @1);
-     }
+    {
+      symbol_class_set ($1, current_class, @1, true);
+      symbol_type_set ($1, current_type, @1);
+    }

 | id INT
     {
       symbol_class_set ($1, current_class, @1, true);
 | id INT
     {
       symbol_class_set ($1, current_class, @1, true);


@@ -723,7 +717,6 @@ epilogue.opt:
 
 %%
 
 
 %%
 

-

 /* 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
 /* 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


@@ -776,17 +769,16 @@ add_param (param_type type, char *decl, location loc)
     /* Strip the surrounding '{' and '}', and any blanks just inside
        the braces.  */
     --p;
     /* Strip the surrounding '{' and '}', and any blanks just inside
        the braces.  */
     --p;

-    while (isspace ((unsigned char) *p))
+  while (c_isspace ((unsigned char) *p))

       --p;
     p[1] = '\0';
     ++decl;
       --p;
     p[1] = '\0';
     ++decl;

-    while (isspace ((unsigned char) *decl))
+  while (c_isspace ((unsigned char) *decl))

       ++decl;
   }
 
   if (! name_start)
       ++decl;
   }
 
   if (! name_start)

-    complain_at (loc, complaint,
-                 _("missing identifier in parameter declaration"));
+    complain (&loc, complaint, _("missing identifier in parameter declaration"));

   else
     {
       char *name = xmemdup0 (name_start, strspn (name_start, alphanum));
   else
     {
       char *name = xmemdup0 (name_start, strspn (name_start, alphanum));


@@ -806,8 +798,8 @@ version_check (location const *loc, char const *version)
 {
   if (strverscmp (version, PACKAGE_VERSION) > 0)
     {
 {
   if (strverscmp (version, PACKAGE_VERSION) > 0)
     {

-      complain_at (*loc, complaint, "require bison %s, but have %s",
-                   version, PACKAGE_VERSION);
+      complain (loc, complaint, "require bison %s, but have %s",
+                version, PACKAGE_VERSION);

       exit (EX_MISMATCH);
     }
 }
       exit (EX_MISMATCH);
     }
 }


@@ -815,7 +807,7 @@ version_check (location const *loc, char const *version)
 static void
 gram_error (location const *loc, char const *msg)
 {
 static void
 gram_error (location const *loc, char const *msg)
 {

-  complain_at (*loc, complaint, "%s", msg);
+  complain (loc, complaint, "%s", msg);

 }
 
 char const *
 }
 
 char const *