Merge remote-tracking branch 'origin/maint'

[bison.git] / data / c.m4

diff --git a/data/c.m4 b/data/c.m4
index 2601d561945d0b6adc35c888da540742f9a1ea5f..9bd8295614edd47b2a2e244281b0c322e43d6e9b 100644 (file)
--- a/data/c.m4
+++ b/data/c.m4
@@ -574,8 +574,8 @@ b4_locations_if([, yylocationp])[]b4_user_args[);
 
 # b4_declare_yylstype
 # ------------------
 
 # b4_declare_yylstype
 # ------------------

-# Declaration that might either go into the header (if --defines)
-# or open coded in the parser body.  Declare YYSTYPE and YYLTYPE.
+# Declarations that might either go into the header (if --defines) or
+# in the parser body.  Declare YYSTYPE/YYLTYPE, and yylval/yylloc.

 m4_define([b4_declare_yylstype],
 [[#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 ]m4_ifdef([b4_stype],
 m4_define([b4_declare_yylstype],
 [[#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 ]m4_ifdef([b4_stype],


@@ -603,6 +603,9 @@ typedef struct YYLTYPE
 # define YYLTYPE_IS_DECLARED 1
 # define YYLTYPE_IS_TRIVIAL 1
 #endif]])
 # define YYLTYPE_IS_DECLARED 1
 # define YYLTYPE_IS_TRIVIAL 1
 #endif]])

+
+b4_pure_if([], [[extern YYSTYPE ]b4_prefix[lval;
+]b4_locations_if([[extern YYLTYPE ]b4_prefix[lloc;]])])[]dnl

 ])
 
 # b4_declare_yydebug
 ])
 
 # b4_declare_yydebug