diff options
Diffstat (limited to 'gdb/c-exp.y')
| -rw-r--r-- | gdb/c-exp.y | 57 |
1 files changed, 41 insertions, 16 deletions
diff --git a/gdb/c-exp.y b/gdb/c-exp.y index 6605751..3d2d1aa 100644 --- a/gdb/c-exp.y +++ b/gdb/c-exp.y @@ -718,24 +718,28 @@ variable: name_not_typename } ; +space_identifier : '@' NAME + { push_type_address_space (copy_name ($2.stoken)); + push_type (tp_space_identifier); + } + ; -ptype : typebase - | ptype const_or_volatile abs_decl const_or_volatile - { $$ = follow_types ($1); } +const_or_volatile: const_or_volatile_noopt + | ; -const_and_volatile: CONST_KEYWORD VOLATILE_KEYWORD - | VOLATILE_KEYWORD CONST_KEYWORD + +cv_with_space_id : const_or_volatile space_identifier const_or_volatile ; -const_or_volatile_noopt: const_and_volatile - { push_type (tp_const); push_type (tp_volatile);} - | CONST_KEYWORD - { push_type (tp_const);} - | VOLATILE_KEYWORD - { push_type (tp_volatile); } + +const_or_volatile_or_space_identifier_noopt: cv_with_space_id + | const_or_volatile_noopt ; -const_or_volatile: const_or_volatile_noopt - | + +const_or_volatile_or_space_identifier: + const_or_volatile_or_space_identifier_noopt + | ; + abs_decl: '*' { push_type (tp_pointer); $$ = 0; } | '*' abs_decl @@ -852,8 +856,10 @@ typebase /* Implements (approximately): (type-qualifier)* type-specifier */ { $$ = lookup_template_type(copy_name($2), $4, expression_context_block); } - | const_or_volatile_noopt typebase { $$ = follow_types ($2); } - | typebase const_or_volatile_noopt { $$ = follow_types ($1); } + | const_or_volatile_or_space_identifier_noopt typebase + { $$ = follow_types ($2); } + | typebase const_or_volatile_or_space_identifier_noopt + { $$ = follow_types ($1); } ; typename: TYPENAME @@ -890,6 +896,25 @@ nonempty_typelist } ; +ptype : typebase + | ptype const_or_volatile_or_space_identifier abs_decl const_or_volatile_or_space_identifier + { $$ = follow_types ($1); } + ; + +const_and_volatile: CONST_KEYWORD VOLATILE_KEYWORD + | VOLATILE_KEYWORD CONST_KEYWORD + ; + +const_or_volatile_noopt: const_and_volatile + { push_type (tp_const); + push_type (tp_volatile); + } + | CONST_KEYWORD + { push_type (tp_const); } + | VOLATILE_KEYWORD + { push_type (tp_volatile); } + ; + name : NAME { $$ = $1.stoken; } | BLOCKNAME { $$ = $1.stoken; } | TYPENAME { $$ = $1.stoken; } @@ -1683,7 +1708,7 @@ yylex () return TYPENAME; } if ((yylval.tsym.type = lookup_primitive_typename (tmp)) != 0) - return TYPENAME; + return TYPENAME; /* Input names that aren't symbols but ARE valid hex numbers, when the input radix permits them, can be names or numbers |