Re: invalid %define boolean variable

[Joel E. Denny]

On Mon, 27 Aug 2007, Akim Demaille wrote:

> >>> "JED" == Joel E Denny <address@hidden> writes:
> 
>  > +                      _("invalid value for %%define boolean variable 
> `%s'"),
> 
> Shouldn't boolean be always spelled Boolean?

Thanks Akim.  I committed the following to fix that.

Index: ChangeLog
===================================================================
RCS file: /sources/bison/bison/ChangeLog,v
retrieving revision 1.1722
diff -p -u -r1.1722 ChangeLog
--- ChangeLog   18 Aug 2007 00:45:51 -0000      1.1722
+++ ChangeLog   28 Aug 2007 07:09:35 -0000
@@ -1,3 +1,15 @@
+2007-08-28  Joel E. Denny  <address@hidden>
+
+       Spell "boolean" as "Boolean".  Reported by Akim Demaille.
+       * data/bison.m4 (b4_percent_define_flag_if): Fix complaint.
+       * doc/bison.texinfo (Decl Summary): Fix.
+       * src/muscle_tab.c (muscle_percent_define_flag_if): Fix complaint.
+       * tests/input.at (Boolean %define variables): Update output.
+       * tests/skeletons.at (%define boolean variables: invalid skeleton
+       defaults): Rename to...
+       (%define Boolean variables: invalid skeleton defaults): ... this and
+       update output.
+
 2007-08-17  Joel E. Denny  <address@hidden>
 
        In impure push mode, don't allow more than one yypstate to be allocated
Index: data/bison.m4
===================================================================
RCS file: /sources/bison/bison/data/bison.m4,v
retrieving revision 1.19
diff -p -u -r1.19 bison.m4
--- data/bison.m4       15 Aug 2007 20:21:21 -0000      1.19
+++ data/bison.m4       28 Aug 2007 07:09:35 -0000
@@ -381,7 +381,7 @@ m4_define([b4_percent_define_flag_if],
            [m4_expand_once([dnl
              m4_pushdef([b4_loc], m4_indir([b4_percent_define_loc(]$1[)]))dnl
              b4_complain_at(b4_loc,
-                            [[invalid value for %%define boolean variable 
`%s']],
+                            [[invalid value for %%define Boolean variable 
`%s']],
                             [$1])dnl
              m4_popdef([b4_loc])],
              [[b4_percent_define_flag_if($1)]])])],
Index: doc/bison.texinfo
===================================================================
RCS file: /sources/bison/bison/doc/bison.texinfo,v
retrieving revision 1.235
diff -p -u -r1.235 bison.texinfo
--- doc/bison.texinfo   18 Aug 2007 00:07:01 -0000      1.235
+++ doc/bison.texinfo   28 Aug 2007 07:09:39 -0000
@@ -4816,7 +4816,7 @@ Bison will warn if a @var{variable} is d
 Omitting @code{"@var{value}"} is always equivalent to specifying it as
 @code{""}.
 
-Some @var{variable}s may be used as booleans.
+Some @var{variable}s may be used as Booleans.
 In this case, Bison will complain if the variable definition does not meet one
 of the following four conditions:
 
Index: src/muscle_tab.c
===================================================================
RCS file: /sources/bison/bison/src/muscle_tab.c,v
retrieving revision 1.51
diff -p -u -r1.51 muscle_tab.c
--- src/muscle_tab.c    15 Aug 2007 20:21:30 -0000      1.51
+++ src/muscle_tab.c    28 Aug 2007 07:09:39 -0000
@@ -479,7 +479,7 @@ muscle_percent_define_flag_if (char cons
         {
           muscle_insert (invalid_boolean_name, "");
           complain_at(muscle_location_decode (loc_name),
-                      _("invalid value for %%define boolean variable `%s'"),
+                      _("invalid value for %%define Boolean variable `%s'"),
                       variable);
         }
       free (value);
Index: tests/input.at
===================================================================
RCS file: /sources/bison/bison/tests/input.at,v
retrieving revision 1.79
diff -p -u -r1.79 input.at
--- tests/input.at      15 Aug 2007 20:21:33 -0000      1.79
+++ tests/input.at      28 Aug 2007 07:09:39 -0000
@@ -836,7 +836,7 @@ start: ;
 ]])
 
 AT_CHECK([[bison Input.y]], [1], [],
-[[Input.y:2.9-14: invalid value for %define boolean variable `public'
+[[Input.y:2.9-14: invalid value for %define Boolean variable `public'
 ]])
 
 AT_CLEANUP
Index: tests/skeletons.at
===================================================================
RCS file: /sources/bison/bison/tests/skeletons.at,v
retrieving revision 1.6
diff -p -u -r1.6 skeletons.at
--- tests/skeletons.at  15 Aug 2007 20:21:33 -0000      1.6
+++ tests/skeletons.at  28 Aug 2007 07:09:39 -0000
@@ -142,10 +142,10 @@ AT_CLEANUP
 
 
 ## ------------------------------------------------------ ##
-## %define boolean variables: invalid skeleton defaults.  ##
+## %define Boolean variables: invalid skeleton defaults.  ##
 ## ------------------------------------------------------ ##
 
-AT_SETUP([[%define boolean variables: invalid skeleton defaults]])
+AT_SETUP([[%define Boolean variables: invalid skeleton defaults]])
 
 AT_CHECK([[mkdir tmp]])
 
@@ -161,7 +161,7 @@ start: ;
 ]])
 
 AT_CHECK([[bison input.y]], [[1]], [[]],
-[[[Bison:b4_percent_define_default]:0.0: invalid value for %define boolean 
variable `foo'
+[[[Bison:b4_percent_define_default]:0.0: invalid value for %define Boolean 
variable `foo'
 ]])
 
 AT_CLEANUP