parse-gram: update the Bison interface

* src/parse-gram.y (%pure-parser, %name-prefix): Replace with...
(%define api.pure, %define api.prefix)
* src/location.h, src/scan-gram.h: Adjust to api.prefix.

diff --git a/src/location.h b/src/location.h
index 4c2b410de8e1797b8e6a3d375c90fb1718252a07..5ebb92e30e5272aa8e4e6fe3f950d55acdea35f6 100644 (file)
--- a/src/location.h
+++ b/src/location.h
@@ -88,7 +88,7 @@ typedef struct
 
 } location;
 
 
 } location;
 

-#define YYLTYPE location
+#define GRAM_LTYPE location

 
 #define EMPTY_LOCATION_INIT {{NULL, 0, 0}, {NULL, 0, 0}}
 extern location const empty_location;
 
 #define EMPTY_LOCATION_INIT {{NULL, 0, 0}, {NULL, 0, 0}}
 extern location const empty_location;

diff --git a/src/parse-gram.y b/src/parse-gram.y
index 3120bfc210e72ddf921f04ffc34b1ed2ae26d548..6a49923c478baa88668bfa757720900533af814e 100644 (file)
--- a/src/parse-gram.y
+++ b/src/parse-gram.y
@@ -94,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
 {

diff --git a/src/scan-gram.h b/src/scan-gram.h
index ed973c78bead6dc789cea295a7fa997d5da8a580..72138a2782ec524a1209860efd9221a743a0086f 100644 (file)
--- a/src/scan-gram.h
+++ b/src/scan-gram.h
@@ -32,7 +32,7 @@ void gram_scanner_last_string_free (void);
 extern FILE *gram_out;
 extern int gram_lineno;
 
 extern FILE *gram_out;
 extern int gram_lineno;
 

-# define GRAM_LEX_DECL int gram_lex (YYSTYPE *val, location *loc)
+# define GRAM_LEX_DECL int gram_lex (GRAM_STYPE *val, location *loc)

 GRAM_LEX_DECL;
 
 #endif /* !SCAN_GRAM_H_ */
 GRAM_LEX_DECL;
 
 #endif /* !SCAN_GRAM_H_ */