Implement some Rust operations
This implements some straightforward Rust operations, using existing template classes. gdb/ChangeLog 2021-03-08 Tom Tromey <tom@tromey.com> * rust-lang.c (eval_op_rust_complement, eval_op_rust_array): No longer static. Add "opcode" parameter. (rust_evaluate_subexp): Update. * rust-exp.h: New file.
This commit is contained in:
parent
9dcd3e2957
commit
6fab435953
3 changed files with 63 additions and 5 deletions
|
@ -1,3 +1,10 @@
|
|||
2021-03-08 Tom Tromey <tom@tromey.com>
|
||||
|
||||
* rust-lang.c (eval_op_rust_complement, eval_op_rust_array): No
|
||||
longer static. Add "opcode" parameter.
|
||||
(rust_evaluate_subexp): Update.
|
||||
* rust-exp.h: New file.
|
||||
|
||||
2021-03-08 Tom Tromey <tom@tromey.com>
|
||||
|
||||
* f-lang.c (eval_op_f_abs, eval_op_f_mod, eval_op_f_ceil)
|
||||
|
|
47
gdb/rust-exp.h
Normal file
47
gdb/rust-exp.h
Normal file
|
@ -0,0 +1,47 @@
|
|||
/* Definitions for Rust expressions
|
||||
|
||||
Copyright (C) 2020 Free Software Foundation, Inc.
|
||||
|
||||
This file is part of GDB.
|
||||
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation; either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
||||
|
||||
#ifndef RUST_EXP_H
|
||||
#define RUST_EXP_H
|
||||
|
||||
#include "expop.h"
|
||||
|
||||
extern struct value *eval_op_rust_complement (struct type *expect_type,
|
||||
struct expression *exp,
|
||||
enum noside noside,
|
||||
enum exp_opcode opcode,
|
||||
struct value *value);
|
||||
extern struct value *eval_op_rust_array (struct type *expect_type,
|
||||
struct expression *exp,
|
||||
enum noside noside,
|
||||
enum exp_opcode opcode,
|
||||
struct value *ncopies,
|
||||
struct value *elt);
|
||||
|
||||
namespace expr
|
||||
{
|
||||
|
||||
using rust_unop_compl_operation = unop_operation<UNOP_COMPLEMENT,
|
||||
eval_op_rust_complement>;
|
||||
using rust_array_operation = binop_operation<OP_RUST_ARRAY,
|
||||
eval_op_rust_array>;
|
||||
|
||||
} /* namespace expr */
|
||||
|
||||
#endif /* RUST_EXP_H */
|
|
@ -39,6 +39,7 @@
|
|||
#include <vector>
|
||||
#include "cli/cli-style.h"
|
||||
#include "parser-defs.h"
|
||||
#include "rust-exp.h"
|
||||
|
||||
/* See rust-lang.h. */
|
||||
|
||||
|
@ -1339,9 +1340,10 @@ eval_op_rust_ind (struct type *expect_type, struct expression *exp,
|
|||
|
||||
/* A helper function for UNOP_COMPLEMENT. */
|
||||
|
||||
static struct value *
|
||||
struct value *
|
||||
eval_op_rust_complement (struct type *expect_type, struct expression *exp,
|
||||
enum noside noside,
|
||||
enum exp_opcode opcode,
|
||||
struct value *value)
|
||||
{
|
||||
if (noside == EVAL_SKIP)
|
||||
|
@ -1356,9 +1358,10 @@ eval_op_rust_complement (struct type *expect_type, struct expression *exp,
|
|||
|
||||
/* A helper function for OP_ARRAY. */
|
||||
|
||||
static struct value *
|
||||
struct value *
|
||||
eval_op_rust_array (struct type *expect_type, struct expression *exp,
|
||||
enum noside noside,
|
||||
enum exp_opcode opcode,
|
||||
struct value *elt, struct value *ncopies)
|
||||
{
|
||||
int copies = value_as_long (ncopies);
|
||||
|
@ -1505,8 +1508,9 @@ rust_evaluate_subexp (struct type *expect_type, struct expression *exp,
|
|||
int *pos, enum noside noside)
|
||||
{
|
||||
struct value *result;
|
||||
enum exp_opcode op = exp->elts[*pos].opcode;
|
||||
|
||||
switch (exp->elts[*pos].opcode)
|
||||
switch (op)
|
||||
{
|
||||
case UNOP_IND:
|
||||
{
|
||||
|
@ -1528,7 +1532,7 @@ rust_evaluate_subexp (struct type *expect_type, struct expression *exp,
|
|||
|
||||
++*pos;
|
||||
value = evaluate_subexp (nullptr, exp, pos, noside);
|
||||
result = eval_op_rust_complement (expect_type, exp, noside, value);
|
||||
result = eval_op_rust_complement (expect_type, exp, noside, op, value);
|
||||
}
|
||||
break;
|
||||
|
||||
|
@ -1621,7 +1625,7 @@ rust_evaluate_subexp (struct type *expect_type, struct expression *exp,
|
|||
|
||||
elt = rust_evaluate_subexp (NULL, exp, pos, noside);
|
||||
ncopies = rust_evaluate_subexp (NULL, exp, pos, noside);
|
||||
return eval_op_rust_array (expect_type, exp, noside, elt, ncopies);
|
||||
return eval_op_rust_array (expect_type, exp, noside, op, elt, ncopies);
|
||||
}
|
||||
break;
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue