Update some comments to make sense for -D.

* data/bison.m4 (b4_check_user_names): In header comments, say
"user occurrence" instead of "grammar occurrence".
* src/muscle_tab.h (muscle_percent_define_insert): Likewise.
(muscle_percent_code_grow): Likewise just for consistency.

diff --git a/ChangeLog b/ChangeLog
index e1b424ea354520a161d228d530ce611d9eb1dae0..738e36e8aff4c1e7d9801944d95ea850b2d32ec3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-05-22  Joel E. Denny  <jdenny@ces.clemson.edu>
+
+       Update some comments to make sense for -D.
+       * data/bison.m4 (b4_check_user_names): In header comments, say
+       "user occurrence" instead of "grammar occurrence".
+       * src/muscle_tab.h (muscle_percent_define_insert): Likewise.
+       (muscle_percent_code_grow): Likewise just for consistency.
+
 2009-05-22  Joel E. Denny  <jdenny@ces.clemson.edu>
 
        * data/c++.m4: Update copyright year.

diff --git a/data/bison.m4 b/data/bison.m4
index 00a42e21fe4e3de9035275dc641fc3fd5df48c1e..585fb1d0c2e5ab8453519052b4ef88b684598b68 100644 (file)
--- a/data/bison.m4
+++ b/data/bison.m4
@@ -317,8 +317,8 @@ b4_define_user_code([stype])
 # but is not used by Bison (as recorded by macros in the namespace
 # BISON-NAMESPACE).
 #
-# USER-LIST must expand to a list specifying all grammar occurrences of all
-# names of type WHAT.   Each item in the list must be a triplet specifying one
+# USER-LIST must expand to a list specifying all user occurrences of all names
+# of type WHAT.   Each item in the list must be a triplet specifying one
 # occurrence: name, start boundary, and end boundary.  Empty string names are
 # fine.  An empty list is fine.
 #

diff --git a/src/muscle_tab.h b/src/muscle_tab.h
index 19fba8b9f5d7b78f549ae91bacf3b1e456f0d485..21249b731dea100786b5d15fc8bbaae6aa336767 100644 (file)
--- a/src/muscle_tab.h
+++ b/src/muscle_tab.h
@@ -1,5 +1,6 @@
 /* Muscle table manager for Bison,
-   Copyright (C) 2001, 2002, 2003, 2006, 2007 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002, 2003, 2006, 2007, 2009 Free Software
+   Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
@@ -123,9 +124,9 @@ void muscle_user_name_list_grow (char const *key, char const *user_name,
                                  location loc);
 
 /* Define the muscle for the %define variable VARIABLE appearing at
-   VARIABLE_LOC in the grammar file with value VALUE.  Warn if VARIABLE is
-   already defined.  Record this as a grammar occurrence of VARIABLE by
-   invoking muscle_user_name_list_grow.  */
+   VARIABLE_LOC with value VALUE.  Warn if VARIABLE is already defined.
+   Record this as a user occurrence of VARIABLE by invoking
+   muscle_user_name_list_grow.  */
 void muscle_percent_define_insert (char const *variable, location variable_loc,
                                    char const *value);
 
@@ -185,9 +186,10 @@ void muscle_percent_define_default (char const *variable, char const *value);
    output.  */
 void muscle_percent_define_check_values (char const * const *values);
 
-/* Grow the muscle for the %code qualifier QUALIFIER appearing at QUALIFIER_LOC
-   in the grammar file with code CODE appearing at CODE_LOC.  Record this as a
-   grammar occurrence of VARIABLE by invoking muscle_user_name_list_grow.  */
+/* Grow the muscle for the %code qualifier QUALIFIER appearing at
+   QUALIFIER_LOC with code CODE appearing at CODE_LOC.  Record this as a
+   user occurrence of QUALIFIER by invoking
+   muscle_user_name_list_grow.  */
 void muscle_percent_code_grow (char const *qualifier, location qualifier_loc,
                                char const *code, location code_loc);