X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/769b430fce983b8325780cf218f4583bcc62f137..e9955c83:/data/bison.simple

diff --git a/data/bison.simple b/data/bison.simple
index 1beb5ed7..301058ea 100644
--- a/data/bison.simple
+++ b/data/bison.simple
@@ -175,6 +175,8 @@ m4_if(b4_prefix[], [yy], [],
 /* Copy the first part of user declarations.  */
 b4_pre_prologue
 
+b4_token_defines(b4_tokens)
+
 /* Enabling traces.  */
 #ifndef YYDEBUG
 # define YYDEBUG b4_debug
@@ -189,10 +191,10 @@ b4_pre_prologue
 #endif
 
 #ifndef YYSTYPE
-m4_ifdef([b4_stype_line],
+m4_ifdef([b4_stype],
 [#line b4_stype_line "b4_filename"
-])dnl
-typedef b4_stype yystype;
+typedef union b4_stype yystype;],
+[typedef int yystype;])
 # define YYSTYPE yystype
 # define YYSTYPE_IS_TRIVIAL 1
 #endif
@@ -312,8 +314,6 @@ union yyalloc
 
 #endif
 
-b4_token_defines(b4_tokens)
-
 /* YYFINAL -- State number of the termination state. */
 #define YYFINAL  b4_final
 #define YYFLAG	 b4_flag
@@ -1238,11 +1238,10 @@ m4_if(b4_defines_flag, 0, [],
 b4_token_defines(b4_tokens)
 
 #ifndef YYSTYPE
-m4_ifdef([b4_stype_line],
+m4_ifdef([b4_stype],
 [#line b4_stype_line "b4_filename"
-])dnl
-typedef b4_stype
-yystype;
+typedef union b4_stype yystype;],
+[typedef int yystype;])
 # define YYSTYPE yystype
 #endif