diff options
author | Andrew Burgess <andrew.burgess@embecosm.com> | 2020-05-05 16:03:53 +0100 |
---|---|---|
committer | Andrew Burgess <andrew.burgess@embecosm.com> | 2020-10-22 09:24:42 +0100 |
commit | 2f1b18db863d630b94f9454067597e0df648bf37 (patch) | |
tree | 6c054ad0964abdaa5173dc34b530689069bf7fbd /gdb/expression.h | |
parent | c53dcd7785debc2e2a5b8b2dede45bbf32f2438d (diff) | |
download | gdb-2f1b18db863d630b94f9454067597e0df648bf37.zip gdb-2f1b18db863d630b94f9454067597e0df648bf37.tar.gz gdb-2f1b18db863d630b94f9454067597e0df648bf37.tar.bz2 |
gdb: Convert enum range_type to a bit field enum
The expression range_type enum represents the following ideas:
- Lower bound is set to default,
- Upper bound is set to default,
- Upper bound is exclusive.
There are currently 6 entries in the enum to represent the combination
of all those ideas.
In a future commit I'd like to add stride information to the range,
this could in theory appear with any of the existing enum entries, so
this would take us to 12 enum entries.
This feels like its getting a little out of hand, so in this commit I
switch the range_type enum over to being a flags style enum. There's
one entry to represent no flags being set, then 3 flags to represent
the 3 ideas above. Adding stride information will require adding only
one more enum flag.
I've then gone through and updated the code to handle this change.
There should be no user visible changes after this commit.
gdb/ChangeLog:
* expprint.c (print_subexp_standard): Update to reflect changes to
enum range_type.
(dump_subexp_body_standard): Likewise.
* expression.h (enum range_type): Convert to a bit field enum, and
make the enum unsigned.
* f-exp.y (subrange): Update to reflect changes to enum
range_type.
* f-lang.c (value_f90_subarray): Likewise.
* parse.c (operator_length_standard): Likewise.
* rust-exp.y (rust_parser::convert_ast_to_expression): Likewise.
* rust-lang.c (rust_range): Likewise.
(rust_compute_range): Likewise.
(rust_subscript): Likewise.
Diffstat (limited to 'gdb/expression.h')
-rw-r--r-- | gdb/expression.h | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/gdb/expression.h b/gdb/expression.h index 5af10f0..6bd3fc0 100644 --- a/gdb/expression.h +++ b/gdb/expression.h @@ -185,22 +185,22 @@ extern void dump_prefix_expression (struct expression *, struct ui_file *); or inclusive. So we have six sorts of subrange. This enumeration type is to identify this. */ -enum range_type +enum range_type : unsigned { - /* Neither the low nor the high bound was given -- so this refers to - the entire available range. */ - BOTH_BOUND_DEFAULT, - /* The low bound was not given and the high bound is inclusive. */ - LOW_BOUND_DEFAULT, - /* The high bound was not given and the low bound in inclusive. */ - HIGH_BOUND_DEFAULT, - /* Both bounds were given and both are inclusive. */ - NONE_BOUND_DEFAULT, - /* The low bound was not given and the high bound is exclusive. */ - NONE_BOUND_DEFAULT_EXCLUSIVE, - /* Both bounds were given. The low bound is inclusive and the high - bound is exclusive. */ - LOW_BOUND_DEFAULT_EXCLUSIVE, + /* This is a standard range. Both the lower and upper bounds are + defined, and the bounds are inclusive. */ + RANGE_STANDARD = 0, + + /* The low bound was not given. */ + RANGE_LOW_BOUND_DEFAULT = 1 << 0, + + /* The high bound was not given. */ + RANGE_HIGH_BOUND_DEFAULT = 1 << 1, + + /* The high bound of this range is exclusive. */ + RANGE_HIGH_BOUND_EXCLUSIVE = 1 << 2, }; +DEF_ENUM_FLAGS_TYPE (enum range_type, range_types); + #endif /* !defined (EXPRESSION_H) */ |