diff options
| -rw-r--r-- | gdb/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/c-exp.y | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 827bf48..17b3d2b 100644 --- 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 fa8ebb9..3389142 100644 --- 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 |