also support $<foo>$ in the %initial-action

[bison.git] / data / bison.m4

diff --git a/data/bison.m4 b/data/bison.m4
index a5c1ee7376717fa50428eeb9e71bc6abf476867e..178134a4eca812538622519464a73ce89cb3e785 100644 (file)
--- a/data/bison.m4
+++ b/data/bison.m4
@@ -183,21 +183,6 @@ m4_define([b4_fatal_at],
 m4_exit(1)])
 
 
 m4_exit(1)])
 
 

-## ---------------- ##
-## Default values.  ##
-## ---------------- ##
-
-# m4_define_default([b4_lex_param], [])   dnl breaks other skeletons
-m4_define_default([b4_pre_prologue], [])
-m4_define_default([b4_post_prologue], [])
-m4_define_default([b4_epilogue], [])
-m4_define_default([b4_parse_param], [])
-
-# The initial column and line.
-m4_define_default([b4_location_initial_column], [1])
-m4_define_default([b4_location_initial_line],   [1])
-
-

 ## ------------ ##
 ## Data Types.  ##
 ## ------------ ##
 ## ------------ ##
 ## Data Types.  ##
 ## ------------ ##


@@ -258,10 +243,6 @@ b4_define_flag_if([yacc])               # Whether POSIX Yacc is emulated.
 b4_error_verbose_if([m4_define([b4_token_table_flag], [1])])
 
 
 b4_error_verbose_if([m4_define([b4_token_table_flag], [1])])
 
 

-## ------------------------- ##
-## Assigning token numbers.  ##
-## ------------------------- ##
-

 
 ## ----------- ##
 ## Synclines.  ##
 
 ## ----------- ##
 ## Synclines.  ##


@@ -580,3 +561,26 @@ m4_wrap_lifo([
 b4_check_user_names_wrap([[define]], [[variable]])
 b4_check_user_names_wrap([[code]], [[qualifier]])
 ])
 b4_check_user_names_wrap([[define]], [[variable]])
 b4_check_user_names_wrap([[code]], [[qualifier]])
 ])

+
+
+## ---------------- ##
+## Default values.  ##
+## ---------------- ##
+
+# m4_define_default([b4_lex_param], [])   dnl breaks other skeletons
+m4_define_default([b4_pre_prologue], [])
+m4_define_default([b4_post_prologue], [])
+m4_define_default([b4_epilogue], [])
+m4_define_default([b4_parse_param], [])
+
+# The initial column and line.
+m4_define_default([b4_location_initial_column], [1])
+m4_define_default([b4_location_initial_line],   [1])
+
+# Sanity checks.
+b4_percent_define_ifdef([api.prefix],
+[m4_ifdef([b4_prefix],
+[b4_complain_at(b4_percent_define_get_loc([api.prefix]),
+                [['%s' and '%s' cannot be used together]],
+                [%name-prefix],
+                [%define api.prefix])])])