From eb4c927182a8c935960e8c70a2c2d3ab2c49e21f Mon Sep 17 00:00:00 2001
From: Tom Tromey <tom@tromey.com>
Date: Mon, 8 Mar 2021 07:27:57 -0700
Subject: [PATCH] Implement Fortran associated operations

This implements the Fortran 1- and 2-argument "associated" operations.

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

	* f-lang.c (eval_op_f_associated): New functions.
	* f-exp.h (fortran_associated_1arg, fortran_associated_2arg): New
	typedefs.
---
 gdb/ChangeLog |  6 ++++++
 gdb/f-exp.h   | 15 +++++++++++++++
 gdb/f-lang.c  | 20 ++++++++++++++++++++
 3 files changed, 41 insertions(+)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 6f3037c8c28..d92f16b12d5 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2021-03-08  Tom Tromey  <tom@tromey.com>
+
+	* f-lang.c (eval_op_f_associated): New functions.
+	* f-exp.h (fortran_associated_1arg, fortran_associated_2arg): New
+	typedefs.
+
 2021-03-08  Tom Tromey  <tom@tromey.com>
 
 	* f-lang.c (fortran_bound_1arg::evaluate)
diff --git a/gdb/f-exp.h b/gdb/f-exp.h
index e1d351a2bb4..11f403d13ca 100644
--- a/gdb/f-exp.h
+++ b/gdb/f-exp.h
@@ -57,6 +57,17 @@ extern struct value *eval_op_f_kind (struct type *expect_type,
 				     enum noside noside,
 				     enum exp_opcode opcode,
 				     struct value *arg1);
+extern struct value *eval_op_f_associated (struct type *expect_type,
+					   struct expression *exp,
+					   enum noside noside,
+					   enum exp_opcode opcode,
+					   struct value *arg1);
+extern struct value *eval_op_f_associated (struct type *expect_type,
+					   struct expression *exp,
+					   enum noside noside,
+					   enum exp_opcode opcode,
+					   struct value *arg1,
+					   struct value *arg2);
 
 namespace expr
 {
@@ -72,6 +83,10 @@ using fortran_kind_operation = unop_operation<UNOP_FORTRAN_KIND,
 using fortran_mod_operation = binop_operation<BINOP_MOD, eval_op_f_mod>;
 using fortran_modulo_operation = binop_operation<BINOP_FORTRAN_MODULO,
 						 eval_op_f_modulo>;
+using fortran_associated_1arg = unop_operation<FORTRAN_ASSOCIATED,
+					       eval_op_f_associated>;
+using fortran_associated_2arg = binop_operation<FORTRAN_ASSOCIATED,
+						eval_op_f_associated>;
 
 /* The Fortran "complex" operation.  */
 class fortran_cmplx_operation
diff --git a/gdb/f-lang.c b/gdb/f-lang.c
index dcd7c48bbcf..1a49b6bdb2f 100644
--- a/gdb/f-lang.c
+++ b/gdb/f-lang.c
@@ -995,6 +995,26 @@ fortran_associated (struct gdbarch *gdbarch, const language_defn *lang,
   return value_from_longest (result_type, is_associated ? 1 : 0);
 }
 
+struct value *
+eval_op_f_associated (struct type *expect_type,
+		      struct expression *exp,
+		      enum noside noside,
+		      enum exp_opcode opcode,
+		      struct value *arg1)
+{
+  return fortran_associated (exp->gdbarch, exp->language_defn, arg1);
+}
+
+struct value *
+eval_op_f_associated (struct type *expect_type,
+		      struct expression *exp,
+		      enum noside noside,
+		      enum exp_opcode opcode,
+		      struct value *arg1,
+		      struct value *arg2)
+{
+  return fortran_associated (exp->gdbarch, exp->language_defn, arg1, arg2);
+}
 
 /* A helper function for UNOP_ABS.  */
 
-- 
2.30.2