diff options
author | Per Bothner <per@bothner.com> | 1992-10-19 19:46:05 +0000 |
---|---|---|
committer | Per Bothner <per@bothner.com> | 1992-10-19 19:46:05 +0000 |
commit | 10a297b791581525c47d2d08faf8709ef315463a (patch) | |
tree | 6b7acf433785ffab41f45f1b7ffac1434a9ea8a0 /gdb/c-exp.y | |
parent | e9b63852ca0c0ddd181a8d76de06329a7380deda (diff) | |
download | gdb-10a297b791581525c47d2d08faf8709ef315463a.zip gdb-10a297b791581525c47d2d08faf8709ef315463a.tar.gz gdb-10a297b791581525c47d2d08faf8709ef315463a.tar.bz2 |
* c-exp.y: Moved handling of 'const' and 'volatile' from
<type> to <typebase>. This removes 2 conflicts.
Diffstat (limited to 'gdb/c-exp.y')
-rw-r--r-- | gdb/c-exp.y | 8 |
1 files changed, 4 insertions, 4 deletions
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 |