[157/203] Introduce ada_binop_in_bounds

Message ID 20210101214723.1784144-158-tom@tromey.com
State Superseded
Headers show
Series
  • Refactor expressions
Related show

Commit Message

Tom Tromey Jan. 1, 2021, 9:46 p.m.
This adds class ada_binop_in_bounds, which implements BINOP_IN_BOUNDS.

gdb/ChangeLog
2021-01-01  Tom Tromey  <tom@tromey.com>

	* ada-lang.c (ada_binop_in_bounds): No longer static.
	* ada-exp.h (class ada_binop_in_bounds_operation): New.
---
 gdb/ChangeLog  |  5 +++++
 gdb/ada-exp.h  | 27 +++++++++++++++++++++++++++
 gdb/ada-lang.c |  2 +-
 3 files changed, 33 insertions(+), 1 deletion(-)

-- 
2.26.2

Patch

diff --git a/gdb/ada-exp.h b/gdb/ada-exp.h
index 96e3c407b6f..4c30734171f 100644
--- a/gdb/ada-exp.h
+++ b/gdb/ada-exp.h
@@ -55,6 +55,11 @@  extern struct value *ada_ternop_slice (struct expression *exp,
 				       struct value *array,
 				       struct value *low_bound_val,
 				       struct value *high_bound_val);
+extern struct value *ada_binop_in_bounds (struct expression *exp,
+					  enum noside noside,
+					  struct value *arg1,
+					  struct value *arg2,
+					  int n);
 
 namespace expr
 {
@@ -240,6 +245,28 @@  class ada_ternop_slice_operation
   { return TERNOP_SLICE; }
 };
 
+/* Implement BINOP_IN_BOUNDS for Ada.  */
+class ada_binop_in_bounds_operation
+  : public maybe_constant_operation<operation_up, operation_up, int>
+{
+public:
+
+  using maybe_constant_operation::maybe_constant_operation;
+
+  value *evaluate (struct type *expect_type,
+		   struct expression *exp,
+		   enum noside noside) override
+  {
+    value *arg1 = std::get<0> (m_storage)->evaluate (nullptr, exp, noside);
+    value *arg2 = std::get<1> (m_storage)->evaluate (nullptr, exp, noside);
+    return ada_binop_in_bounds (exp, noside, arg1, arg2,
+				std::get<2> (m_storage));
+  }
+
+  enum exp_opcode opcode () const override
+  { return BINOP_IN_BOUNDS; }
+};
+
 } /* namespace expr */
 
 #endif /* ADA_EXP_H */
diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
index 00912a4136d..8ed4949238c 100644
--- a/gdb/ada-lang.c
+++ b/gdb/ada-lang.c
@@ -10382,7 +10382,7 @@  ada_ternop_slice (struct expression *exp,
 
 /* A helper function for BINOP_IN_BOUNDS.  */
 
-static value *
+value *
 ada_binop_in_bounds (struct expression *exp, enum noside noside,
 		     struct value *arg1, struct value *arg2, int n)
 {