Implement binary comparison operations

This implements the binary comparison operations via a template class.

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

	* expop.h (class comparison_operation): New.
	(equal_operation, notequal_operation, less_operation)
	(gtr_operation, geq_operation, leq_operation): New typedefs.
	* eval.c (eval_op_equal, eval_op_notequal, eval_op_less)
	(eval_op_gtr, eval_op_geq, eval_op_leq): No longer static.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index b84ebfb1ec71420019c6576a631c1520ecb1d2e1..1f3287aefb3b2c038f4f666cee96edd5c5a2bc2e 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+2021-03-08  Tom Tromey  <tom@tromey.com>
+
+       * expop.h (class comparison_operation): New.
+       (equal_operation, notequal_operation, less_operation)
+       (gtr_operation, geq_operation, leq_operation): New typedefs.
+       * eval.c (eval_op_equal, eval_op_notequal, eval_op_less)
+       (eval_op_gtr, eval_op_geq, eval_op_leq): No longer static.
+
 2021-03-08  Tom Tromey  <tom@tromey.com>
 
        * expop.h (class subscript_operation): New.

diff --git a/gdb/eval.c b/gdb/eval.c
index 056daa051602e581c9fe886989852855f6a558ab..83d0147f96e4efce3f6b291467d8b7494c1117a0 100644 (file)
--- a/gdb/eval.c
+++ b/gdb/eval.c
@@ -1594,7 +1594,7 @@ eval_op_subscript (struct type *expect_type, struct expression *exp,
 
 /* A helper function for BINOP_EQUAL.  */
 
-static struct value *
+struct value *
 eval_op_equal (struct type *expect_type, struct expression *exp,
               enum noside noside, enum exp_opcode op,
               struct value *arg1, struct value *arg2)
@@ -1617,7 +1617,7 @@ eval_op_equal (struct type *expect_type, struct expression *exp,
 
 /* A helper function for BINOP_NOTEQUAL.  */
 
-static struct value *
+struct value *
 eval_op_notequal (struct type *expect_type, struct expression *exp,
                  enum noside noside, enum exp_opcode op,
                  struct value *arg1, struct value *arg2)
@@ -1640,7 +1640,7 @@ eval_op_notequal (struct type *expect_type, struct expression *exp,
 
 /* A helper function for BINOP_LESS.  */
 
-static struct value *
+struct value *
 eval_op_less (struct type *expect_type, struct expression *exp,
              enum noside noside, enum exp_opcode op,
              struct value *arg1, struct value *arg2)
@@ -1663,7 +1663,7 @@ eval_op_less (struct type *expect_type, struct expression *exp,
 
 /* A helper function for BINOP_GTR.  */
 
-static struct value *
+struct value *
 eval_op_gtr (struct type *expect_type, struct expression *exp,
             enum noside noside, enum exp_opcode op,
             struct value *arg1, struct value *arg2)
@@ -1686,7 +1686,7 @@ eval_op_gtr (struct type *expect_type, struct expression *exp,
 
 /* A helper function for BINOP_GEQ.  */
 
-static struct value *
+struct value *
 eval_op_geq (struct type *expect_type, struct expression *exp,
             enum noside noside, enum exp_opcode op,
             struct value *arg1, struct value *arg2)
@@ -1709,7 +1709,7 @@ eval_op_geq (struct type *expect_type, struct expression *exp,
 
 /* A helper function for BINOP_LEQ.  */
 
-static struct value *
+struct value *
 eval_op_leq (struct type *expect_type, struct expression *exp,
             enum noside noside, enum exp_opcode op,
             struct value *arg1, struct value *arg2)

diff --git a/gdb/expop.h b/gdb/expop.h
index 5c3b0afee551b611c5021821058662dd341ed33e..af378d011f853d764274d0e0e979f47521350263 100644 (file)
--- a/gdb/expop.h
+++ b/gdb/expop.h
@@ -105,6 +105,36 @@ extern struct value *eval_op_subscript (struct type *expect_type,
                                        enum noside noside, enum exp_opcode op,
                                        struct value *arg1,
                                        struct value *arg2);
+extern struct value *eval_op_equal (struct type *expect_type,
+                                   struct expression *exp,
+                                   enum noside noside, enum exp_opcode op,
+                                   struct value *arg1,
+                                   struct value *arg2);
+extern struct value *eval_op_notequal (struct type *expect_type,
+                                      struct expression *exp,
+                                      enum noside noside, enum exp_opcode op,
+                                      struct value *arg1,
+                                      struct value *arg2);
+extern struct value *eval_op_less (struct type *expect_type,
+                                  struct expression *exp,
+                                  enum noside noside, enum exp_opcode op,
+                                  struct value *arg1,
+                                  struct value *arg2);
+extern struct value *eval_op_gtr (struct type *expect_type,
+                                 struct expression *exp,
+                                 enum noside noside, enum exp_opcode op,
+                                 struct value *arg1,
+                                 struct value *arg2);
+extern struct value *eval_op_geq (struct type *expect_type,
+                                 struct expression *exp,
+                                 enum noside noside, enum exp_opcode op,
+                                 struct value *arg1,
+                                 struct value *arg2);
+extern struct value *eval_op_leq (struct type *expect_type,
+                                 struct expression *exp,
+                                 enum noside noside, enum exp_opcode op,
+                                 struct value *arg1,
+                                 struct value *arg2);
 
 namespace expr
 {
@@ -1128,6 +1158,36 @@ public:
                              enum noside noside) override;
 };
 
+/* Implementation of comparison operations.  */
+template<enum exp_opcode OP, binary_ftype FUNC>
+class comparison_operation
+  : public usual_ax_binop_operation<OP, FUNC>
+{
+public:
+
+  using usual_ax_binop_operation<OP, FUNC>::usual_ax_binop_operation;
+
+  value *evaluate (struct type *expect_type,
+                  struct expression *exp,
+                  enum noside noside) override
+  {
+    value *lhs
+      = std::get<0> (this->m_storage)->evaluate (nullptr, exp, noside);
+    value *rhs
+      = std::get<1> (this->m_storage)->evaluate (value_type (lhs), exp,
+                                                noside);
+    return FUNC (expect_type, exp, noside, OP, lhs, rhs);
+  }
+};
+
+using equal_operation = comparison_operation<BINOP_EQUAL, eval_op_equal>;
+using notequal_operation
+     = comparison_operation<BINOP_NOTEQUAL, eval_op_notequal>;
+using less_operation = comparison_operation<BINOP_LESS, eval_op_less>;
+using gtr_operation = comparison_operation<BINOP_GTR, eval_op_gtr>;
+using geq_operation = comparison_operation<BINOP_GEQ, eval_op_geq>;
+using leq_operation = comparison_operation<BINOP_LEQ, eval_op_leq>;
+
 } /* namespace expr */
 
 #endif /* EXPOP_H */