6873858b7e
This is version 2 of the patch to add inclusive range support for Rust. I believe it addresses all review comments. Rust recently stabilized the inclusive range feature: https://github.com/rust-lang/rust/issues/28237 An inclusive range is an expression like "..= EXPR" or "EXPR ..= EXPR". It is like an ordinary range, except the upper bound is inclusive, not exclusive. This patch adds support for this feature to gdb. Regression tested on x86-64 Fedora 27. 2018-04-27 Tom Tromey <tom@tromey.com> PR rust/22545: * rust-lang.c (rust_inclusive_range_type_p): New function. (rust_range): Handle inclusive ranges. (rust_compute_range): Likewise. * rust-exp.y (struct rust_op) <inclusive>: New field. (DOTDOTEQ): New constant. (range_expr): Add "..=" productions. (operator_tokens): Add "..=" token. (ast_range): Add "inclusive" parameter. (convert_ast_to_expression) <case OP_RANGE>: Handle inclusive ranges. * parse.c (operator_length_standard) <case OP_RANGE>: Handle new bounds values. * expression.h (enum range_type) <NONE_BOUND_DEFAULT_EXCLUSIVE, LOW_BOUND_DEFAULT_EXCLUSIVE>: New constants. Update comments. * expprint.c (print_subexp_standard): Handle new bounds values. (dump_subexp_body_standard): Likewise. 2018-04-27 Tom Tromey <tom@tromey.com> PR rust/22545: * gdb.rust/simple.exp: Add inclusive range tests.
176 lines
5.6 KiB
C
176 lines
5.6 KiB
C
/* Definitions for expressions stored in reversed prefix form, for GDB.
|
|
|
|
Copyright (C) 1986-2018 Free Software Foundation, Inc.
|
|
|
|
This file is part of GDB.
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
|
|
|
#if !defined (EXPRESSION_H)
|
|
#define EXPRESSION_H 1
|
|
|
|
|
|
#include "symtab.h" /* Needed for "struct block" type. */
|
|
|
|
|
|
/* Definitions for saved C expressions. */
|
|
|
|
/* An expression is represented as a vector of union exp_element's.
|
|
Each exp_element is an opcode, except that some opcodes cause
|
|
the following exp_element to be treated as a long or double constant
|
|
or as a variable. The opcodes are obeyed, using a stack for temporaries.
|
|
The value is left on the temporary stack at the end. */
|
|
|
|
/* When it is necessary to include a string,
|
|
it can occupy as many exp_elements as it needs.
|
|
We find the length of the string using strlen,
|
|
divide to find out how many exp_elements are used up,
|
|
and skip that many. Strings, like numbers, are indicated
|
|
by the preceding opcode. */
|
|
|
|
enum exp_opcode
|
|
{
|
|
#define OP(name) name ,
|
|
|
|
#include "std-operator.def"
|
|
|
|
/* First extension operator. Individual language modules define extra
|
|
operators in *.def include files below with numbers higher than
|
|
OP_EXTENDED0. */
|
|
OP (OP_EXTENDED0)
|
|
|
|
/* Language specific operators. */
|
|
#include "ada-operator.def"
|
|
|
|
#undef OP
|
|
|
|
/* Existing only to swallow the last comma (',') from last .inc file. */
|
|
OP_UNUSED_LAST
|
|
};
|
|
|
|
union exp_element
|
|
{
|
|
enum exp_opcode opcode;
|
|
struct symbol *symbol;
|
|
struct minimal_symbol *msymbol;
|
|
LONGEST longconst;
|
|
gdb_byte floatconst[16];
|
|
/* Really sizeof (union exp_element) characters (or less for the last
|
|
element of a string). */
|
|
char string;
|
|
struct type *type;
|
|
struct internalvar *internalvar;
|
|
const struct block *block;
|
|
struct objfile *objfile;
|
|
};
|
|
|
|
struct expression
|
|
{
|
|
const struct language_defn *language_defn; /* language it was
|
|
entered in. */
|
|
struct gdbarch *gdbarch; /* architecture it was parsed in. */
|
|
int nelts;
|
|
union exp_element elts[1];
|
|
};
|
|
|
|
typedef gdb::unique_xmalloc_ptr<expression> expression_up;
|
|
|
|
/* Macros for converting between number of expression elements and bytes
|
|
to store that many expression elements. */
|
|
|
|
#define EXP_ELEM_TO_BYTES(elements) \
|
|
((elements) * sizeof (union exp_element))
|
|
#define BYTES_TO_EXP_ELEM(bytes) \
|
|
(((bytes) + sizeof (union exp_element) - 1) / sizeof (union exp_element))
|
|
|
|
/* From parse.c */
|
|
|
|
extern expression_up parse_expression (const char *);
|
|
|
|
extern expression_up parse_expression_with_language (const char *string,
|
|
enum language lang);
|
|
|
|
extern struct type *parse_expression_for_completion
|
|
(const char *, gdb::unique_xmalloc_ptr<char> *, enum type_code *);
|
|
|
|
extern expression_up parse_exp_1 (const char **, CORE_ADDR pc,
|
|
const struct block *, int);
|
|
|
|
/* For use by parsers; set if we want to parse an expression and
|
|
attempt completion. */
|
|
extern int parse_completion;
|
|
|
|
/* From eval.c */
|
|
|
|
/* Values of NOSIDE argument to eval_subexp. */
|
|
|
|
enum noside
|
|
{
|
|
EVAL_NORMAL,
|
|
EVAL_SKIP, /* Only effect is to increment pos. */
|
|
EVAL_AVOID_SIDE_EFFECTS /* Don't modify any variables or
|
|
call any functions. The value
|
|
returned will have the correct
|
|
type, and will have an
|
|
approximately correct lvalue
|
|
type (inaccuracy: anything that is
|
|
listed as being in a register in
|
|
the function in which it was
|
|
declared will be lval_register).
|
|
Ideally this would not even read
|
|
target memory, but currently it
|
|
does in many situations. */
|
|
};
|
|
|
|
extern struct value *evaluate_subexp_standard
|
|
(struct type *, struct expression *, int *, enum noside);
|
|
|
|
/* From expprint.c */
|
|
|
|
extern void print_expression (struct expression *, struct ui_file *);
|
|
|
|
extern const char *op_name (struct expression *exp, enum exp_opcode opcode);
|
|
|
|
extern const char *op_string (enum exp_opcode);
|
|
|
|
extern void dump_raw_expression (struct expression *,
|
|
struct ui_file *, const char *);
|
|
extern void dump_prefix_expression (struct expression *, struct ui_file *);
|
|
|
|
/* In an OP_RANGE expression, either bound could be empty, indicating
|
|
that its value is by default that of the corresponding bound of the
|
|
array or string. Also, the upper end of the range can be exclusive
|
|
or inclusive. So we have six sorts of subrange. This enumeration
|
|
type is to identify this. */
|
|
|
|
enum range_type
|
|
{
|
|
/* 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,
|
|
};
|
|
|
|
#endif /* !defined (EXPRESSION_H) */
|