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.
(cherry picked from commit 246c4efafed178058a22b96d7a046340f6119057)

Conflicts:

	src/muscle-tab.h

diff --git a/ChangeLog b/ChangeLog
index 029beebb495304a8769bd20071c222664edb4333..698349c46b9715ac2d6d7c123adbcef0ea190422 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-20  Joel E. Denny  <jdenny@ces.clemson.edu>
 
        * data/c++.m4 (b4_namespace_close): Simplify slightly.

diff --git a/data/bison.m4 b/data/bison.m4
index 5d97a29e60d6192b31857eac142b68d4c85ab065..b532ad7f1a0a0eccca4e270260d9f0b38e55cc53 100644 (file)
--- a/data/bison.m4
+++ b/data/bison.m4
@@ -506,8 +506,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 3fe64e5aeb74ab61c5574aed025db5caa5d09311..12e4f1d1f202e75f164d2c9d7e666795cfe3ef70 100644 (file)
--- a/src/muscle-tab.h
+++ b/src/muscle-tab.h
@@ -127,9 +127,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);
 
@@ -196,9 +196,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);