* c-exp.y: Moved handling of 'const' and 'volatile' from

	<type> to <typebase>.  This removes 2 conflicts.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 827bf4880ecd9bc6c296af2dc59d4285766b18fb..17b3d2bf9c119ea4d46babdbe85151ab477f377c 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+Mon Oct 19 12:45:23 1992  Per Bothner  (bothner@cygnus.com)
+
+       * c-exp.y:  Moved handling of 'const' and 'volatile' from
+       <type> to <typebase>.  This removes 2 conflicts.
+
 Sun Oct 18 00:36:30 1992  Fred Fish  (fnf@cygnus.com)
 
        * breakpoint.c (breakpoint_re_set_one):  Don't delete watchpoints

diff --git a/gdb/c-exp.y b/gdb/c-exp.y
index fa8ebb90b99fd64ad0bf9ef5c414a0795e32160c..3389142c786100aae320821e8e9059ade1d97e54 100644 (file)
--- a/gdb/c-exp.y
+++ b/gdb/c-exp.y
@@ -834,12 +834,9 @@ type       :       ptype
                        { $$ = lookup_member_type
                            (lookup_function_type ($1), $3);
                          free ((PTR)$8); }
-       /* "const" and "volatile" are curently ignored. */
-       |       CONST_KEYWORD type { $$ = $2; }
-       |       VOLATILE_KEYWORD type { $$ = $2; }
        ;
 
-typebase
+typebase  /* Implements (approximately): (type-qualifier)* type-specifier */
        :       TYPENAME
                        { $$ = $1.type; }
        |       INT_KEYWORD
@@ -888,6 +885,9 @@ typebase
                        { $$ = lookup_template_type(copy_name($2), $4,
                                                    expression_context_block);
                        }
+       /* "const" and "volatile" are curently ignored. */
+       |       CONST_KEYWORD typebase { $$ = $2; }
+       |       VOLATILE_KEYWORD typebase { $$ = $2; }
        ;
 
 typename:      TYPENAME