maint: address syntax-check errors.

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

diff --git a/src/parse-gram.y b/src/parse-gram.y
index 8d7454918663841c188cf74d8711894d34c226bd..5f77a5bd08abd0355531dadbbebe53503442c77a 100644 (file)
--- a/src/parse-gram.y
+++ b/src/parse-gram.y
@@ -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"


@@ -32,6 +33,7 @@
 #include "symlist.h"
 #include "scan-gram.h"
 #include "scan-code.h"
 #include "symlist.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 YYLLOC_DEFAULT(Current, Rhs, N)  (Current) = lloc_default (Rhs, N)
 static YYLTYPE lloc_default (YYLTYPE const *, int);


@@ -92,14 +94,14 @@ current_lhs(symbol *sym, location loc, named_ref *ref)
 %}
 
 %debug
 %}
 
 %debug

-%verbose
+%define api.prefix "gram_"
+%define api.pure
+%define parse.lac full

 %defines
 %defines

-%locations
-%pure-parser

 %error-verbose
 %error-verbose

-%define parse.lac full
-%name-prefix="gram_"

 %expect 0
 %expect 0

+%locations
+%verbose

 
 %initial-action
 {
 
 %initial-action
 {


@@ -250,7 +252,7 @@ prologue_declaration:
                         plain_code.code, @1);
       code_scanner_last_string_free ();
     }
                         plain_code.code, @1);
       code_scanner_last_string_free ();
     }

-| "%debug"                         { debug_flag = true; }
+| "%debug"                         { debug = true; }

 | "%define" variable content.opt
     {
       muscle_percent_define_insert ($2, @2, $3,
 | "%define" variable content.opt
     {
       muscle_percent_define_insert ($2, @2, $3,


@@ -346,17 +348,27 @@ grammar_declaration:
     }
 | "%destructor" "{...}" generic_symlist
     {
     }
 | "%destructor" "{...}" generic_symlist
     {

-      symbol_list *list;
-      for (list = $3; list; list = list->next)
-       symbol_list_destructor_set (list, $2, @2);
-      symbol_list_free ($3);
+      code_props code;
+      code_props_symbol_action_init (&code, $2, @2);
+      code_props_translate_code (&code);
+      {
+        symbol_list *list;
+        for (list = $3; list; list = list->next)
+          symbol_list_destructor_set (list, &code);
+        symbol_list_free ($3);
+      }

     }
 | "%printer" "{...}" generic_symlist
     {
     }
 | "%printer" "{...}" generic_symlist
     {

-      symbol_list *list;
-      for (list = $3; list; list = list->next)
-       symbol_list_printer_set (list, $2, @2);
-      symbol_list_free ($3);
+      code_props code;
+      code_props_symbol_action_init (&code, $2, @2);
+      code_props_translate_code (&code);
+      {
+        symbol_list *list;
+        for (list = $3; list; list = list->next)
+          symbol_list_printer_set (list, &code);
+        symbol_list_free ($3);
+      }

     }
 | "%default-prec"
     {
     }
 | "%default-prec"
     {


@@ -723,11 +735,13 @@ add_param (char const *type, char *decl, location loc)
 
   /* Strip the surrounding '{' and '}', and any blanks just inside
      the braces.  */
 
   /* Strip the surrounding '{' and '}', and any blanks just inside
      the braces.  */

-  while (*--p == ' ' || *p == '\t')
-    continue;
+  --p;
+  while (c_isspace ((unsigned char) *p))
+    --p;

   p[1] = '\0';
   p[1] = '\0';

-  while (*++decl == ' ' || *decl == '\t')
-    continue;
+  ++decl;
+  while (c_isspace ((unsigned char) *decl))
+    ++decl;

 
   if (! name_start)
     complain_at (loc, _("missing identifier in parameter declaration"));
 
   if (! name_start)
     complain_at (loc, _("missing identifier in parameter declaration"));