Merge remote-tracking branch 'origin/maint'

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

diff --git a/src/parse-gram.y b/src/parse-gram.y
index fbb9b54645addc40f365c052e552bd665023459e..46500db0904367b8e33ecbf6383d841817bebcd6 100644 (file)
--- a/src/parse-gram.y
+++ b/src/parse-gram.y
@@ -20,6 +20,7 @@
 #include <config.h>
 #include "system.h"
 
+#include "c-ctype.h"
 #include "complain.h"
 #include "conflicts.h"
 #include "files.h"
@@ -86,14 +87,14 @@ static char const *char_name (char);
   #define YYTYPE_UINT8 uint_fast8_t
 }
 
-%debug
 %verbose
 %defines
-%locations
-%pure-parser
-%define parse.error "verbose"
+%define locations
+%define api.pure
+%define parse.error verbose
 %define parse.lac full
-%name-prefix="gram_"
+%define parse.trace
+%name-prefix "gram_"
 %expect 0
 
 %initial-action
@@ -776,11 +777,11 @@ add_param (param_type type, char *decl, location loc)
     /* 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;
-    while (isspace ((unsigned char) *decl))
+  while (c_isspace ((unsigned char) *decl))
       ++decl;
   }