[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
glr.cc: remove duplicate definition of YYLLOC_DEFAULT
From: |
Akim Demaille |
Subject: |
glr.cc: remove duplicate definition of YYLLOC_DEFAULT |
Date: |
Wed, 2 Jan 2019 08:06:03 +0100 |
commit 0dfad676e3ba28e4de84c2de88c50e71064b716e
Author: Akim Demaille <address@hidden>
Date: Tue Jan 1 16:19:22 2019 +0100
glr.cc: remove duplicate definition of YYLLOC_DEFAULT
It's already provided by glr.c.
* data/skeletons/glr.cc (b4_post_prologue): Here.
diff --git a/TODO b/TODO
index aa3c1c3b..a5c068a8 100644
--- a/TODO
+++ b/TODO
@@ -7,11 +7,6 @@ Several features are not available in all the backends.
- token constructors: Java and C
* Short term
-** glr.c: too many definitions of YYLLOC_DEFAULT
-See test 241.
-
-241. headers.at:187: testing Sane headers: %locations c++ %glr-parser ...
-
** consistency
token vs terminal
diff --git a/data/skeletons/glr.cc b/data/skeletons/glr.cc
index d2447f08..dad6ec56 100644
--- a/data/skeletons/glr.cc
+++ b/data/skeletons/glr.cc
@@ -98,18 +98,15 @@ b4_locations_if([,
[yylloc.initialize ();]m4_ifdef([b4_initial_action], [
m4_defn([b4_initial_action])]))])[
-# Hijack the post prologue to insert early definition of YYLLOC_DEFAULT
-# and declaration of yyerror.
+# Hijack the post prologue to declare yyerror.
]m4_append([b4_post_prologue],
[b4_syncline(address@hidden@], address@hidden@])[
-]b4_yylloc_default_define[
-#define YYRHSLOC(Rhs, K) ((Rhs)[K].yystate.yyloc)
]b4_function_declare([yyerror],
[static void],b4_locations_if([
[[const ]b4_namespace_ref::b4_parser_class_name[::location_type
*yylocationp],
[yylocationp]],])
b4_parse_param,
- [[const char* msg], [msg]])])
+ [[const char* msg], [msg]])])[
#undef yynerrs
@@ -158,8 +155,7 @@ m4_pushdef([b4_parse_param],
m4_defn([b4_parse_param_orig]))dnl
#if ]b4_api_PREFIX[DEBUG
]m4_ifset([b4_parse_param], [ ], [ :])[yycdebug_
(&std::cerr)]m4_ifset([b4_parse_param], [,])[
#endif]b4_parse_param_cons[
- {
- }
+ {}
]b4_parser_class_name::~b4_parser_class_name[ ()
{}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- glr.cc: remove duplicate definition of YYLLOC_DEFAULT,
Akim Demaille <=