/* Bison parser for Rust expressions, for GDB.
- Copyright (C) 2016 Free Software Foundation, Inc.
+ Copyright (C) 2016-2020 Free Software Foundation, Inc.
This file is part of GDB.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
+/* The Bison manual says that %pure-parser is deprecated, but we use
+ it anyway because it also works with Byacc. That is also why
+ this uses %lex-param and %parse-param rather than the simpler
+ %param -- Byacc does not support the latter. */
+%pure-parser
+%lex-param {struct rust_parser *parser}
+%parse-param {struct rust_parser *parser}
+
/* Removing the last conflict seems difficult. */
%expect 1
#include "gdb_regex.h"
#include "rust-lang.h"
#include "parser-defs.h"
-#include "selftest.h"
+#include "gdbsupport/selftest.h"
#include "value.h"
-#include "vec.h"
+#include "gdbarch.h"
#define GDB_YY_REMAP_PREFIX rust
#include "yy-remap.h"
#define RUSTSTYPE YYSTYPE
-extern initialize_file_ftype _initialize_rust_exp;
-
struct rust_op;
-typedef const struct rust_op *rust_op_ptr;
-DEF_VEC_P (rust_op_ptr);
+typedef std::vector<const struct rust_op *> rust_op_vector;
/* A typed integer constant. */
struct typed_val_float
{
- DOUBLEST dval;
+ gdb_byte val[16];
struct type *type;
};
const struct rust_op *init;
};
-typedef struct set_field set_field;
+typedef std::vector<set_field> rust_set_vector;
-DEF_VEC_O (set_field);
+%}
+%union
+{
+ /* A typed integer constant. */
+ struct typed_val_int typed_val_int;
-static int rustyylex (void);
-static void rust_push_back (char c);
-static const char *rust_copy_name (const char *, int);
-static struct stoken rust_concat3 (const char *, const char *, const char *);
-static struct stoken make_stoken (const char *);
-static struct block_symbol rust_lookup_symbol (const char *name,
- const struct block *block,
- const domain_enum domain);
-static struct type *rust_lookup_type (const char *name,
- const struct block *block);
-static struct type *rust_type (const char *name);
-
-static const struct rust_op *crate_name (const struct rust_op *name);
-static const struct rust_op *super_name (const struct rust_op *name,
- unsigned int n_supers);
-
-static const struct rust_op *ast_operation (enum exp_opcode opcode,
- const struct rust_op *left,
- const struct rust_op *right);
-static const struct rust_op *ast_compound_assignment
- (enum exp_opcode opcode, const struct rust_op *left,
- const struct rust_op *rust_op);
-static const struct rust_op *ast_literal (struct typed_val_int val);
-static const struct rust_op *ast_dliteral (struct typed_val_float val);
-static const struct rust_op *ast_structop (const struct rust_op *left,
- const char *name,
- int completing);
-static const struct rust_op *ast_structop_anonymous
- (const struct rust_op *left, struct typed_val_int number);
-static const struct rust_op *ast_unary (enum exp_opcode opcode,
- const struct rust_op *expr);
-static const struct rust_op *ast_cast (const struct rust_op *expr,
- const struct rust_op *type);
-static const struct rust_op *ast_call_ish (enum exp_opcode opcode,
- const struct rust_op *expr,
- VEC (rust_op_ptr) **params);
-static const struct rust_op *ast_path (struct stoken name,
- VEC (rust_op_ptr) **params);
-static const struct rust_op *ast_string (struct stoken str);
-static const struct rust_op *ast_struct (const struct rust_op *name,
- VEC (set_field) **fields);
-static const struct rust_op *ast_range (const struct rust_op *lhs,
- const struct rust_op *rhs);
-static const struct rust_op *ast_array_type (const struct rust_op *lhs,
- struct typed_val_int val);
-static const struct rust_op *ast_slice_type (const struct rust_op *type);
-static const struct rust_op *ast_reference_type (const struct rust_op *type);
-static const struct rust_op *ast_pointer_type (const struct rust_op *type,
- int is_mut);
-static const struct rust_op *ast_function_type (const struct rust_op *result,
- VEC (rust_op_ptr) **params);
-static const struct rust_op *ast_tuple_type (VEC (rust_op_ptr) **params);
-
-/* The state of the parser, used internally when we are parsing the
- expression. */
+ /* A typed floating point constant. */
+ struct typed_val_float typed_val_float;
+
+ /* An identifier or string. */
+ struct stoken sval;
-static struct parser_state *pstate = NULL;
+ /* A token representing an opcode, like "==". */
+ enum exp_opcode opcode;
+
+ /* A list of expressions; for example, the arguments to a function
+ call. */
+ rust_op_vector *params;
+
+ /* A list of field initializers. */
+ rust_set_vector *field_inits;
+
+ /* A single field initializer. */
+ struct set_field one_field_init;
+
+ /* An expression. */
+ const struct rust_op *op;
+
+ /* A plain integer, for example used to count the number of
+ "super::" prefixes on a path. */
+ unsigned int depth;
+}
+
+%{
+
+struct rust_parser;
+static int rustyylex (YYSTYPE *, rust_parser *);
+static void rustyyerror (rust_parser *parser, const char *msg);
+
+static struct stoken make_stoken (const char *);
/* A regular expression for matching Rust numbers. This is split up
since it is very long and this gives us a way to comment the
static regex_t number_regex;
-/* True if we're running unit tests. */
-
-static int unit_testing;
-
-/* Obstack for data temporarily allocated during parsing. */
-
-static struct obstack work_obstack;
-
-/* Result of parsing. Points into work_obstack. */
-
-static const struct rust_op *rust_ast;
-
-%}
-
-%union
-{
- /* A typed integer constant. */
- struct typed_val_int typed_val_int;
-
- /* A typed floating point constant. */
- struct typed_val_float typed_val_float;
-
- /* An identifier or string. */
- struct stoken sval;
-
- /* A token representing an opcode, like "==". */
- enum exp_opcode opcode;
-
- /* A list of expressions; for example, the arguments to a function
- call. */
- VEC (rust_op_ptr) **params;
-
- /* A list of field initializers. */
- VEC (set_field) **field_inits;
-
- /* A single field initializer. */
- struct set_field one_field_init;
-
- /* An expression. */
- const struct rust_op *op;
-
- /* A plain integer, for example used to count the number of
- "super::" prefixes on a path. */
- unsigned int depth;
-}
-
-%{
+/* An instance of this is created before parsing, and destroyed when
+ parsing is finished. */
+
+struct rust_parser
+{
+ rust_parser (struct parser_state *state)
+ : rust_ast (nullptr),
+ pstate (state)
+ {
+ }
+
+ ~rust_parser ()
+ {
+ }
+
+ /* Create a new rust_set_vector. The storage for the new vector is
+ managed by this class. */
+ rust_set_vector *new_set_vector ()
+ {
+ rust_set_vector *result = new rust_set_vector;
+ set_vectors.push_back (std::unique_ptr<rust_set_vector> (result));
+ return result;
+ }
+
+ /* Create a new rust_ops_vector. The storage for the new vector is
+ managed by this class. */
+ rust_op_vector *new_op_vector ()
+ {
+ rust_op_vector *result = new rust_op_vector;
+ op_vectors.push_back (std::unique_ptr<rust_op_vector> (result));
+ return result;
+ }
+
+ /* Return the parser's language. */
+ const struct language_defn *language () const
+ {
+ return pstate->language ();
+ }
+
+ /* Return the parser's gdbarch. */
+ struct gdbarch *arch () const
+ {
+ return pstate->gdbarch ();
+ }
+
+ /* A helper to look up a Rust type, or fail. This only works for
+ types defined by rust_language_arch_info. */
+
+ struct type *get_type (const char *name)
+ {
+ struct type *type;
+
+ type = language_lookup_primitive_type (language (), arch (), name);
+ if (type == NULL)
+ error (_("Could not find Rust type %s"), name);
+ return type;
+ }
+
+ const char *copy_name (const char *name, int len);
+ struct stoken concat3 (const char *s1, const char *s2, const char *s3);
+ const struct rust_op *crate_name (const struct rust_op *name);
+ const struct rust_op *super_name (const struct rust_op *ident,
+ unsigned int n_supers);
+
+ int lex_character (YYSTYPE *lvalp);
+ int lex_number (YYSTYPE *lvalp);
+ int lex_string (YYSTYPE *lvalp);
+ int lex_identifier (YYSTYPE *lvalp);
+ uint32_t lex_hex (int min, int max);
+ uint32_t lex_escape (int is_byte);
+ int lex_operator (YYSTYPE *lvalp);
+ void push_back (char c);
+
+ void update_innermost_block (struct block_symbol sym);
+ struct block_symbol lookup_symbol (const char *name,
+ const struct block *block,
+ const domain_enum domain);
+ struct type *rust_lookup_type (const char *name, const struct block *block);
+ std::vector<struct type *> convert_params_to_types (rust_op_vector *params);
+ struct type *convert_ast_to_type (const struct rust_op *operation);
+ const char *convert_name (const struct rust_op *operation);
+ void convert_params_to_expression (rust_op_vector *params,
+ const struct rust_op *top);
+ void convert_ast_to_expression (const struct rust_op *operation,
+ const struct rust_op *top,
+ bool want_type = false);
+
+ struct rust_op *ast_basic_type (enum type_code typecode);
+ const struct rust_op *ast_operation (enum exp_opcode opcode,
+ const struct rust_op *left,
+ const struct rust_op *right);
+ const struct rust_op *ast_compound_assignment
+ (enum exp_opcode opcode, const struct rust_op *left,
+ const struct rust_op *rust_op);
+ const struct rust_op *ast_literal (struct typed_val_int val);
+ const struct rust_op *ast_dliteral (struct typed_val_float val);
+ const struct rust_op *ast_structop (const struct rust_op *left,
+ const char *name,
+ int completing);
+ const struct rust_op *ast_structop_anonymous
+ (const struct rust_op *left, struct typed_val_int number);
+ const struct rust_op *ast_unary (enum exp_opcode opcode,
+ const struct rust_op *expr);
+ const struct rust_op *ast_cast (const struct rust_op *expr,
+ const struct rust_op *type);
+ const struct rust_op *ast_call_ish (enum exp_opcode opcode,
+ const struct rust_op *expr,
+ rust_op_vector *params);
+ const struct rust_op *ast_path (struct stoken name,
+ rust_op_vector *params);
+ const struct rust_op *ast_string (struct stoken str);
+ const struct rust_op *ast_struct (const struct rust_op *name,
+ rust_set_vector *fields);
+ const struct rust_op *ast_range (const struct rust_op *lhs,
+ const struct rust_op *rhs,
+ bool inclusive);
+ const struct rust_op *ast_array_type (const struct rust_op *lhs,
+ struct typed_val_int val);
+ const struct rust_op *ast_slice_type (const struct rust_op *type);
+ const struct rust_op *ast_reference_type (const struct rust_op *type);
+ const struct rust_op *ast_pointer_type (const struct rust_op *type,
+ int is_mut);
+ const struct rust_op *ast_function_type (const struct rust_op *result,
+ rust_op_vector *params);
+ const struct rust_op *ast_tuple_type (rust_op_vector *params);
+
+
+ /* A pointer to this is installed globally. */
+ auto_obstack obstack;
+
+ /* Result of parsing. Points into obstack. */
+ const struct rust_op *rust_ast;
+
+ /* This keeps track of the various vectors we allocate. */
+ std::vector<std::unique_ptr<rust_set_vector>> set_vectors;
+ std::vector<std::unique_ptr<rust_op_vector>> op_vectors;
+
+ /* The parser state gdb gave us. */
+ struct parser_state *pstate;
+
+ /* Depth of parentheses. */
+ int paren_depth = 0;
+};
- /* Rust AST operations. We build a tree of these; then lower them
- to gdb expressions when parsing has completed. */
+/* Rust AST operations. We build a tree of these; then lower them to
+ gdb expressions when parsing has completed. */
struct rust_op
{
name occurred at the end of the expression and is eligible for
completion. */
unsigned int completing : 1;
+ /* For OP_RANGE, indicates whether the range is inclusive or
+ exclusive. */
+ unsigned int inclusive : 1;
/* Operands of expression. Which one is used and how depends on the
particular opcode. */
RUSTSTYPE left;
%token <voidval> KW_EXTERN
%token <voidval> KW_CONST
%token <voidval> KW_FN
+%token <voidval> KW_SIZEOF
/* Operator tokens. */
%token <voidval> DOTDOT
+%token <voidval> DOTDOTEQ
%token <voidval> OROR
%token <voidval> ANDAND
%token <voidval> EQEQ
%type <one_field_init> struct_expr_tail
/* Precedence. */
-%nonassoc DOTDOT
+%nonassoc DOTDOT DOTDOTEQ
%right '=' COMPOUND_ASSIGN
%left OROR
%left ANDAND
{
/* If we are completing and see a valid parse,
rust_ast will already have been set. */
- if (rust_ast == NULL)
- rust_ast = $1;
+ if (parser->rust_ast == NULL)
+ parser->rust_ast = $1;
}
;
| array_expr
| idx_expr
| range_expr
-| unop_expr
+| unop_expr /* Must precede call_expr because of ambiguity with
+ sizeof. */
| binop_expr
| paren_expr
| call_expr
tuple_expr:
'(' expr ',' maybe_expr_list ')'
{
- VEC_safe_insert (rust_op_ptr, *$4, 0, $2);
+ $4->push_back ($2);
error (_("Tuple expressions not supported yet"));
}
;
struct typed_val_int val;
val.type
- = language_lookup_primitive_type (parse_language (pstate),
- parse_gdbarch (pstate),
- "()");
+ = (language_lookup_primitive_type
+ (parser->language (), parser->arch (),
+ "()"));
val.val = 0;
- $$ = ast_literal (val);
+ $$ = parser->ast_literal (val);
}
;
AST. */
struct_expr:
path_for_expr '{' struct_expr_list '}'
- { $$ = ast_struct ($1, $3); }
+ { $$ = parser->ast_struct ($1, $3); }
;
struct_expr_tail:
sf.init = $3;
$$ = sf;
}
+| IDENT
+ {
+ struct set_field sf;
+
+ sf.name = $1;
+ sf.init = parser->ast_path ($1, NULL);
+ $$ = sf;
+ }
;
-/* S{} is documented as valid but seems to be an unstable feature, so
- it is left out here. */
struct_expr_list:
- struct_expr_tail
+ /* %empty */
{
- VEC (set_field) **result
- = OBSTACK_ZALLOC (&work_obstack, VEC (set_field) *);
-
- make_cleanup (VEC_cleanup (set_field), result);
- VEC_safe_push (set_field, *result, &$1);
-
+ $$ = parser->new_set_vector ();
+ }
+| struct_expr_tail
+ {
+ rust_set_vector *result = parser->new_set_vector ();
+ result->push_back ($1);
$$ = result;
}
| IDENT ':' expr ',' struct_expr_list
sf.name = $1;
sf.init = $3;
- VEC_safe_push (set_field, *$5, &sf);
+ $5->push_back (sf);
$$ = $5;
}
+| IDENT ',' struct_expr_list
+ {
+ struct set_field sf;
+
+ sf.name = $1;
+ sf.init = parser->ast_path ($1, NULL);
+ $3->push_back (sf);
+ $$ = $3;
+ }
;
array_expr:
'[' KW_MUT expr_list ']'
- { $$ = ast_call_ish (OP_ARRAY, NULL, $3); }
+ { $$ = parser->ast_call_ish (OP_ARRAY, NULL, $3); }
| '[' expr_list ']'
- { $$ = ast_call_ish (OP_ARRAY, NULL, $2); }
+ { $$ = parser->ast_call_ish (OP_ARRAY, NULL, $2); }
| '[' KW_MUT expr ';' expr ']'
- { $$ = ast_operation (OP_RUST_ARRAY, $3, $5); }
+ { $$ = parser->ast_operation (OP_RUST_ARRAY, $3, $5); }
| '[' expr ';' expr ']'
- { $$ = ast_operation (OP_RUST_ARRAY, $2, $4); }
+ { $$ = parser->ast_operation (OP_RUST_ARRAY, $2, $4); }
;
range_expr:
expr DOTDOT
- { $$ = ast_range ($1, NULL); }
+ { $$ = parser->ast_range ($1, NULL, false); }
| expr DOTDOT expr
- { $$ = ast_range ($1, $3); }
+ { $$ = parser->ast_range ($1, $3, false); }
+| expr DOTDOTEQ expr
+ { $$ = parser->ast_range ($1, $3, true); }
| DOTDOT expr
- { $$ = ast_range (NULL, $2); }
+ { $$ = parser->ast_range (NULL, $2, false); }
+| DOTDOTEQ expr
+ { $$ = parser->ast_range (NULL, $2, true); }
| DOTDOT
- { $$ = ast_range (NULL, NULL); }
+ { $$ = parser->ast_range (NULL, NULL, false); }
;
literal:
INTEGER
- { $$ = ast_literal ($1); }
+ { $$ = parser->ast_literal ($1); }
| DECIMAL_INTEGER
- { $$ = ast_literal ($1); }
+ { $$ = parser->ast_literal ($1); }
| FLOAT
- { $$ = ast_dliteral ($1); }
+ { $$ = parser->ast_dliteral ($1); }
| STRING
{
- const struct rust_op *str = ast_string ($1);
- VEC (set_field) **fields;
struct set_field field;
struct typed_val_int val;
struct stoken token;
- fields = OBSTACK_ZALLOC (&work_obstack, VEC (set_field) *);
- make_cleanup (VEC_cleanup (set_field), fields);
+ rust_set_vector *fields = parser->new_set_vector ();
/* Wrap the raw string in the &str struct. */
field.name.ptr = "data_ptr";
field.name.length = strlen (field.name.ptr);
- field.init = ast_unary (UNOP_ADDR, ast_string ($1));
- VEC_safe_push (set_field, *fields, &field);
+ field.init = parser->ast_unary (UNOP_ADDR,
+ parser->ast_string ($1));
+ fields->push_back (field);
- val.type = rust_type ("usize");
+ val.type = parser->get_type ("usize");
val.val = $1.length;
field.name.ptr = "length";
field.name.length = strlen (field.name.ptr);
- field.init = ast_literal (val);
- VEC_safe_push (set_field, *fields, &field);
+ field.init = parser->ast_literal (val);
+ fields->push_back (field);
token.ptr = "&str";
token.length = strlen (token.ptr);
- $$ = ast_struct (ast_path (token, NULL), fields);
+ $$ = parser->ast_struct (parser->ast_path (token, NULL),
+ fields);
}
| BYTESTRING
- { $$ = ast_string ($1); }
+ { $$ = parser->ast_string ($1); }
| KW_TRUE
{
struct typed_val_int val;
- val.type = language_bool_type (parse_language (pstate),
- parse_gdbarch (pstate));
+ val.type = language_bool_type (parser->language (),
+ parser->arch ());
val.val = 1;
- $$ = ast_literal (val);
+ $$ = parser->ast_literal (val);
}
| KW_FALSE
{
struct typed_val_int val;
- val.type = language_bool_type (parse_language (pstate),
- parse_gdbarch (pstate));
+ val.type = language_bool_type (parser->language (),
+ parser->arch ());
val.val = 0;
- $$ = ast_literal (val);
+ $$ = parser->ast_literal (val);
}
;
field_expr:
expr '.' IDENT
- { $$ = ast_structop ($1, $3.ptr, 0); }
+ { $$ = parser->ast_structop ($1, $3.ptr, 0); }
| expr '.' COMPLETE
{
- $$ = ast_structop ($1, $3.ptr, 1);
- rust_ast = $$;
+ $$ = parser->ast_structop ($1, $3.ptr, 1);
+ parser->rust_ast = $$;
}
| expr '.' DECIMAL_INTEGER
- { $$ = ast_structop_anonymous ($1, $3); }
+ { $$ = parser->ast_structop_anonymous ($1, $3); }
;
idx_expr:
expr '[' expr ']'
- { $$ = ast_operation (BINOP_SUBSCRIPT, $1, $3); }
+ { $$ = parser->ast_operation (BINOP_SUBSCRIPT, $1, $3); }
;
unop_expr:
'+' expr %prec UNARY
- { $$ = ast_unary (UNOP_PLUS, $2); }
+ { $$ = parser->ast_unary (UNOP_PLUS, $2); }
| '-' expr %prec UNARY
- { $$ = ast_unary (UNOP_NEG, $2); }
+ { $$ = parser->ast_unary (UNOP_NEG, $2); }
| '!' expr %prec UNARY
{
override for UNOP_COMPLEMENT, so it can do the
right thing for both bool and integral
values. */
- $$ = ast_unary (UNOP_COMPLEMENT, $2);
+ $$ = parser->ast_unary (UNOP_COMPLEMENT, $2);
}
| '*' expr %prec UNARY
- { $$ = ast_unary (UNOP_IND, $2); }
+ { $$ = parser->ast_unary (UNOP_IND, $2); }
| '&' expr %prec UNARY
- { $$ = ast_unary (UNOP_ADDR, $2); }
+ { $$ = parser->ast_unary (UNOP_ADDR, $2); }
| '&' KW_MUT expr %prec UNARY
- { $$ = ast_unary (UNOP_ADDR, $3); }
-
+ { $$ = parser->ast_unary (UNOP_ADDR, $3); }
+| KW_SIZEOF '(' expr ')' %prec UNARY
+ { $$ = parser->ast_unary (UNOP_SIZEOF, $3); }
;
binop_expr:
binop_expr_expr:
expr '*' expr
- { $$ = ast_operation (BINOP_MUL, $1, $3); }
+ { $$ = parser->ast_operation (BINOP_MUL, $1, $3); }
| expr '@' expr
- { $$ = ast_operation (BINOP_REPEAT, $1, $3); }
+ { $$ = parser->ast_operation (BINOP_REPEAT, $1, $3); }
| expr '/' expr
- { $$ = ast_operation (BINOP_DIV, $1, $3); }
+ { $$ = parser->ast_operation (BINOP_DIV, $1, $3); }
| expr '%' expr
- { $$ = ast_operation (BINOP_REM, $1, $3); }
+ { $$ = parser->ast_operation (BINOP_REM, $1, $3); }
| expr '<' expr
- { $$ = ast_operation (BINOP_LESS, $1, $3); }
+ { $$ = parser->ast_operation (BINOP_LESS, $1, $3); }
| expr '>' expr
- { $$ = ast_operation (BINOP_GTR, $1, $3); }
+ { $$ = parser->ast_operation (BINOP_GTR, $1, $3); }
| expr '&' expr
- { $$ = ast_operation (BINOP_BITWISE_AND, $1, $3); }
+ { $$ = parser->ast_operation (BINOP_BITWISE_AND, $1, $3); }
| expr '|' expr
- { $$ = ast_operation (BINOP_BITWISE_IOR, $1, $3); }
+ { $$ = parser->ast_operation (BINOP_BITWISE_IOR, $1, $3); }
| expr '^' expr
- { $$ = ast_operation (BINOP_BITWISE_XOR, $1, $3); }
+ { $$ = parser->ast_operation (BINOP_BITWISE_XOR, $1, $3); }
| expr '+' expr
- { $$ = ast_operation (BINOP_ADD, $1, $3); }
+ { $$ = parser->ast_operation (BINOP_ADD, $1, $3); }
| expr '-' expr
- { $$ = ast_operation (BINOP_SUB, $1, $3); }
+ { $$ = parser->ast_operation (BINOP_SUB, $1, $3); }
| expr OROR expr
- { $$ = ast_operation (BINOP_LOGICAL_OR, $1, $3); }
+ { $$ = parser->ast_operation (BINOP_LOGICAL_OR, $1, $3); }
| expr ANDAND expr
- { $$ = ast_operation (BINOP_LOGICAL_AND, $1, $3); }
+ { $$ = parser->ast_operation (BINOP_LOGICAL_AND, $1, $3); }
| expr EQEQ expr
- { $$ = ast_operation (BINOP_EQUAL, $1, $3); }
+ { $$ = parser->ast_operation (BINOP_EQUAL, $1, $3); }
| expr NOTEQ expr
- { $$ = ast_operation (BINOP_NOTEQUAL, $1, $3); }
+ { $$ = parser->ast_operation (BINOP_NOTEQUAL, $1, $3); }
| expr LTEQ expr
- { $$ = ast_operation (BINOP_LEQ, $1, $3); }
+ { $$ = parser->ast_operation (BINOP_LEQ, $1, $3); }
| expr GTEQ expr
- { $$ = ast_operation (BINOP_GEQ, $1, $3); }
+ { $$ = parser->ast_operation (BINOP_GEQ, $1, $3); }
| expr LSH expr
- { $$ = ast_operation (BINOP_LSH, $1, $3); }
+ { $$ = parser->ast_operation (BINOP_LSH, $1, $3); }
| expr RSH expr
- { $$ = ast_operation (BINOP_RSH, $1, $3); }
+ { $$ = parser->ast_operation (BINOP_RSH, $1, $3); }
;
type_cast_expr:
expr KW_AS type
- { $$ = ast_cast ($1, $3); }
+ { $$ = parser->ast_cast ($1, $3); }
;
assignment_expr:
expr '=' expr
- { $$ = ast_operation (BINOP_ASSIGN, $1, $3); }
+ { $$ = parser->ast_operation (BINOP_ASSIGN, $1, $3); }
;
compound_assignment_expr:
expr COMPOUND_ASSIGN expr
- { $$ = ast_compound_assignment ($2, $1, $3); }
+ { $$ = parser->ast_compound_assignment ($2, $1, $3); }
;
expr_list:
expr
{
- $$ = OBSTACK_ZALLOC (&work_obstack, VEC (rust_op_ptr) *);
- make_cleanup (VEC_cleanup (rust_op_ptr), $$);
- VEC_safe_push (rust_op_ptr, *$$, $1);
+ $$ = parser->new_op_vector ();
+ $$->push_back ($1);
}
| expr_list ',' expr
{
- VEC_safe_push (rust_op_ptr, *$1, $3);
+ $1->push_back ($3);
$$ = $1;
}
;
/* %empty */
{
/* The result can't be NULL. */
- $$ = OBSTACK_ZALLOC (&work_obstack, VEC (rust_op_ptr) *);
- make_cleanup (VEC_cleanup (rust_op_ptr), $$);
+ $$ = parser->new_op_vector ();
}
| expr_list
{ $$ = $1; }
;
paren_expr_list:
- '('
- maybe_expr_list
- ')'
+ '(' maybe_expr_list ')'
{ $$ = $2; }
;
call_expr:
expr paren_expr_list
- { $$ = ast_call_ish (OP_FUNCALL, $1, $2); }
+ { $$ = parser->ast_call_ish (OP_FUNCALL, $1, $2); }
;
maybe_self_path:
path_for_expr
{ $$ = $1; }
| GDBVAR
- { $$ = ast_path ($1, NULL); }
+ { $$ = parser->ast_path ($1, NULL); }
| KW_SELF
- { $$ = ast_path (make_stoken ("self"), NULL); }
+ { $$ = parser->ast_path (make_stoken ("self"), NULL); }
;
path_for_expr:
identifier_path_for_expr
| KW_SELF COLONCOLON identifier_path_for_expr
- { $$ = super_name ($3, 0); }
+ { $$ = parser->super_name ($3, 0); }
| maybe_self_path super_path identifier_path_for_expr
- { $$ = super_name ($3, $2); }
+ { $$ = parser->super_name ($3, $2); }
| COLONCOLON identifier_path_for_expr
- { $$ = crate_name ($2); }
+ { $$ = parser->crate_name ($2); }
| KW_EXTERN identifier_path_for_expr
{
/* This is a gdb extension to make it possible to
refer to items in other crates. It just bypasses
adding the current crate to the front of the
name. */
- $$ = ast_path (rust_concat3 ("::", $2->left.sval.ptr, NULL),
- $2->right.params);
+ $$ = parser->ast_path (parser->concat3 ("::",
+ $2->left.sval.ptr,
+ NULL),
+ $2->right.params);
}
;
identifier_path_for_expr:
IDENT
- { $$ = ast_path ($1, NULL); }
+ { $$ = parser->ast_path ($1, NULL); }
| identifier_path_for_expr COLONCOLON IDENT
{
- $$ = ast_path (rust_concat3 ($1->left.sval.ptr, "::",
- $3.ptr),
- NULL);
+ $$ = parser->ast_path (parser->concat3 ($1->left.sval.ptr,
+ "::", $3.ptr),
+ NULL);
}
| identifier_path_for_expr COLONCOLON '<' type_list '>'
- { $$ = ast_path ($1->left.sval, $4); }
+ { $$ = parser->ast_path ($1->left.sval, $4); }
| identifier_path_for_expr COLONCOLON '<' type_list RSH
{
- $$ = ast_path ($1->left.sval, $4);
- rust_push_back ('>');
+ $$ = parser->ast_path ($1->left.sval, $4);
+ parser->push_back ('>');
}
;
path_for_type:
identifier_path_for_type
| KW_SELF COLONCOLON identifier_path_for_type
- { $$ = super_name ($3, 0); }
+ { $$ = parser->super_name ($3, 0); }
| maybe_self_path super_path identifier_path_for_type
- { $$ = super_name ($3, $2); }
+ { $$ = parser->super_name ($3, $2); }
| COLONCOLON identifier_path_for_type
- { $$ = crate_name ($2); }
+ { $$ = parser->crate_name ($2); }
| KW_EXTERN identifier_path_for_type
{
/* This is a gdb extension to make it possible to
refer to items in other crates. It just bypasses
adding the current crate to the front of the
name. */
- $$ = ast_path (rust_concat3 ("::", $2->left.sval.ptr, NULL),
- $2->right.params);
+ $$ = parser->ast_path (parser->concat3 ("::",
+ $2->left.sval.ptr,
+ NULL),
+ $2->right.params);
}
;
just_identifiers_for_type:
IDENT
- { $$ = ast_path ($1, NULL); }
+ { $$ = parser->ast_path ($1, NULL); }
| just_identifiers_for_type COLONCOLON IDENT
{
- $$ = ast_path (rust_concat3 ($1->left.sval.ptr, "::",
- $3.ptr),
- NULL);
+ $$ = parser->ast_path (parser->concat3 ($1->left.sval.ptr,
+ "::", $3.ptr),
+ NULL);
}
;
identifier_path_for_type:
just_identifiers_for_type
| just_identifiers_for_type '<' type_list '>'
- { $$ = ast_path ($1->left.sval, $3); }
+ { $$ = parser->ast_path ($1->left.sval, $3); }
| just_identifiers_for_type '<' type_list RSH
{
- $$ = ast_path ($1->left.sval, $3);
- rust_push_back ('>');
+ $$ = parser->ast_path ($1->left.sval, $3);
+ parser->push_back ('>');
}
;
type:
path_for_type
| '[' type ';' INTEGER ']'
- { $$ = ast_array_type ($2, $4); }
+ { $$ = parser->ast_array_type ($2, $4); }
| '[' type ';' DECIMAL_INTEGER ']'
- { $$ = ast_array_type ($2, $4); }
+ { $$ = parser->ast_array_type ($2, $4); }
| '&' '[' type ']'
- { $$ = ast_slice_type ($3); }
+ { $$ = parser->ast_slice_type ($3); }
| '&' type
- { $$ = ast_reference_type ($2); }
+ { $$ = parser->ast_reference_type ($2); }
| '*' KW_MUT type
- { $$ = ast_pointer_type ($3, 1); }
+ { $$ = parser->ast_pointer_type ($3, 1); }
| '*' KW_CONST type
- { $$ = ast_pointer_type ($3, 0); }
+ { $$ = parser->ast_pointer_type ($3, 0); }
| KW_FN '(' maybe_type_list ')' ARROW type
- { $$ = ast_function_type ($6, $3); }
+ { $$ = parser->ast_function_type ($6, $3); }
| '(' maybe_type_list ')'
- { $$ = ast_tuple_type ($2); }
+ { $$ = parser->ast_tuple_type ($2); }
;
maybe_type_list:
type_list:
type
{
- VEC (rust_op_ptr) **result
- = OBSTACK_ZALLOC (&work_obstack, VEC (rust_op_ptr) *);
-
- make_cleanup (VEC_cleanup (rust_op_ptr), result);
- VEC_safe_push (rust_op_ptr, *result, $1);
+ rust_op_vector *result = parser->new_op_vector ();
+ result->push_back ($1);
$$ = result;
}
| type_list ',' type
{
- VEC_safe_push (rust_op_ptr, *$1, $3);
+ $1->push_back ($3);
$$ = $1;
}
;
{ "true", KW_TRUE, OP_NULL },
{ "extern", KW_EXTERN, OP_NULL },
{ "fn", KW_FN, OP_NULL },
+ { "sizeof", KW_SIZEOF, OP_NULL },
};
/* Operator tokens, sorted longest first. */
{ "&=", COMPOUND_ASSIGN, BINOP_BITWISE_AND },
{ "|=", COMPOUND_ASSIGN, BINOP_BITWISE_IOR },
{ "^=", COMPOUND_ASSIGN, BINOP_BITWISE_XOR },
+ { "..=", DOTDOTEQ, OP_NULL },
{ "::", COLONCOLON, OP_NULL },
{ "..", DOTDOT, OP_NULL },
/* Helper function to copy to the name obstack. */
-static const char *
-rust_copy_name (const char *name, int len)
+const char *
+rust_parser::copy_name (const char *name, int len)
{
- return (const char *) obstack_copy0 (&work_obstack, name, len);
+ return obstack_strndup (&obstack, name, len);
}
/* Helper function to make an stoken from a C string. */
/* Helper function to concatenate three strings on the name
obstack. */
-static struct stoken
-rust_concat3 (const char *s1, const char *s2, const char *s3)
+struct stoken
+rust_parser::concat3 (const char *s1, const char *s2, const char *s3)
{
- return make_stoken (obconcat (&work_obstack, s1, s2, s3, (char *) NULL));
+ return make_stoken (obconcat (&obstack, s1, s2, s3, (char *) NULL));
}
/* Return an AST node referring to NAME, but relative to the crate's
name. */
-static const struct rust_op *
-crate_name (const struct rust_op *name)
+const struct rust_op *
+rust_parser::crate_name (const struct rust_op *name)
{
- char *crate = rust_crate_for_block (expression_context_block);
+ std::string crate = rust_crate_for_block (pstate->expression_context_block);
struct stoken result;
gdb_assert (name->opcode == OP_VAR_VALUE);
- if (crate == NULL)
+ if (crate.empty ())
error (_("Could not find crate for current location"));
- result = make_stoken (obconcat (&work_obstack, "::", crate, "::",
+ result = make_stoken (obconcat (&obstack, "::", crate.c_str (), "::",
name->left.sval.ptr, (char *) NULL));
- xfree (crate);
return ast_path (result, name->right.params);
}
is the base name and N_SUPERS is how many "super::"s were
provided. N_SUPERS can be zero. */
-static const struct rust_op *
-super_name (const struct rust_op *ident, unsigned int n_supers)
+const struct rust_op *
+rust_parser::super_name (const struct rust_op *ident, unsigned int n_supers)
{
- const char *scope = block_scope (expression_context_block);
+ const char *scope = block_scope (pstate->expression_context_block);
int offset;
gdb_assert (ident->opcode == OP_VAR_VALUE);
if (n_supers > 0)
{
- int i;
int len;
- VEC (int) *offsets = NULL;
- unsigned int current_len, previous_len;
- struct cleanup *cleanup;
+ std::vector<int> offsets;
+ unsigned int current_len;
- cleanup = make_cleanup (VEC_cleanup (int), &offsets);
current_len = cp_find_first_component (scope);
- previous_len = 0;
while (scope[current_len] != '\0')
{
- VEC_safe_push (int, offsets, current_len);
+ offsets.push_back (current_len);
gdb_assert (scope[current_len] == ':');
- previous_len = current_len;
/* The "::". */
current_len += 2;
current_len += cp_find_first_component (scope
+ current_len);
}
- len = VEC_length (int, offsets);
+ len = offsets.size ();
if (n_supers >= len)
error (_("Too many super:: uses from '%s'"), scope);
- offset = VEC_index (int, offsets, len - n_supers);
-
- do_cleanups (cleanup);
+ offset = offsets[len - n_supers];
}
else
offset = strlen (scope);
- obstack_grow (&work_obstack, "::", 2);
- obstack_grow (&work_obstack, scope, offset);
- obstack_grow (&work_obstack, "::", 2);
- obstack_grow0 (&work_obstack, ident->left.sval.ptr, ident->left.sval.length);
+ obstack_grow (&obstack, "::", 2);
+ obstack_grow (&obstack, scope, offset);
+ obstack_grow (&obstack, "::", 2);
+ obstack_grow0 (&obstack, ident->left.sval.ptr, ident->left.sval.length);
- return ast_path (make_stoken ((const char *) obstack_finish (&work_obstack)),
+ return ast_path (make_stoken ((const char *) obstack_finish (&obstack)),
ident->right.params);
}
-/* A helper that updates innermost_block as appropriate. */
+/* A helper that updates the innermost block as appropriate. */
-static void
-update_innermost_block (struct block_symbol sym)
-{
- if (symbol_read_needs_frame (sym.symbol)
- && (innermost_block == NULL
- || contained_in (sym.block, innermost_block)))
- innermost_block = sym.block;
-}
-
-/* A helper to look up a Rust type, or fail. This only works for
- types defined by rust_language_arch_info. */
-
-static struct type *
-rust_type (const char *name)
+void
+rust_parser::update_innermost_block (struct block_symbol sym)
{
- struct type *type;
-
- /* When unit testing, we don't bother checking the types, so avoid a
- possibly-failing lookup here. */
- if (unit_testing)
- return NULL;
-
- type = language_lookup_primitive_type (parse_language (pstate),
- parse_gdbarch (pstate),
- name);
- if (type == NULL)
- error (_("Could not find Rust type %s"), name);
- return type;
+ if (symbol_read_needs_frame (sym.symbol))
+ pstate->block_tracker->update (sym);
}
/* Lex a hex number with at least MIN digits and at most MAX
digits. */
-static uint32_t
-lex_hex (int min, int max)
+uint32_t
+rust_parser::lex_hex (int min, int max)
{
uint32_t result = 0;
int len = 0;
int check_max = min == max;
while ((check_max ? len <= max : 1)
- && ((lexptr[0] >= 'a' && lexptr[0] <= 'f')
- || (lexptr[0] >= 'A' && lexptr[0] <= 'F')
- || (lexptr[0] >= '0' && lexptr[0] <= '9')))
+ && ((pstate->lexptr[0] >= 'a' && pstate->lexptr[0] <= 'f')
+ || (pstate->lexptr[0] >= 'A' && pstate->lexptr[0] <= 'F')
+ || (pstate->lexptr[0] >= '0' && pstate->lexptr[0] <= '9')))
{
result *= 16;
- if (lexptr[0] >= 'a' && lexptr[0] <= 'f')
- result = result + 10 + lexptr[0] - 'a';
- else if (lexptr[0] >= 'A' && lexptr[0] <= 'F')
- result = result + 10 + lexptr[0] - 'A';
+ if (pstate->lexptr[0] >= 'a' && pstate->lexptr[0] <= 'f')
+ result = result + 10 + pstate->lexptr[0] - 'a';
+ else if (pstate->lexptr[0] >= 'A' && pstate->lexptr[0] <= 'F')
+ result = result + 10 + pstate->lexptr[0] - 'A';
else
- result = result + lexptr[0] - '0';
- ++lexptr;
+ result = result + pstate->lexptr[0] - '0';
+ ++pstate->lexptr;
++len;
}
/* Lex an escape. IS_BYTE is true if we're lexing a byte escape;
otherwise we're lexing a character escape. */
-static uint32_t
-lex_escape (int is_byte)
+uint32_t
+rust_parser::lex_escape (int is_byte)
{
uint32_t result;
- gdb_assert (lexptr[0] == '\\');
- ++lexptr;
- switch (lexptr[0])
+ gdb_assert (pstate->lexptr[0] == '\\');
+ ++pstate->lexptr;
+ switch (pstate->lexptr[0])
{
case 'x':
- ++lexptr;
+ ++pstate->lexptr;
result = lex_hex (2, 2);
break;
case 'u':
if (is_byte)
error (_("Unicode escape in byte literal"));
- ++lexptr;
- if (lexptr[0] != '{')
+ ++pstate->lexptr;
+ if (pstate->lexptr[0] != '{')
error (_("Missing '{' in Unicode escape"));
- ++lexptr;
+ ++pstate->lexptr;
result = lex_hex (1, 6);
/* Could do range checks here. */
- if (lexptr[0] != '}')
+ if (pstate->lexptr[0] != '}')
error (_("Missing '}' in Unicode escape"));
- ++lexptr;
+ ++pstate->lexptr;
break;
case 'n':
result = '\n';
- ++lexptr;
+ ++pstate->lexptr;
break;
case 'r':
result = '\r';
- ++lexptr;
+ ++pstate->lexptr;
break;
case 't':
result = '\t';
- ++lexptr;
+ ++pstate->lexptr;
break;
case '\\':
result = '\\';
- ++lexptr;
+ ++pstate->lexptr;
break;
case '0':
result = '\0';
- ++lexptr;
+ ++pstate->lexptr;
break;
case '\'':
result = '\'';
- ++lexptr;
+ ++pstate->lexptr;
break;
case '"':
result = '"';
- ++lexptr;
+ ++pstate->lexptr;
break;
default:
- error (_("Invalid escape \\%c in literal"), lexptr[0]);
+ error (_("Invalid escape \\%c in literal"), pstate->lexptr[0]);
}
return result;
/* Lex a character constant. */
-static int
-lex_character (void)
+int
+rust_parser::lex_character (YYSTYPE *lvalp)
{
int is_byte = 0;
uint32_t value;
- if (lexptr[0] == 'b')
+ if (pstate->lexptr[0] == 'b')
{
is_byte = 1;
- ++lexptr;
+ ++pstate->lexptr;
}
- gdb_assert (lexptr[0] == '\'');
- ++lexptr;
+ gdb_assert (pstate->lexptr[0] == '\'');
+ ++pstate->lexptr;
/* This should handle UTF-8 here. */
- if (lexptr[0] == '\\')
+ if (pstate->lexptr[0] == '\\')
value = lex_escape (is_byte);
else
{
- value = lexptr[0] & 0xff;
- ++lexptr;
+ value = pstate->lexptr[0] & 0xff;
+ ++pstate->lexptr;
}
- if (lexptr[0] != '\'')
+ if (pstate->lexptr[0] != '\'')
error (_("Unterminated character literal"));
- ++lexptr;
+ ++pstate->lexptr;
- rustyylval.typed_val_int.val = value;
- rustyylval.typed_val_int.type = rust_type (is_byte ? "u8" : "char");
+ lvalp->typed_val_int.val = value;
+ lvalp->typed_val_int.type = get_type (is_byte ? "u8" : "char");
return INTEGER;
}
/* Return true if STR looks like the end of a raw string that had N
hashes at the start. */
-static int
+static bool
ends_raw_string (const char *str, int n)
{
int i;
gdb_assert (str[0] == '"');
for (i = 0; i < n; ++i)
if (str[i + 1] != '#')
- return 0;
- return 1;
+ return false;
+ return true;
}
/* Lex a string constant. */
-static int
-lex_string (void)
+int
+rust_parser::lex_string (YYSTYPE *lvalp)
{
- int is_byte = lexptr[0] == 'b';
+ int is_byte = pstate->lexptr[0] == 'b';
int raw_length;
- int len_in_chars = 0;
if (is_byte)
- ++lexptr;
- raw_length = starts_raw_string (lexptr);
- lexptr += raw_length;
- gdb_assert (lexptr[0] == '"');
- ++lexptr;
+ ++pstate->lexptr;
+ raw_length = starts_raw_string (pstate->lexptr);
+ pstate->lexptr += raw_length;
+ gdb_assert (pstate->lexptr[0] == '"');
+ ++pstate->lexptr;
while (1)
{
if (raw_length > 0)
{
- if (lexptr[0] == '"' && ends_raw_string (lexptr, raw_length - 1))
+ if (pstate->lexptr[0] == '"' && ends_raw_string (pstate->lexptr,
+ raw_length - 1))
{
/* Exit with lexptr pointing after the final "#". */
- lexptr += raw_length;
+ pstate->lexptr += raw_length;
break;
}
- else if (lexptr[0] == '\0')
+ else if (pstate->lexptr[0] == '\0')
error (_("Unexpected EOF in string"));
- value = lexptr[0] & 0xff;
+ value = pstate->lexptr[0] & 0xff;
if (is_byte && value > 127)
error (_("Non-ASCII value in raw byte string"));
- obstack_1grow (&work_obstack, value);
+ obstack_1grow (&obstack, value);
- ++lexptr;
+ ++pstate->lexptr;
}
- else if (lexptr[0] == '"')
+ else if (pstate->lexptr[0] == '"')
{
/* Make sure to skip the quote. */
- ++lexptr;
+ ++pstate->lexptr;
break;
}
- else if (lexptr[0] == '\\')
+ else if (pstate->lexptr[0] == '\\')
{
value = lex_escape (is_byte);
if (is_byte)
- obstack_1grow (&work_obstack, value);
+ obstack_1grow (&obstack, value);
else
convert_between_encodings ("UTF-32", "UTF-8", (gdb_byte *) &value,
sizeof (value), sizeof (value),
- &work_obstack, translit_none);
+ &obstack, translit_none);
}
- else if (lexptr[0] == '\0')
+ else if (pstate->lexptr[0] == '\0')
error (_("Unexpected EOF in string"));
else
{
- value = lexptr[0] & 0xff;
+ value = pstate->lexptr[0] & 0xff;
if (is_byte && value > 127)
error (_("Non-ASCII value in byte string"));
- obstack_1grow (&work_obstack, value);
- ++lexptr;
+ obstack_1grow (&obstack, value);
+ ++pstate->lexptr;
}
}
- rustyylval.sval.length = obstack_object_size (&work_obstack);
- rustyylval.sval.ptr = (const char *) obstack_finish (&work_obstack);
+ lvalp->sval.length = obstack_object_size (&obstack);
+ lvalp->sval.ptr = (const char *) obstack_finish (&obstack);
return is_byte ? BYTESTRING : STRING;
}
/* Return true if STRING starts with whitespace followed by a digit. */
-static int
+static bool
space_then_number (const char *string)
{
const char *p = string;
while (p[0] == ' ' || p[0] == '\t')
++p;
if (p == string)
- return 0;
+ return false;
return *p >= '0' && *p <= '9';
}
/* Return true if C can start an identifier. */
-static int
+static bool
rust_identifier_start_p (char c)
{
return ((c >= 'a' && c <= 'z')
/* Lex an identifier. */
-static int
-lex_identifier (void)
+int
+rust_parser::lex_identifier (YYSTYPE *lvalp)
{
- const char *start = lexptr;
+ const char *start = pstate->lexptr;
unsigned int length;
const struct token_info *token;
int i;
- int is_gdb_var = lexptr[0] == '$';
+ int is_gdb_var = pstate->lexptr[0] == '$';
- gdb_assert (rust_identifier_start_p (lexptr[0]));
+ gdb_assert (rust_identifier_start_p (pstate->lexptr[0]));
- ++lexptr;
+ ++pstate->lexptr;
/* For the time being this doesn't handle Unicode rules. Non-ASCII
identifiers are gated anyway. */
- while ((lexptr[0] >= 'a' && lexptr[0] <= 'z')
- || (lexptr[0] >= 'A' && lexptr[0] <= 'Z')
- || lexptr[0] == '_'
- || (is_gdb_var && lexptr[0] == '$')
- || (lexptr[0] >= '0' && lexptr[0] <= '9'))
- ++lexptr;
+ while ((pstate->lexptr[0] >= 'a' && pstate->lexptr[0] <= 'z')
+ || (pstate->lexptr[0] >= 'A' && pstate->lexptr[0] <= 'Z')
+ || pstate->lexptr[0] == '_'
+ || (is_gdb_var && pstate->lexptr[0] == '$')
+ || (pstate->lexptr[0] >= '0' && pstate->lexptr[0] <= '9'))
+ ++pstate->lexptr;
- length = lexptr - start;
+ length = pstate->lexptr - start;
token = NULL;
for (i = 0; i < ARRAY_SIZE (identifier_tokens); ++i)
{
if (token->value == 0)
{
/* Leave the terminating token alone. */
- lexptr = start;
+ pstate->lexptr = start;
return 0;
}
}
else if (token == NULL
&& (strncmp (start, "thread", length) == 0
|| strncmp (start, "task", length) == 0)
- && space_then_number (lexptr))
+ && space_then_number (pstate->lexptr))
{
/* "task" or "thread" followed by a number terminates the
parse, per gdb rules. */
- lexptr = start;
+ pstate->lexptr = start;
return 0;
}
- if (token == NULL || (parse_completion && lexptr[0] == '\0'))
- rustyylval.sval = make_stoken (rust_copy_name (start, length));
+ if (token == NULL || (pstate->parse_completion && pstate->lexptr[0] == '\0'))
+ lvalp->sval = make_stoken (copy_name (start, length));
- if (parse_completion && lexptr[0] == '\0')
+ if (pstate->parse_completion && pstate->lexptr[0] == '\0')
{
/* Prevent rustyylex from returning two COMPLETE tokens. */
- prev_lexptr = lexptr;
+ pstate->prev_lexptr = pstate->lexptr;
return COMPLETE;
}
/* Lex an operator. */
-static int
-lex_operator (void)
+int
+rust_parser::lex_operator (YYSTYPE *lvalp)
{
const struct token_info *token = NULL;
int i;
for (i = 0; i < ARRAY_SIZE (operator_tokens); ++i)
{
- if (strncmp (operator_tokens[i].name, lexptr,
+ if (strncmp (operator_tokens[i].name, pstate->lexptr,
strlen (operator_tokens[i].name)) == 0)
{
- lexptr += strlen (operator_tokens[i].name);
+ pstate->lexptr += strlen (operator_tokens[i].name);
token = &operator_tokens[i];
break;
}
if (token != NULL)
{
- rustyylval.opcode = token->opcode;
+ lvalp->opcode = token->opcode;
return token->value;
}
- return *lexptr++;
+ return *pstate->lexptr++;
}
/* Lex a number. */
-static int
-lex_number (void)
+int
+rust_parser::lex_number (YYSTYPE *lvalp)
{
regmatch_t subexps[NUM_SUBEXPRESSIONS];
int match;
int is_integer = 0;
int could_be_decimal = 1;
int implicit_i32 = 0;
- char *type_name = NULL;
+ const char *type_name = NULL;
struct type *type;
int end_index;
int type_index = -1;
- int i, out;
- char *number;
- struct cleanup *cleanup = make_cleanup (null_cleanup, NULL);
+ int i;
- match = regexec (&number_regex, lexptr, ARRAY_SIZE (subexps), subexps, 0);
+ match = regexec (&number_regex, pstate->lexptr, ARRAY_SIZE (subexps),
+ subexps, 0);
/* Failure means the regexp is broken. */
gdb_assert (match == 0);
a request for a trait method call, not a syntax error involving
the floating point number "23.". */
gdb_assert (subexps[0].rm_eo > 0);
- if (lexptr[subexps[0].rm_eo - 1] == '.')
+ if (pstate->lexptr[subexps[0].rm_eo - 1] == '.')
{
- const char *next = skip_spaces_const (&lexptr[subexps[0].rm_eo]);
+ const char *next = skip_spaces (&pstate->lexptr[subexps[0].rm_eo]);
if (rust_identifier_start_p (*next) || *next == '.')
{
}
/* Compute the type name if we haven't already. */
+ std::string type_name_holder;
if (type_name == NULL)
{
gdb_assert (type_index != -1);
- type_name = xstrndup (lexptr + subexps[type_index].rm_so,
- (subexps[type_index].rm_eo
- - subexps[type_index].rm_so));
- make_cleanup (xfree, type_name);
+ type_name_holder = std::string ((pstate->lexptr
+ + subexps[type_index].rm_so),
+ (subexps[type_index].rm_eo
+ - subexps[type_index].rm_so));
+ type_name = type_name_holder.c_str ();
}
/* Look up the type. */
- type = rust_type (type_name);
+ type = get_type (type_name);
/* Copy the text of the number and remove the "_"s. */
- number = xstrndup (lexptr, end_index);
- make_cleanup (xfree, number);
- for (i = out = 0; number[i]; ++i)
+ std::string number;
+ for (i = 0; i < end_index && pstate->lexptr[i]; ++i)
{
- if (number[i] == '_')
+ if (pstate->lexptr[i] == '_')
could_be_decimal = 0;
else
- number[out++] = number[i];
+ number.push_back (pstate->lexptr[i]);
}
- number[out] = '\0';
/* Advance past the match. */
- lexptr += subexps[0].rm_eo;
+ pstate->lexptr += subexps[0].rm_eo;
/* Parse the number. */
if (is_integer)
{
uint64_t value;
int radix = 10;
+ int offset = 0;
+
if (number[0] == '0')
{
if (number[1] == 'x')
radix = 2;
if (radix != 10)
{
- number += 2;
+ offset = 2;
could_be_decimal = 0;
}
}
- value = strtoul (number, NULL, radix);
+ value = strtoulst (number.c_str () + offset, NULL, radix);
if (implicit_i32 && value >= ((uint64_t) 1) << 31)
- type = rust_type ("i64");
+ type = get_type ("i64");
- rustyylval.typed_val_int.val = value;
- rustyylval.typed_val_int.type = type;
+ lvalp->typed_val_int.val = value;
+ lvalp->typed_val_int.type = type;
}
else
{
- rustyylval.typed_val_float.dval = strtod (number, NULL);
- rustyylval.typed_val_float.type = type;
+ lvalp->typed_val_float.type = type;
+ bool parsed = parse_float (number.c_str (), number.length (),
+ lvalp->typed_val_float.type,
+ lvalp->typed_val_float.val);
+ gdb_assert (parsed);
}
- do_cleanups (cleanup);
return is_integer ? (could_be_decimal ? DECIMAL_INTEGER : INTEGER) : FLOAT;
}
/* The lexer. */
static int
-rustyylex (void)
+rustyylex (YYSTYPE *lvalp, rust_parser *parser)
{
+ struct parser_state *pstate = parser->pstate;
+
/* Skip all leading whitespace. */
- while (lexptr[0] == ' ' || lexptr[0] == '\t' || lexptr[0] == '\r'
- || lexptr[0] == '\n')
- ++lexptr;
+ while (pstate->lexptr[0] == ' '
+ || pstate->lexptr[0] == '\t'
+ || pstate->lexptr[0] == '\r'
+ || pstate->lexptr[0] == '\n')
+ ++pstate->lexptr;
/* If we hit EOF and we're completing, then return COMPLETE -- maybe
we're completing an empty string at the end of a field_expr.
But, we don't want to return two COMPLETE tokens in a row. */
- if (lexptr[0] == '\0' && lexptr == prev_lexptr)
+ if (pstate->lexptr[0] == '\0' && pstate->lexptr == pstate->prev_lexptr)
return 0;
- prev_lexptr = lexptr;
- if (lexptr[0] == '\0')
+ pstate->prev_lexptr = pstate->lexptr;
+ if (pstate->lexptr[0] == '\0')
{
- if (parse_completion)
+ if (pstate->parse_completion)
{
- rustyylval.sval = make_stoken ("");
+ lvalp->sval = make_stoken ("");
return COMPLETE;
}
return 0;
}
- if (lexptr[0] >= '0' && lexptr[0] <= '9')
- return lex_number ();
- else if (lexptr[0] == 'b' && lexptr[1] == '\'')
- return lex_character ();
- else if (lexptr[0] == 'b' && lexptr[1] == '"')
- return lex_string ();
- else if (lexptr[0] == 'b' && starts_raw_string (lexptr + 1))
- return lex_string ();
- else if (starts_raw_string (lexptr))
- return lex_string ();
- else if (rust_identifier_start_p (lexptr[0]))
- return lex_identifier ();
- else if (lexptr[0] == '"')
- return lex_string ();
- else if (lexptr[0] == '\'')
- return lex_character ();
- else if (lexptr[0] == '}' || lexptr[0] == ']')
+ if (pstate->lexptr[0] >= '0' && pstate->lexptr[0] <= '9')
+ return parser->lex_number (lvalp);
+ else if (pstate->lexptr[0] == 'b' && pstate->lexptr[1] == '\'')
+ return parser->lex_character (lvalp);
+ else if (pstate->lexptr[0] == 'b' && pstate->lexptr[1] == '"')
+ return parser->lex_string (lvalp);
+ else if (pstate->lexptr[0] == 'b' && starts_raw_string (pstate->lexptr + 1))
+ return parser->lex_string (lvalp);
+ else if (starts_raw_string (pstate->lexptr))
+ return parser->lex_string (lvalp);
+ else if (rust_identifier_start_p (pstate->lexptr[0]))
+ return parser->lex_identifier (lvalp);
+ else if (pstate->lexptr[0] == '"')
+ return parser->lex_string (lvalp);
+ else if (pstate->lexptr[0] == '\'')
+ return parser->lex_character (lvalp);
+ else if (pstate->lexptr[0] == '}' || pstate->lexptr[0] == ']')
{
/* Falls through to lex_operator. */
- --paren_depth;
+ --parser->paren_depth;
}
- else if (lexptr[0] == '(' || lexptr[0] == '{')
+ else if (pstate->lexptr[0] == '(' || pstate->lexptr[0] == '{')
{
/* Falls through to lex_operator. */
- ++paren_depth;
+ ++parser->paren_depth;
}
- else if (lexptr[0] == ',' && comma_terminates && paren_depth == 0)
+ else if (pstate->lexptr[0] == ',' && pstate->comma_terminates
+ && parser->paren_depth == 0)
return 0;
- return lex_operator ();
+ return parser->lex_operator (lvalp);
}
/* Push back a single character to be re-lexed. */
-static void
-rust_push_back (char c)
+void
+rust_parser::push_back (char c)
{
/* Can't be called before any lexing. */
- gdb_assert (prev_lexptr != NULL);
+ gdb_assert (pstate->prev_lexptr != NULL);
- --lexptr;
- gdb_assert (*lexptr == c);
+ --pstate->lexptr;
+ gdb_assert (*pstate->lexptr == c);
}
\f
/* Make an arbitrary operation and fill in the fields. */
-static const struct rust_op *
-ast_operation (enum exp_opcode opcode, const struct rust_op *left,
- const struct rust_op *right)
+const struct rust_op *
+rust_parser::ast_operation (enum exp_opcode opcode, const struct rust_op *left,
+ const struct rust_op *right)
{
- struct rust_op *result = OBSTACK_ZALLOC (&work_obstack, struct rust_op);
+ struct rust_op *result = OBSTACK_ZALLOC (&obstack, struct rust_op);
result->opcode = opcode;
result->left.op = left;
/* Make a compound assignment operation. */
-static const struct rust_op *
-ast_compound_assignment (enum exp_opcode opcode, const struct rust_op *left,
- const struct rust_op *right)
+const struct rust_op *
+rust_parser::ast_compound_assignment (enum exp_opcode opcode,
+ const struct rust_op *left,
+ const struct rust_op *right)
{
- struct rust_op *result = OBSTACK_ZALLOC (&work_obstack, struct rust_op);
+ struct rust_op *result = OBSTACK_ZALLOC (&obstack, struct rust_op);
result->opcode = opcode;
result->compound_assignment = 1;
/* Make a typed integer literal operation. */
-static const struct rust_op *
-ast_literal (struct typed_val_int val)
+const struct rust_op *
+rust_parser::ast_literal (struct typed_val_int val)
{
- struct rust_op *result = OBSTACK_ZALLOC (&work_obstack, struct rust_op);
+ struct rust_op *result = OBSTACK_ZALLOC (&obstack, struct rust_op);
result->opcode = OP_LONG;
result->left.typed_val_int = val;
/* Make a typed floating point literal operation. */
-static const struct rust_op *
-ast_dliteral (struct typed_val_float val)
+const struct rust_op *
+rust_parser::ast_dliteral (struct typed_val_float val)
{
- struct rust_op *result = OBSTACK_ZALLOC (&work_obstack, struct rust_op);
+ struct rust_op *result = OBSTACK_ZALLOC (&obstack, struct rust_op);
- result->opcode = OP_DOUBLE;
+ result->opcode = OP_FLOAT;
result->left.typed_val_float = val;
return result;
/* Make a unary operation. */
-static const struct rust_op *
-ast_unary (enum exp_opcode opcode, const struct rust_op *expr)
+const struct rust_op *
+rust_parser::ast_unary (enum exp_opcode opcode, const struct rust_op *expr)
{
return ast_operation (opcode, expr, NULL);
}
/* Make a cast operation. */
-static const struct rust_op *
-ast_cast (const struct rust_op *expr, const struct rust_op *type)
+const struct rust_op *
+rust_parser::ast_cast (const struct rust_op *expr, const struct rust_op *type)
{
- struct rust_op *result = OBSTACK_ZALLOC (&work_obstack, struct rust_op);
+ struct rust_op *result = OBSTACK_ZALLOC (&obstack, struct rust_op);
result->opcode = UNOP_CAST;
result->left.op = expr;
when lowering we may discover that it actually represents the
creation of a tuple struct. */
-static const struct rust_op *
-ast_call_ish (enum exp_opcode opcode, const struct rust_op *expr,
- VEC (rust_op_ptr) **params)
+const struct rust_op *
+rust_parser::ast_call_ish (enum exp_opcode opcode, const struct rust_op *expr,
+ rust_op_vector *params)
{
- struct rust_op *result = OBSTACK_ZALLOC (&work_obstack, struct rust_op);
+ struct rust_op *result = OBSTACK_ZALLOC (&obstack, struct rust_op);
result->opcode = opcode;
result->left.op = expr;
/* Make a structure creation operation. */
-static const struct rust_op *
-ast_struct (const struct rust_op *name, VEC (set_field) **fields)
+const struct rust_op *
+rust_parser::ast_struct (const struct rust_op *name, rust_set_vector *fields)
{
- struct rust_op *result = OBSTACK_ZALLOC (&work_obstack, struct rust_op);
+ struct rust_op *result = OBSTACK_ZALLOC (&obstack, struct rust_op);
result->opcode = OP_AGGREGATE;
result->left.op = name;
/* Make an identifier path. */
-static const struct rust_op *
-ast_path (struct stoken path, VEC (rust_op_ptr) **params)
+const struct rust_op *
+rust_parser::ast_path (struct stoken path, rust_op_vector *params)
{
- struct rust_op *result = OBSTACK_ZALLOC (&work_obstack, struct rust_op);
+ struct rust_op *result = OBSTACK_ZALLOC (&obstack, struct rust_op);
result->opcode = OP_VAR_VALUE;
result->left.sval = path;
/* Make a string constant operation. */
-static const struct rust_op *
-ast_string (struct stoken str)
+const struct rust_op *
+rust_parser::ast_string (struct stoken str)
{
- struct rust_op *result = OBSTACK_ZALLOC (&work_obstack, struct rust_op);
+ struct rust_op *result = OBSTACK_ZALLOC (&obstack, struct rust_op);
result->opcode = OP_STRING;
result->left.sval = str;
/* Make a field expression. */
-static const struct rust_op *
-ast_structop (const struct rust_op *left, const char *name, int completing)
+const struct rust_op *
+rust_parser::ast_structop (const struct rust_op *left, const char *name,
+ int completing)
{
- struct rust_op *result = OBSTACK_ZALLOC (&work_obstack, struct rust_op);
+ struct rust_op *result = OBSTACK_ZALLOC (&obstack, struct rust_op);
result->opcode = STRUCTOP_STRUCT;
result->completing = completing;
/* Make an anonymous struct operation, like 'x.0'. */
-static const struct rust_op *
-ast_structop_anonymous (const struct rust_op *left,
- struct typed_val_int number)
+const struct rust_op *
+rust_parser::ast_structop_anonymous (const struct rust_op *left,
+ struct typed_val_int number)
{
- struct rust_op *result = OBSTACK_ZALLOC (&work_obstack, struct rust_op);
+ struct rust_op *result = OBSTACK_ZALLOC (&obstack, struct rust_op);
result->opcode = STRUCTOP_ANONYMOUS;
result->left.op = left;
/* Make a range operation. */
-static const struct rust_op *
-ast_range (const struct rust_op *lhs, const struct rust_op *rhs)
+const struct rust_op *
+rust_parser::ast_range (const struct rust_op *lhs, const struct rust_op *rhs,
+ bool inclusive)
{
- struct rust_op *result = OBSTACK_ZALLOC (&work_obstack, struct rust_op);
+ struct rust_op *result = OBSTACK_ZALLOC (&obstack, struct rust_op);
result->opcode = OP_RANGE;
+ result->inclusive = inclusive;
result->left.op = lhs;
result->right.op = rhs;
/* A helper function to make a type-related AST node. */
-static struct rust_op *
-ast_basic_type (enum type_code typecode)
+struct rust_op *
+rust_parser::ast_basic_type (enum type_code typecode)
{
- struct rust_op *result = OBSTACK_ZALLOC (&work_obstack, struct rust_op);
+ struct rust_op *result = OBSTACK_ZALLOC (&obstack, struct rust_op);
result->opcode = OP_TYPE;
result->typecode = typecode;
/* Create an AST node describing an array type. */
-static const struct rust_op *
-ast_array_type (const struct rust_op *lhs, struct typed_val_int val)
+const struct rust_op *
+rust_parser::ast_array_type (const struct rust_op *lhs,
+ struct typed_val_int val)
{
struct rust_op *result = ast_basic_type (TYPE_CODE_ARRAY);
/* Create an AST node describing a reference type. */
-static const struct rust_op *
-ast_slice_type (const struct rust_op *type)
+const struct rust_op *
+rust_parser::ast_slice_type (const struct rust_op *type)
{
/* Use TYPE_CODE_COMPLEX just because it is handy. */
struct rust_op *result = ast_basic_type (TYPE_CODE_COMPLEX);
/* Create an AST node describing a reference type. */
-static const struct rust_op *
-ast_reference_type (const struct rust_op *type)
+const struct rust_op *
+rust_parser::ast_reference_type (const struct rust_op *type)
{
struct rust_op *result = ast_basic_type (TYPE_CODE_REF);
/* Create an AST node describing a pointer type. */
-static const struct rust_op *
-ast_pointer_type (const struct rust_op *type, int is_mut)
+const struct rust_op *
+rust_parser::ast_pointer_type (const struct rust_op *type, int is_mut)
{
struct rust_op *result = ast_basic_type (TYPE_CODE_PTR);
/* Create an AST node describing a function type. */
-static const struct rust_op *
-ast_function_type (const struct rust_op *rtype, VEC (rust_op_ptr) **params)
+const struct rust_op *
+rust_parser::ast_function_type (const struct rust_op *rtype,
+ rust_op_vector *params)
{
struct rust_op *result = ast_basic_type (TYPE_CODE_FUNC);
/* Create an AST node describing a tuple type. */
-static const struct rust_op *
-ast_tuple_type (VEC (rust_op_ptr) **params)
+const struct rust_op *
+rust_parser::ast_tuple_type (rust_op_vector *params)
{
struct rust_op *result = ast_basic_type (TYPE_CODE_STRUCT);
/* Like lookup_symbol, but handles Rust namespace conventions, and
doesn't require field_of_this_result. */
-static struct block_symbol
-rust_lookup_symbol (const char *name, const struct block *block,
- const domain_enum domain)
+struct block_symbol
+rust_parser::lookup_symbol (const char *name, const struct block *block,
+ const domain_enum domain)
{
struct block_symbol result;
munge_name_and_block (&name, &block);
- result = lookup_symbol (name, block, domain, NULL);
+ result = ::lookup_symbol (name, block, domain, NULL);
if (result.symbol != NULL)
update_innermost_block (result);
return result;
/* Look up a type, following Rust namespace conventions. */
-static struct type *
-rust_lookup_type (const char *name, const struct block *block)
+struct type *
+rust_parser::rust_lookup_type (const char *name, const struct block *block)
{
struct block_symbol result;
struct type *type;
munge_name_and_block (&name, &block);
- result = lookup_symbol (name, block, STRUCT_DOMAIN, NULL);
+ result = ::lookup_symbol (name, block, STRUCT_DOMAIN, NULL);
if (result.symbol != NULL)
{
update_innermost_block (result);
return SYMBOL_TYPE (result.symbol);
}
- type = lookup_typename (parse_language (pstate), parse_gdbarch (pstate),
- name, NULL, 1);
+ type = lookup_typename (language (), name, NULL, 1);
if (type != NULL)
return type;
/* Last chance, try a built-in type. */
- return language_lookup_primitive_type (parse_language (pstate),
- parse_gdbarch (pstate),
- name);
+ return language_lookup_primitive_type (language (), arch (), name);
}
-static struct type *convert_ast_to_type (struct parser_state *state,
- const struct rust_op *operation);
-static const char *convert_name (struct parser_state *state,
- const struct rust_op *operation);
-
/* Convert a vector of rust_ops representing types to a vector of
types. */
-static VEC (type_ptr) *
-convert_params_to_types (struct parser_state *state, VEC (rust_op_ptr) *params)
+std::vector<struct type *>
+rust_parser::convert_params_to_types (rust_op_vector *params)
{
- int i;
- const struct rust_op *op;
- VEC (type_ptr) *result = NULL;
- struct cleanup *cleanup = make_cleanup (VEC_cleanup (type_ptr), &result);
+ std::vector<struct type *> result;
- for (i = 0; VEC_iterate (rust_op_ptr, params, i, op); ++i)
- VEC_safe_push (type_ptr, result, convert_ast_to_type (state, op));
+ if (params != nullptr)
+ {
+ for (const rust_op *op : *params)
+ result.push_back (convert_ast_to_type (op));
+ }
- discard_cleanups (cleanup);
return result;
}
/* Convert a rust_op representing a type to a struct type *. */
-static struct type *
-convert_ast_to_type (struct parser_state *state,
- const struct rust_op *operation)
+struct type *
+rust_parser::convert_ast_to_type (const struct rust_op *operation)
{
struct type *type, *result = NULL;
if (operation->opcode == OP_VAR_VALUE)
{
- const char *varname = convert_name (state, operation);
+ const char *varname = convert_name (operation);
- result = rust_lookup_type (varname, expression_context_block);
+ result = rust_lookup_type (varname, pstate->expression_context_block);
if (result == NULL)
error (_("No typed name '%s' in current context"), varname);
return result;
switch (operation->typecode)
{
case TYPE_CODE_ARRAY:
- type = convert_ast_to_type (state, operation->left.op);
+ type = convert_ast_to_type (operation->left.op);
if (operation->right.typed_val_int.val < 0)
error (_("Negative array length"));
result = lookup_array_range_type (type, 0,
case TYPE_CODE_COMPLEX:
{
- struct type *usize = rust_type ("usize");
+ struct type *usize = get_type ("usize");
- type = convert_ast_to_type (state, operation->left.op);
+ type = convert_ast_to_type (operation->left.op);
result = rust_slice_type ("&[*gdb*]", type, usize);
}
break;
case TYPE_CODE_REF:
case TYPE_CODE_PTR:
/* For now we treat &x and *x identically. */
- type = convert_ast_to_type (state, operation->left.op);
+ type = convert_ast_to_type (operation->left.op);
result = lookup_pointer_type (type);
break;
case TYPE_CODE_FUNC:
{
- VEC (type_ptr) *args
- = convert_params_to_types (state, *operation->right.params);
- struct cleanup *cleanup
- = make_cleanup (VEC_cleanup (type_ptr), &args);
+ std::vector<struct type *> args
+ (convert_params_to_types (operation->right.params));
struct type **argtypes = NULL;
- type = convert_ast_to_type (state, operation->left.op);
- if (!VEC_empty (type_ptr, args))
- argtypes = VEC_address (type_ptr, args);
+ type = convert_ast_to_type (operation->left.op);
+ if (!args.empty ())
+ argtypes = args.data ();
result
- = lookup_function_type_with_arguments (type,
- VEC_length (type_ptr, args),
+ = lookup_function_type_with_arguments (type, args.size (),
argtypes);
result = lookup_pointer_type (result);
-
- do_cleanups (cleanup);
}
break;
case TYPE_CODE_STRUCT:
{
- VEC (type_ptr) *args
- = convert_params_to_types (state, *operation->left.params);
- struct cleanup *cleanup
- = make_cleanup (VEC_cleanup (type_ptr), &args);
+ std::vector<struct type *> args
+ (convert_params_to_types (operation->left.params));
int i;
- struct type *type;
const char *name;
- obstack_1grow (&work_obstack, '(');
- for (i = 0; VEC_iterate (type_ptr, args, i, type); ++i)
+ obstack_1grow (&obstack, '(');
+ for (i = 0; i < args.size (); ++i)
{
- char *type_name = type_to_string (type);
+ std::string type_name = type_to_string (args[i]);
if (i > 0)
- obstack_1grow (&work_obstack, ',');
- obstack_grow_str (&work_obstack, type_name);
-
- xfree (type_name);
+ obstack_1grow (&obstack, ',');
+ obstack_grow_str (&obstack, type_name.c_str ());
}
- obstack_grow_str0 (&work_obstack, ")");
- name = (const char *) obstack_finish (&work_obstack);
+ obstack_grow_str0 (&obstack, ")");
+ name = (const char *) obstack_finish (&obstack);
/* We don't allow creating new tuple types (yet), but we do
allow looking up existing tuple types. */
- result = rust_lookup_type (name, expression_context_block);
+ result = rust_lookup_type (name, pstate->expression_context_block);
if (result == NULL)
error (_("could not find tuple type '%s'"), name);
-
- do_cleanups (cleanup);
}
break;
name. This applies generic arguments as needed. The returned name
is allocated on the work obstack. */
-static const char *
-convert_name (struct parser_state *state, const struct rust_op *operation)
+const char *
+rust_parser::convert_name (const struct rust_op *operation)
{
- VEC (type_ptr) *types;
- struct cleanup *cleanup;
int i;
- struct type *type;
gdb_assert (operation->opcode == OP_VAR_VALUE);
if (operation->right.params == NULL)
return operation->left.sval.ptr;
- types = convert_params_to_types (state, *operation->right.params);
- cleanup = make_cleanup (VEC_cleanup (type_ptr), &types);
+ std::vector<struct type *> types
+ (convert_params_to_types (operation->right.params));
- obstack_grow_str (&work_obstack, operation->left.sval.ptr);
- obstack_1grow (&work_obstack, '<');
- for (i = 0; VEC_iterate (type_ptr, types, i, type); ++i)
+ obstack_grow_str (&obstack, operation->left.sval.ptr);
+ obstack_1grow (&obstack, '<');
+ for (i = 0; i < types.size (); ++i)
{
- char *type_name = type_to_string (type);
+ std::string type_name = type_to_string (types[i]);
if (i > 0)
- obstack_1grow (&work_obstack, ',');
+ obstack_1grow (&obstack, ',');
- obstack_grow_str (&work_obstack, type_name);
- xfree (type_name);
+ obstack_grow_str (&obstack, type_name.c_str ());
}
- obstack_grow_str0 (&work_obstack, ">");
+ obstack_grow_str0 (&obstack, ">");
- do_cleanups (cleanup);
-
- return (const char *) obstack_finish (&work_obstack);
+ return (const char *) obstack_finish (&obstack);
}
-static void convert_ast_to_expression (struct parser_state *state,
- const struct rust_op *operation,
- const struct rust_op *top);
-
/* A helper function that converts a vec of rust_ops to a gdb
expression. */
-static void
-convert_params_to_expression (struct parser_state *state,
- VEC (rust_op_ptr) *params,
- const struct rust_op *top)
+void
+rust_parser::convert_params_to_expression (rust_op_vector *params,
+ const struct rust_op *top)
{
- int i;
- rust_op_ptr elem;
-
- for (i = 0; VEC_iterate (rust_op_ptr, params, i, elem); ++i)
- convert_ast_to_expression (state, elem, top);
+ for (const rust_op *elem : *params)
+ convert_ast_to_expression (elem, top);
}
/* Lower a rust_op to a gdb expression. STATE is the parser state.
OPERATION is the operation to lower. TOP is a pointer to the
top-most operation; it is used to handle the special case where the
top-most expression is an identifier and can be optionally lowered
- to OP_TYPE. */
+ to OP_TYPE. WANT_TYPE is a flag indicating that, if the expression
+ is the name of a type, then emit an OP_TYPE for it (rather than
+ erroring). If WANT_TYPE is set, then the similar TOP handling is
+ not done. */
-static void
-convert_ast_to_expression (struct parser_state *state,
- const struct rust_op *operation,
- const struct rust_op *top)
+void
+rust_parser::convert_ast_to_expression (const struct rust_op *operation,
+ const struct rust_op *top,
+ bool want_type)
{
switch (operation->opcode)
{
case OP_LONG:
- write_exp_elt_opcode (state, OP_LONG);
- write_exp_elt_type (state, operation->left.typed_val_int.type);
- write_exp_elt_longcst (state, operation->left.typed_val_int.val);
- write_exp_elt_opcode (state, OP_LONG);
+ write_exp_elt_opcode (pstate, OP_LONG);
+ write_exp_elt_type (pstate, operation->left.typed_val_int.type);
+ write_exp_elt_longcst (pstate, operation->left.typed_val_int.val);
+ write_exp_elt_opcode (pstate, OP_LONG);
break;
- case OP_DOUBLE:
- write_exp_elt_opcode (state, OP_DOUBLE);
- write_exp_elt_type (state, operation->left.typed_val_float.type);
- write_exp_elt_dblcst (state, operation->left.typed_val_float.dval);
- write_exp_elt_opcode (state, OP_DOUBLE);
+ case OP_FLOAT:
+ write_exp_elt_opcode (pstate, OP_FLOAT);
+ write_exp_elt_type (pstate, operation->left.typed_val_float.type);
+ write_exp_elt_floatcst (pstate, operation->left.typed_val_float.val);
+ write_exp_elt_opcode (pstate, OP_FLOAT);
break;
case STRUCTOP_STRUCT:
{
- convert_ast_to_expression (state, operation->left.op, top);
+ convert_ast_to_expression (operation->left.op, top);
if (operation->completing)
- mark_struct_expression (state);
- write_exp_elt_opcode (state, STRUCTOP_STRUCT);
- write_exp_string (state, operation->right.sval);
- write_exp_elt_opcode (state, STRUCTOP_STRUCT);
+ pstate->mark_struct_expression ();
+ write_exp_elt_opcode (pstate, STRUCTOP_STRUCT);
+ write_exp_string (pstate, operation->right.sval);
+ write_exp_elt_opcode (pstate, STRUCTOP_STRUCT);
}
break;
case STRUCTOP_ANONYMOUS:
{
- convert_ast_to_expression (state, operation->left.op, top);
+ convert_ast_to_expression (operation->left.op, top);
- write_exp_elt_opcode (state, STRUCTOP_ANONYMOUS);
- write_exp_elt_longcst (state, operation->right.typed_val_int.val);
- write_exp_elt_opcode (state, STRUCTOP_ANONYMOUS);
+ write_exp_elt_opcode (pstate, STRUCTOP_ANONYMOUS);
+ write_exp_elt_longcst (pstate, operation->right.typed_val_int.val);
+ write_exp_elt_opcode (pstate, STRUCTOP_ANONYMOUS);
}
break;
+ case UNOP_SIZEOF:
+ convert_ast_to_expression (operation->left.op, top, true);
+ write_exp_elt_opcode (pstate, UNOP_SIZEOF);
+ break;
+
case UNOP_PLUS:
case UNOP_NEG:
case UNOP_COMPLEMENT:
case UNOP_IND:
case UNOP_ADDR:
- convert_ast_to_expression (state, operation->left.op, top);
- write_exp_elt_opcode (state, operation->opcode);
+ convert_ast_to_expression (operation->left.op, top);
+ write_exp_elt_opcode (pstate, operation->opcode);
break;
case BINOP_SUBSCRIPT:
case BINOP_RSH:
case BINOP_ASSIGN:
case OP_RUST_ARRAY:
- convert_ast_to_expression (state, operation->left.op, top);
- convert_ast_to_expression (state, operation->right.op, top);
+ convert_ast_to_expression (operation->left.op, top);
+ convert_ast_to_expression (operation->right.op, top);
if (operation->compound_assignment)
{
- write_exp_elt_opcode (state, BINOP_ASSIGN_MODIFY);
- write_exp_elt_opcode (state, operation->opcode);
- write_exp_elt_opcode (state, BINOP_ASSIGN_MODIFY);
+ write_exp_elt_opcode (pstate, BINOP_ASSIGN_MODIFY);
+ write_exp_elt_opcode (pstate, operation->opcode);
+ write_exp_elt_opcode (pstate, BINOP_ASSIGN_MODIFY);
}
else
- write_exp_elt_opcode (state, operation->opcode);
+ write_exp_elt_opcode (pstate, operation->opcode);
if (operation->compound_assignment
|| operation->opcode == BINOP_ASSIGN)
{
struct type *type;
- type = language_lookup_primitive_type (parse_language (state),
- parse_gdbarch (state),
+ type = language_lookup_primitive_type (pstate->language (),
+ pstate->gdbarch (),
"()");
- write_exp_elt_opcode (state, OP_LONG);
- write_exp_elt_type (state, type);
- write_exp_elt_longcst (state, 0);
- write_exp_elt_opcode (state, OP_LONG);
+ write_exp_elt_opcode (pstate, OP_LONG);
+ write_exp_elt_type (pstate, type);
+ write_exp_elt_longcst (pstate, 0);
+ write_exp_elt_opcode (pstate, OP_LONG);
- write_exp_elt_opcode (state, BINOP_COMMA);
+ write_exp_elt_opcode (pstate, BINOP_COMMA);
}
break;
case UNOP_CAST:
{
- struct type *type = convert_ast_to_type (state, operation->right.op);
+ struct type *type = convert_ast_to_type (operation->right.op);
- convert_ast_to_expression (state, operation->left.op, top);
- write_exp_elt_opcode (state, UNOP_CAST);
- write_exp_elt_type (state, type);
- write_exp_elt_opcode (state, UNOP_CAST);
+ convert_ast_to_expression (operation->left.op, top);
+ write_exp_elt_opcode (pstate, UNOP_CAST);
+ write_exp_elt_type (pstate, type);
+ write_exp_elt_opcode (pstate, UNOP_CAST);
}
break;
if (operation->left.op->opcode == OP_VAR_VALUE)
{
struct type *type;
- const char *varname = convert_name (state, operation->left.op);
+ const char *varname = convert_name (operation->left.op);
- type = rust_lookup_type (varname, expression_context_block);
+ type = rust_lookup_type (varname,
+ pstate->expression_context_block);
if (type != NULL)
{
/* This is actually a tuple struct expression, not a
call expression. */
- rust_op_ptr elem;
- int i;
- VEC (rust_op_ptr) *params = *operation->right.params;
+ rust_op_vector *params = operation->right.params;
- if (TYPE_CODE (type) != TYPE_CODE_NAMESPACE)
+ if (type->code () != TYPE_CODE_NAMESPACE)
{
if (!rust_tuple_struct_type_p (type))
error (_("Type %s is not a tuple struct"), varname);
- for (i = 0;
- VEC_iterate (rust_op_ptr, params, i, elem);
- ++i)
+ for (int i = 0; i < params->size (); ++i)
{
char *cell = get_print_cell ();
xsnprintf (cell, PRINT_CELL_SIZE, "__%d", i);
- write_exp_elt_opcode (state, OP_NAME);
- write_exp_string (state, make_stoken (cell));
- write_exp_elt_opcode (state, OP_NAME);
+ write_exp_elt_opcode (pstate, OP_NAME);
+ write_exp_string (pstate, make_stoken (cell));
+ write_exp_elt_opcode (pstate, OP_NAME);
- convert_ast_to_expression (state, elem, top);
+ convert_ast_to_expression ((*params)[i], top);
}
- write_exp_elt_opcode (state, OP_AGGREGATE);
- write_exp_elt_type (state, type);
- write_exp_elt_longcst (state,
- 2 * VEC_length (rust_op_ptr,
- params));
- write_exp_elt_opcode (state, OP_AGGREGATE);
+ write_exp_elt_opcode (pstate, OP_AGGREGATE);
+ write_exp_elt_type (pstate, type);
+ write_exp_elt_longcst (pstate, 2 * params->size ());
+ write_exp_elt_opcode (pstate, OP_AGGREGATE);
break;
}
}
}
- convert_ast_to_expression (state, operation->left.op, top);
- convert_params_to_expression (state, *operation->right.params, top);
- write_exp_elt_opcode (state, OP_FUNCALL);
- write_exp_elt_longcst (state, VEC_length (rust_op_ptr,
- *operation->right.params));
- write_exp_elt_longcst (state, OP_FUNCALL);
+ convert_ast_to_expression (operation->left.op, top);
+ convert_params_to_expression (operation->right.params, top);
+ write_exp_elt_opcode (pstate, OP_FUNCALL);
+ write_exp_elt_longcst (pstate, operation->right.params->size ());
+ write_exp_elt_longcst (pstate, OP_FUNCALL);
}
break;
case OP_ARRAY:
gdb_assert (operation->left.op == NULL);
- convert_params_to_expression (state, *operation->right.params, top);
- write_exp_elt_opcode (state, OP_ARRAY);
- write_exp_elt_longcst (state, 0);
- write_exp_elt_longcst (state, VEC_length (rust_op_ptr,
- *operation->right.params) - 1);
- write_exp_elt_longcst (state, OP_ARRAY);
+ convert_params_to_expression (operation->right.params, top);
+ write_exp_elt_opcode (pstate, OP_ARRAY);
+ write_exp_elt_longcst (pstate, 0);
+ write_exp_elt_longcst (pstate, operation->right.params->size () - 1);
+ write_exp_elt_longcst (pstate, OP_ARRAY);
break;
case OP_VAR_VALUE:
if (operation->left.sval.ptr[0] == '$')
{
- write_dollar_variable (state, operation->left.sval);
+ write_dollar_variable (pstate, operation->left.sval);
break;
}
- varname = convert_name (state, operation);
- sym = rust_lookup_symbol (varname, expression_context_block,
- VAR_DOMAIN);
- if (sym.symbol != NULL)
+ varname = convert_name (operation);
+ sym = lookup_symbol (varname, pstate->expression_context_block,
+ VAR_DOMAIN);
+ if (sym.symbol != NULL && SYMBOL_CLASS (sym.symbol) != LOC_TYPEDEF)
{
- write_exp_elt_opcode (state, OP_VAR_VALUE);
- write_exp_elt_block (state, sym.block);
- write_exp_elt_sym (state, sym.symbol);
- write_exp_elt_opcode (state, OP_VAR_VALUE);
+ write_exp_elt_opcode (pstate, OP_VAR_VALUE);
+ write_exp_elt_block (pstate, sym.block);
+ write_exp_elt_sym (pstate, sym.symbol);
+ write_exp_elt_opcode (pstate, OP_VAR_VALUE);
}
else
{
- struct type *type;
+ struct type *type = NULL;
- type = rust_lookup_type (varname, expression_context_block);
+ if (sym.symbol != NULL)
+ {
+ gdb_assert (SYMBOL_CLASS (sym.symbol) == LOC_TYPEDEF);
+ type = SYMBOL_TYPE (sym.symbol);
+ }
+ if (type == NULL)
+ type = rust_lookup_type (varname,
+ pstate->expression_context_block);
if (type == NULL)
error (_("No symbol '%s' in current context"), varname);
- if (TYPE_CODE (type) == TYPE_CODE_STRUCT
- && TYPE_NFIELDS (type) == 0)
+ if (!want_type
+ && type->code () == TYPE_CODE_STRUCT
+ && type->num_fields () == 0)
{
/* A unit-like struct. */
- write_exp_elt_opcode (state, OP_AGGREGATE);
- write_exp_elt_type (state, type);
- write_exp_elt_longcst (state, 0);
- write_exp_elt_opcode (state, OP_AGGREGATE);
+ write_exp_elt_opcode (pstate, OP_AGGREGATE);
+ write_exp_elt_type (pstate, type);
+ write_exp_elt_longcst (pstate, 0);
+ write_exp_elt_opcode (pstate, OP_AGGREGATE);
}
- else if (operation == top)
+ else if (want_type || operation == top)
{
- write_exp_elt_opcode (state, OP_TYPE);
- write_exp_elt_type (state, type);
- write_exp_elt_opcode (state, OP_TYPE);
- break;
+ write_exp_elt_opcode (pstate, OP_TYPE);
+ write_exp_elt_type (pstate, type);
+ write_exp_elt_opcode (pstate, OP_TYPE);
}
+ else
+ error (_("Found type '%s', which can't be "
+ "evaluated in this context"),
+ varname);
}
}
break;
case OP_AGGREGATE:
{
- int i;
int length;
- struct set_field *init;
- VEC (set_field) *fields = *operation->right.field_inits;
+ rust_set_vector *fields = operation->right.field_inits;
struct type *type;
const char *name;
length = 0;
- for (i = 0; VEC_iterate (set_field, fields, i, init); ++i)
+ for (const set_field &init : *fields)
{
- if (init->name.ptr != NULL)
+ if (init.name.ptr != NULL)
{
- write_exp_elt_opcode (state, OP_NAME);
- write_exp_string (state, init->name);
- write_exp_elt_opcode (state, OP_NAME);
+ write_exp_elt_opcode (pstate, OP_NAME);
+ write_exp_string (pstate, init.name);
+ write_exp_elt_opcode (pstate, OP_NAME);
++length;
}
- convert_ast_to_expression (state, init->init, top);
+ convert_ast_to_expression (init.init, top);
++length;
- if (init->name.ptr == NULL)
+ if (init.name.ptr == NULL)
{
/* This is handled differently from Ada in our
evaluator. */
- write_exp_elt_opcode (state, OP_OTHERS);
+ write_exp_elt_opcode (pstate, OP_OTHERS);
}
}
- name = convert_name (state, operation->left.op);
- type = rust_lookup_type (name, expression_context_block);
+ name = convert_name (operation->left.op);
+ type = rust_lookup_type (name, pstate->expression_context_block);
if (type == NULL)
error (_("Could not find type '%s'"), operation->left.sval.ptr);
- if (TYPE_CODE (type) != TYPE_CODE_STRUCT
+ if (type->code () != TYPE_CODE_STRUCT
|| rust_tuple_type_p (type)
|| rust_tuple_struct_type_p (type))
error (_("Struct expression applied to non-struct type"));
- write_exp_elt_opcode (state, OP_AGGREGATE);
- write_exp_elt_type (state, type);
- write_exp_elt_longcst (state, length);
- write_exp_elt_opcode (state, OP_AGGREGATE);
+ write_exp_elt_opcode (pstate, OP_AGGREGATE);
+ write_exp_elt_type (pstate, type);
+ write_exp_elt_longcst (pstate, length);
+ write_exp_elt_opcode (pstate, OP_AGGREGATE);
}
break;
case OP_STRING:
{
- write_exp_elt_opcode (state, OP_STRING);
- write_exp_string (state, operation->left.sval);
- write_exp_elt_opcode (state, OP_STRING);
+ write_exp_elt_opcode (pstate, OP_STRING);
+ write_exp_string (pstate, operation->left.sval);
+ write_exp_elt_opcode (pstate, OP_STRING);
}
break;
if (operation->left.op != NULL)
{
- convert_ast_to_expression (state, operation->left.op, top);
+ convert_ast_to_expression (operation->left.op, top);
kind = HIGH_BOUND_DEFAULT;
}
if (operation->right.op != NULL)
{
- convert_ast_to_expression (state, operation->right.op, top);
+ convert_ast_to_expression (operation->right.op, top);
if (kind == BOTH_BOUND_DEFAULT)
- kind = LOW_BOUND_DEFAULT;
+ kind = (operation->inclusive
+ ? LOW_BOUND_DEFAULT : LOW_BOUND_DEFAULT_EXCLUSIVE);
else
{
gdb_assert (kind == HIGH_BOUND_DEFAULT);
- kind = NONE_BOUND_DEFAULT;
+ kind = (operation->inclusive
+ ? NONE_BOUND_DEFAULT : NONE_BOUND_DEFAULT_EXCLUSIVE);
}
}
- write_exp_elt_opcode (state, OP_RANGE);
- write_exp_elt_longcst (state, kind);
- write_exp_elt_opcode (state, OP_RANGE);
+ else
+ {
+ /* Nothing should make an inclusive range without an upper
+ bound. */
+ gdb_assert (!operation->inclusive);
+ }
+
+ write_exp_elt_opcode (pstate, OP_RANGE);
+ write_exp_elt_longcst (pstate, kind);
+ write_exp_elt_opcode (pstate, OP_RANGE);
}
break;
rust_parse (struct parser_state *state)
{
int result;
- struct cleanup *cleanup;
- obstack_init (&work_obstack);
- cleanup = make_cleanup_obstack_free (&work_obstack);
- rust_ast = NULL;
+ /* This sets various globals and also clears them on
+ destruction. */
+ rust_parser parser (state);
- pstate = state;
- result = rustyyparse ();
+ result = rustyyparse (&parser);
- if (!result || (parse_completion && rust_ast != NULL))
- {
- const struct rust_op *ast = rust_ast;
-
- rust_ast = NULL;
- gdb_assert (ast != NULL);
- convert_ast_to_expression (state, ast, ast);
- }
+ if (!result || (state->parse_completion && parser.rust_ast != NULL))
+ parser.convert_ast_to_expression (parser.rust_ast, parser.rust_ast);
- do_cleanups (cleanup);
return result;
}
/* The parser error handler. */
-void
-rustyyerror (char *msg)
+static void
+rustyyerror (rust_parser *parser, const char *msg)
{
- const char *where = prev_lexptr ? prev_lexptr : lexptr;
- error (_("%s in expression, near `%s'."), (msg ? msg : "Error"), where);
+ const char *where = (parser->pstate->prev_lexptr
+ ? parser->pstate->prev_lexptr
+ : parser->pstate->lexptr);
+ error (_("%s in expression, near `%s'."), msg, where);
}
\f
/* Initialize the lexer for testing. */
static void
-rust_lex_test_init (const char *input)
+rust_lex_test_init (rust_parser *parser, const char *input)
{
- prev_lexptr = NULL;
- lexptr = input;
- paren_depth = 0;
+ parser->pstate->prev_lexptr = NULL;
+ parser->pstate->lexptr = input;
+ parser->paren_depth = 0;
}
/* A test helper that lexes a string, expecting a single token. It
returns the lexer data for this token. */
static RUSTSTYPE
-rust_lex_test_one (const char *input, int expected)
+rust_lex_test_one (rust_parser *parser, const char *input, int expected)
{
int token;
RUSTSTYPE result;
- rust_lex_test_init (input);
+ rust_lex_test_init (parser, input);
- token = rustyylex ();
+ token = rustyylex (&result, parser);
SELF_CHECK (token == expected);
- result = rustyylval;
if (token)
{
- token = rustyylex ();
+ RUSTSTYPE ignore;
+ token = rustyylex (&ignore, parser);
SELF_CHECK (token == 0);
}
/* Test that INPUT lexes as the integer VALUE. */
static void
-rust_lex_int_test (const char *input, int value, int kind)
+rust_lex_int_test (rust_parser *parser, const char *input,
+ LONGEST value, int kind)
{
- RUSTSTYPE result = rust_lex_test_one (input, kind);
+ RUSTSTYPE result = rust_lex_test_one (parser, input, kind);
SELF_CHECK (result.typed_val_int.val == value);
}
/* Test that INPUT throws an exception with text ERR. */
static void
-rust_lex_exception_test (const char *input, const char *err)
+rust_lex_exception_test (rust_parser *parser, const char *input,
+ const char *err)
{
- TRY
+ try
{
/* The "kind" doesn't matter. */
- rust_lex_test_one (input, DECIMAL_INTEGER);
+ rust_lex_test_one (parser, input, DECIMAL_INTEGER);
SELF_CHECK (0);
}
- CATCH (except, RETURN_MASK_ERROR)
+ catch (const gdb_exception_error &except)
{
- SELF_CHECK (strcmp (except.message, err) == 0);
+ SELF_CHECK (strcmp (except.what (), err) == 0);
}
- END_CATCH
}
/* Test that INPUT lexes as the identifier, string, or byte-string
VALUE. KIND holds the expected token kind. */
static void
-rust_lex_stringish_test (const char *input, const char *value, int kind)
+rust_lex_stringish_test (rust_parser *parser, const char *input,
+ const char *value, int kind)
{
- RUSTSTYPE result = rust_lex_test_one (input, kind);
+ RUSTSTYPE result = rust_lex_test_one (parser, input, kind);
SELF_CHECK (result.sval.length == strlen (value));
SELF_CHECK (strncmp (result.sval.ptr, value, result.sval.length) == 0);
}
/* Helper to test that a string parses as a given token sequence. */
static void
-rust_lex_test_sequence (const char *input, int len, const int expected[])
+rust_lex_test_sequence (rust_parser *parser, const char *input, int len,
+ const int expected[])
{
int i;
- lexptr = input;
- paren_depth = 0;
+ parser->pstate->lexptr = input;
+ parser->paren_depth = 0;
for (i = 0; i < len; ++i)
{
- int token = rustyylex ();
+ RUSTSTYPE ignore;
+ int token = rustyylex (&ignore, parser);
SELF_CHECK (token == expected[i]);
}
/* Tests for an integer-parsing corner case. */
static void
-rust_lex_test_trailing_dot (void)
+rust_lex_test_trailing_dot (rust_parser *parser)
{
const int expected1[] = { DECIMAL_INTEGER, '.', IDENT, '(', ')', 0 };
const int expected2[] = { INTEGER, '.', IDENT, '(', ')', 0 };
const int expected3[] = { FLOAT, EQEQ, '(', ')', 0 };
const int expected4[] = { DECIMAL_INTEGER, DOTDOT, DECIMAL_INTEGER, 0 };
- rust_lex_test_sequence ("23.g()", ARRAY_SIZE (expected1), expected1);
- rust_lex_test_sequence ("23_0.g()", ARRAY_SIZE (expected2), expected2);
- rust_lex_test_sequence ("23.==()", ARRAY_SIZE (expected3), expected3);
- rust_lex_test_sequence ("23..25", ARRAY_SIZE (expected4), expected4);
+ rust_lex_test_sequence (parser, "23.g()", ARRAY_SIZE (expected1), expected1);
+ rust_lex_test_sequence (parser, "23_0.g()", ARRAY_SIZE (expected2),
+ expected2);
+ rust_lex_test_sequence (parser, "23.==()", ARRAY_SIZE (expected3),
+ expected3);
+ rust_lex_test_sequence (parser, "23..25", ARRAY_SIZE (expected4), expected4);
}
/* Tests of completion. */
static void
-rust_lex_test_completion (void)
+rust_lex_test_completion (rust_parser *parser)
{
const int expected[] = { IDENT, '.', COMPLETE, 0 };
- parse_completion = 1;
+ parser->pstate->parse_completion = 1;
- rust_lex_test_sequence ("something.wha", ARRAY_SIZE (expected), expected);
- rust_lex_test_sequence ("something.", ARRAY_SIZE (expected), expected);
+ rust_lex_test_sequence (parser, "something.wha", ARRAY_SIZE (expected),
+ expected);
+ rust_lex_test_sequence (parser, "something.", ARRAY_SIZE (expected),
+ expected);
- parse_completion = 0;
+ parser->pstate->parse_completion = 0;
}
/* Test pushback. */
static void
-rust_lex_test_push_back (void)
+rust_lex_test_push_back (rust_parser *parser)
{
int token;
+ RUSTSTYPE lval;
- rust_lex_test_init (">>=");
+ rust_lex_test_init (parser, ">>=");
- token = rustyylex ();
+ token = rustyylex (&lval, parser);
SELF_CHECK (token == COMPOUND_ASSIGN);
- SELF_CHECK (rustyylval.opcode == BINOP_RSH);
+ SELF_CHECK (lval.opcode == BINOP_RSH);
- rust_push_back ('=');
+ parser->push_back ('=');
- token = rustyylex ();
+ token = rustyylex (&lval, parser);
SELF_CHECK (token == '=');
- token = rustyylex ();
+ token = rustyylex (&lval, parser);
SELF_CHECK (token == 0);
}
{
int i;
- obstack_init (&work_obstack);
- unit_testing = 1;
-
- rust_lex_test_one ("", 0);
- rust_lex_test_one (" \t \n \r ", 0);
- rust_lex_test_one ("thread 23", 0);
- rust_lex_test_one ("task 23", 0);
- rust_lex_test_one ("th 104", 0);
- rust_lex_test_one ("ta 97", 0);
-
- rust_lex_int_test ("'z'", 'z', INTEGER);
- rust_lex_int_test ("'\\xff'", 0xff, INTEGER);
- rust_lex_int_test ("'\\u{1016f}'", 0x1016f, INTEGER);
- rust_lex_int_test ("b'z'", 'z', INTEGER);
- rust_lex_int_test ("b'\\xfe'", 0xfe, INTEGER);
- rust_lex_int_test ("b'\\xFE'", 0xfe, INTEGER);
- rust_lex_int_test ("b'\\xfE'", 0xfe, INTEGER);
+ /* Set up dummy "parser", so that rust_type works. */
+ struct parser_state ps (language_def (language_rust), target_gdbarch (),
+ nullptr, 0, 0, nullptr, 0, nullptr);
+ rust_parser parser (&ps);
+
+ rust_lex_test_one (&parser, "", 0);
+ rust_lex_test_one (&parser, " \t \n \r ", 0);
+ rust_lex_test_one (&parser, "thread 23", 0);
+ rust_lex_test_one (&parser, "task 23", 0);
+ rust_lex_test_one (&parser, "th 104", 0);
+ rust_lex_test_one (&parser, "ta 97", 0);
+
+ rust_lex_int_test (&parser, "'z'", 'z', INTEGER);
+ rust_lex_int_test (&parser, "'\\xff'", 0xff, INTEGER);
+ rust_lex_int_test (&parser, "'\\u{1016f}'", 0x1016f, INTEGER);
+ rust_lex_int_test (&parser, "b'z'", 'z', INTEGER);
+ rust_lex_int_test (&parser, "b'\\xfe'", 0xfe, INTEGER);
+ rust_lex_int_test (&parser, "b'\\xFE'", 0xfe, INTEGER);
+ rust_lex_int_test (&parser, "b'\\xfE'", 0xfe, INTEGER);
/* Test all escapes in both modes. */
- rust_lex_int_test ("'\\n'", '\n', INTEGER);
- rust_lex_int_test ("'\\r'", '\r', INTEGER);
- rust_lex_int_test ("'\\t'", '\t', INTEGER);
- rust_lex_int_test ("'\\\\'", '\\', INTEGER);
- rust_lex_int_test ("'\\0'", '\0', INTEGER);
- rust_lex_int_test ("'\\''", '\'', INTEGER);
- rust_lex_int_test ("'\\\"'", '"', INTEGER);
-
- rust_lex_int_test ("b'\\n'", '\n', INTEGER);
- rust_lex_int_test ("b'\\r'", '\r', INTEGER);
- rust_lex_int_test ("b'\\t'", '\t', INTEGER);
- rust_lex_int_test ("b'\\\\'", '\\', INTEGER);
- rust_lex_int_test ("b'\\0'", '\0', INTEGER);
- rust_lex_int_test ("b'\\''", '\'', INTEGER);
- rust_lex_int_test ("b'\\\"'", '"', INTEGER);
-
- rust_lex_exception_test ("'z", "Unterminated character literal");
- rust_lex_exception_test ("b'\\x0'", "Not enough hex digits seen");
- rust_lex_exception_test ("b'\\u{0}'", "Unicode escape in byte literal");
- rust_lex_exception_test ("'\\x0'", "Not enough hex digits seen");
- rust_lex_exception_test ("'\\u0'", "Missing '{' in Unicode escape");
- rust_lex_exception_test ("'\\u{0", "Missing '}' in Unicode escape");
- rust_lex_exception_test ("'\\u{0000007}", "Overlong hex escape");
- rust_lex_exception_test ("'\\u{}", "Not enough hex digits seen");
- rust_lex_exception_test ("'\\Q'", "Invalid escape \\Q in literal");
- rust_lex_exception_test ("b'\\Q'", "Invalid escape \\Q in literal");
-
- rust_lex_int_test ("23", 23, DECIMAL_INTEGER);
- rust_lex_int_test ("2_344__29", 234429, INTEGER);
- rust_lex_int_test ("0x1f", 0x1f, INTEGER);
- rust_lex_int_test ("23usize", 23, INTEGER);
- rust_lex_int_test ("23i32", 23, INTEGER);
- rust_lex_int_test ("0x1_f", 0x1f, INTEGER);
- rust_lex_int_test ("0b1_101011__", 0x6b, INTEGER);
- rust_lex_int_test ("0o001177i64", 639, INTEGER);
-
- rust_lex_test_trailing_dot ();
-
- rust_lex_test_one ("23.", FLOAT);
- rust_lex_test_one ("23.99f32", FLOAT);
- rust_lex_test_one ("23e7", FLOAT);
- rust_lex_test_one ("23E-7", FLOAT);
- rust_lex_test_one ("23e+7", FLOAT);
- rust_lex_test_one ("23.99e+7f64", FLOAT);
- rust_lex_test_one ("23.82f32", FLOAT);
-
- rust_lex_stringish_test ("hibob", "hibob", IDENT);
- rust_lex_stringish_test ("hibob__93", "hibob__93", IDENT);
- rust_lex_stringish_test ("thread", "thread", IDENT);
-
- rust_lex_stringish_test ("\"string\"", "string", STRING);
- rust_lex_stringish_test ("\"str\\ting\"", "str\ting", STRING);
- rust_lex_stringish_test ("\"str\\\"ing\"", "str\"ing", STRING);
- rust_lex_stringish_test ("r\"str\\ing\"", "str\\ing", STRING);
- rust_lex_stringish_test ("r#\"str\\ting\"#", "str\\ting", STRING);
- rust_lex_stringish_test ("r###\"str\\\"ing\"###", "str\\\"ing", STRING);
-
- rust_lex_stringish_test ("b\"string\"", "string", BYTESTRING);
- rust_lex_stringish_test ("b\"\x73tring\"", "string", BYTESTRING);
- rust_lex_stringish_test ("b\"str\\\"ing\"", "str\"ing", BYTESTRING);
- rust_lex_stringish_test ("br####\"\\x73tring\"####", "\\x73tring",
+ rust_lex_int_test (&parser, "'\\n'", '\n', INTEGER);
+ rust_lex_int_test (&parser, "'\\r'", '\r', INTEGER);
+ rust_lex_int_test (&parser, "'\\t'", '\t', INTEGER);
+ rust_lex_int_test (&parser, "'\\\\'", '\\', INTEGER);
+ rust_lex_int_test (&parser, "'\\0'", '\0', INTEGER);
+ rust_lex_int_test (&parser, "'\\''", '\'', INTEGER);
+ rust_lex_int_test (&parser, "'\\\"'", '"', INTEGER);
+
+ rust_lex_int_test (&parser, "b'\\n'", '\n', INTEGER);
+ rust_lex_int_test (&parser, "b'\\r'", '\r', INTEGER);
+ rust_lex_int_test (&parser, "b'\\t'", '\t', INTEGER);
+ rust_lex_int_test (&parser, "b'\\\\'", '\\', INTEGER);
+ rust_lex_int_test (&parser, "b'\\0'", '\0', INTEGER);
+ rust_lex_int_test (&parser, "b'\\''", '\'', INTEGER);
+ rust_lex_int_test (&parser, "b'\\\"'", '"', INTEGER);
+
+ rust_lex_exception_test (&parser, "'z", "Unterminated character literal");
+ rust_lex_exception_test (&parser, "b'\\x0'", "Not enough hex digits seen");
+ rust_lex_exception_test (&parser, "b'\\u{0}'",
+ "Unicode escape in byte literal");
+ rust_lex_exception_test (&parser, "'\\x0'", "Not enough hex digits seen");
+ rust_lex_exception_test (&parser, "'\\u0'", "Missing '{' in Unicode escape");
+ rust_lex_exception_test (&parser, "'\\u{0", "Missing '}' in Unicode escape");
+ rust_lex_exception_test (&parser, "'\\u{0000007}", "Overlong hex escape");
+ rust_lex_exception_test (&parser, "'\\u{}", "Not enough hex digits seen");
+ rust_lex_exception_test (&parser, "'\\Q'", "Invalid escape \\Q in literal");
+ rust_lex_exception_test (&parser, "b'\\Q'", "Invalid escape \\Q in literal");
+
+ rust_lex_int_test (&parser, "23", 23, DECIMAL_INTEGER);
+ rust_lex_int_test (&parser, "2_344__29", 234429, INTEGER);
+ rust_lex_int_test (&parser, "0x1f", 0x1f, INTEGER);
+ rust_lex_int_test (&parser, "23usize", 23, INTEGER);
+ rust_lex_int_test (&parser, "23i32", 23, INTEGER);
+ rust_lex_int_test (&parser, "0x1_f", 0x1f, INTEGER);
+ rust_lex_int_test (&parser, "0b1_101011__", 0x6b, INTEGER);
+ rust_lex_int_test (&parser, "0o001177i64", 639, INTEGER);
+ rust_lex_int_test (&parser, "0x123456789u64", 0x123456789ull, INTEGER);
+
+ rust_lex_test_trailing_dot (&parser);
+
+ rust_lex_test_one (&parser, "23.", FLOAT);
+ rust_lex_test_one (&parser, "23.99f32", FLOAT);
+ rust_lex_test_one (&parser, "23e7", FLOAT);
+ rust_lex_test_one (&parser, "23E-7", FLOAT);
+ rust_lex_test_one (&parser, "23e+7", FLOAT);
+ rust_lex_test_one (&parser, "23.99e+7f64", FLOAT);
+ rust_lex_test_one (&parser, "23.82f32", FLOAT);
+
+ rust_lex_stringish_test (&parser, "hibob", "hibob", IDENT);
+ rust_lex_stringish_test (&parser, "hibob__93", "hibob__93", IDENT);
+ rust_lex_stringish_test (&parser, "thread", "thread", IDENT);
+
+ rust_lex_stringish_test (&parser, "\"string\"", "string", STRING);
+ rust_lex_stringish_test (&parser, "\"str\\ting\"", "str\ting", STRING);
+ rust_lex_stringish_test (&parser, "\"str\\\"ing\"", "str\"ing", STRING);
+ rust_lex_stringish_test (&parser, "r\"str\\ing\"", "str\\ing", STRING);
+ rust_lex_stringish_test (&parser, "r#\"str\\ting\"#", "str\\ting", STRING);
+ rust_lex_stringish_test (&parser, "r###\"str\\\"ing\"###", "str\\\"ing",
+ STRING);
+
+ rust_lex_stringish_test (&parser, "b\"string\"", "string", BYTESTRING);
+ rust_lex_stringish_test (&parser, "b\"\x73tring\"", "string", BYTESTRING);
+ rust_lex_stringish_test (&parser, "b\"str\\\"ing\"", "str\"ing", BYTESTRING);
+ rust_lex_stringish_test (&parser, "br####\"\\x73tring\"####", "\\x73tring",
BYTESTRING);
for (i = 0; i < ARRAY_SIZE (identifier_tokens); ++i)
- rust_lex_test_one (identifier_tokens[i].name, identifier_tokens[i].value);
+ rust_lex_test_one (&parser, identifier_tokens[i].name,
+ identifier_tokens[i].value);
for (i = 0; i < ARRAY_SIZE (operator_tokens); ++i)
- rust_lex_test_one (operator_tokens[i].name, operator_tokens[i].value);
-
- rust_lex_test_completion ();
- rust_lex_test_push_back ();
+ rust_lex_test_one (&parser, operator_tokens[i].name,
+ operator_tokens[i].value);
- obstack_free (&work_obstack, NULL);
- unit_testing = 0;
+ rust_lex_test_completion (&parser);
+ rust_lex_test_push_back (&parser);
}
#endif /* GDB_SELF_TEST */
+void _initialize_rust_exp ();
void
-_initialize_rust_exp (void)
+_initialize_rust_exp ()
{
int code = regcomp (&number_regex, number_regex_text, REG_EXTENDED);
/* If the regular expression was incorrect, it was a programming
gdb_assert (code == 0);
#if GDB_SELF_TEST
- register_self_test (rust_lex_tests);
+ selftests::register_test ("rust-lex", rust_lex_tests);
#endif
}
projects / deliverable / binutils-gdb.git / blobdiff