* configure.ac (AC_ARG_ENABLE): Use -Wextra -Wno-sign-compare

[bison.git] / data / c.m4

diff --git a/data/c.m4 b/data/c.m4
index 4757c58c062b190edd6620c39ea85c0483a7228c..2ef88b159b3dcf05dd1666a468e85bd33e1732e3 100644 (file)
--- a/data/c.m4
+++ b/data/c.m4
@@ -91,6 +91,11 @@ m4_define_default([b4_epilogue], [])
 # If the %union is not named, its name is YYSTYPE.
 m4_define_default([b4_union_name], [YYSTYPE])
 
+# The initial column and line.
+m4_define_default([b4_location_initial_column], [1])
+m4_define_default([b4_location_initial_line],   [1])
+
+
 ## ------------------------ ##
 ## Pure/impure interfaces.  ##
 ## ------------------------ ##
@@ -205,7 +210,7 @@ m4_define([b4_$3_if],
 # -----------------------------
 # Expand IF-TRUE, if FLAG is true, IF-FALSE otherwise.
 b4_define_flag_if([defines])        # Whether headers are requested.
-b4_define_flag_if([error_verbose])  # Wheter error are verbose.
+b4_define_flag_if([error_verbose])  # Whether error are verbose.
 b4_define_flag_if([locations])      # Whether locations are tracked.
 b4_define_flag_if([pure])           # Whether the interface is pure.
 b4_define_flag_if([yacc])           # Whether POSIX Yacc is emulated.
@@ -405,17 +410,16 @@ m4_define([b4_c_arg],
 
 # b4_basename(NAME)
 # -----------------
+# Similar to POSIX basename; the differences don't matter here.
 # Beware that NAME is not evaluated.
 m4_define([b4_basename],
-[m4_case([$1],
-         [/], [/],
-             [m4_bpatsubst([$1], [^.*/\([^/]+\)/?$], [\1])])])
-        
+[m4_bpatsubst([$1], [^.*/\([^/]+\)/*$], [\1])])
+
 
 # b4_syncline(LINE, FILE)
 # -----------------------
 m4_define([b4_syncline],
-[b4_flag_if([synclines], 
+[b4_flag_if([synclines],
 [/* Line __line__ of b4_basename(m4_quote(__file__)).  */
 [#]line $1 $2])])