Imagelibrary/binutils-gdb
1
0
Fork 1
mirror of https://github.com/bminor/binutils-gdb.git synced 2025-12-10 01:23:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove ada_ternop_slice

Browse Source 
ada_ternop_slice can be merged with its sole caller.

Approved-By: Simon Marchi <simon.marchi@efficios.com>
This commit is contained in:
Tom Tromey
2025-09-08 10:25:13 -06:00
parent b1618ec21a
commit 118245e166
2 changed files with 13 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
gdb/ada-exp.h
View File

@@ -38,11 +38,6 @@ extern struct value *ada_mult_binop (struct type *expect_type,
struct expression *exp, struct expression *exp,
enum noside noside, enum exp_opcode op, enum noside noside, enum exp_opcode op,
struct value *arg1, struct value *arg2); struct value *arg1, struct value *arg2);
extern struct value *ada_ternop_slice (struct expression *exp,
enum noside noside,
struct value *array,
struct value *low_bound_val,
struct value *high_bound_val);
extern struct value *ada_binop_in_bounds (struct expression *exp, extern struct value *ada_binop_in_bounds (struct expression *exp,
enum noside noside, enum noside noside,
struct value *arg1, struct value *arg1,
@@ -287,13 +282,7 @@ public:
value *evaluate (struct type *expect_type, value *evaluate (struct type *expect_type,
struct expression *exp, struct expression *exp,
enum noside noside) override enum noside noside) override;
{
value *array = std::get<0> (m_storage)->evaluate (nullptr, exp, noside);
value *low = std::get<1> (m_storage)->evaluate (nullptr, exp, noside);
value *high = std::get<2> (m_storage)->evaluate (nullptr, exp, noside);
return ada_ternop_slice (exp, noside, array, low, high);
}
enum exp_opcode opcode () const override enum exp_opcode opcode () const override
{ return TERNOP_SLICE; } { return TERNOP_SLICE; }

19
gdb/ada-lang.c
View File

@@ -10198,16 +10198,19 @@ ada_binop_equal_operation::evaluate (struct type *expect_type,
return value_from_longest (type, tem); return value_from_longest (type, tem);
} }
} /* namespace expr */ /* Implement TERNOP_SLICE. */
/* A helper function for TERNOP_SLICE. */
value * value *
ada_ternop_slice (struct expression *exp, ada_ternop_slice_operation::evaluate (struct type *expect_type,
enum noside noside, struct expression *exp,
struct value *array, struct value *low_bound_val, enum noside noside)
struct value *high_bound_val)
{ {
value *array = std::get<0> (m_storage)->evaluate (nullptr, exp, noside);
value *low_bound_val
= std::get<1> (m_storage)->evaluate (nullptr, exp, noside);
value *high_bound_val
= std::get<2> (m_storage)->evaluate (nullptr, exp, noside);
LONGEST low_bound; LONGEST low_bound;
LONGEST high_bound; LONGEST high_bound;
@@ -10281,6 +10284,8 @@ ada_ternop_slice (struct expression *exp,
longest_to_int (high_bound)); longest_to_int (high_bound));
} }
} /* namespace expr */
/* A helper function for BINOP_IN_BOUNDS. */ /* A helper function for BINOP_IN_BOUNDS. */
value * value *