[v3,072/206] Split out eval_multi_subscript

Message ID 20210220201609.838264-73-tom@tromey.com
State New
Headers show
Series
  • Refactor expressions
Related show

Commit Message

Tom Tromey Feb. 20, 2021, 8:13 p.m.
This splits MULTI_SUBSCRIPT into a new function for future use.

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

	* eval.c (eval_multi_subscript): New function.
	(evaluate_subexp_standard): Use it.
---
 gdb/ChangeLog |  5 ++++
 gdb/eval.c    | 75 ++++++++++++++++++++++++++++-----------------------
 2 files changed, 47 insertions(+), 33 deletions(-)

-- 
2.26.2

Patch

diff --git a/gdb/eval.c b/gdb/eval.c
index 2b634ee49b5..1df417e3b93 100644
--- a/gdb/eval.c
+++ b/gdb/eval.c
@@ -2350,6 +2350,46 @@  eval_op_objc_msgcall (struct type *expect_type, struct expression *exp,
   return call_function_by_hand (called_method, NULL, args);
 }
 
+/* Helper function for MULTI_SUBSCRIPT.  */
+
+static struct value *
+eval_multi_subscript (struct type *expect_type, struct expression *exp,
+		      enum noside noside, value *arg1,
+		      gdb::array_view<value *> args)
+{
+  if (noside == EVAL_SKIP)
+    return arg1;
+  for (value *arg2 : args)
+    {
+      if (binop_user_defined_p (MULTI_SUBSCRIPT, arg1, arg2))
+	{
+	  arg1 = value_x_binop (arg1, arg2, MULTI_SUBSCRIPT, OP_NULL, noside);
+	}
+      else
+	{
+	  arg1 = coerce_ref (arg1);
+	  struct type *type = check_typedef (value_type (arg1));
+
+	  switch (type->code ())
+	    {
+	    case TYPE_CODE_PTR:
+	    case TYPE_CODE_ARRAY:
+	    case TYPE_CODE_STRING:
+	      arg1 = value_subscript (arg1, value_as_long (arg2));
+	      break;
+
+	    default:
+	      if (type->name ())
+		error (_("cannot subscript something of type `%s'"),
+		       type->name ());
+	      else
+		error (_("cannot subscript requested type"));
+	    }
+	}
+    }
+  return (arg1);
+}
+
 struct value *
 evaluate_subexp_standard (struct type *expect_type,
 			  struct expression *exp, int *pos,
@@ -2805,39 +2845,8 @@  evaluate_subexp_standard (struct type *expect_type,
       argvec = XALLOCAVEC (struct value *, nargs);
       for (ix = 0; ix < nargs; ++ix)
 	argvec[ix] = evaluate_subexp_with_coercion (exp, pos, noside);
-      if (noside == EVAL_SKIP)
-	return arg1;
-      for (ix = 0; ix < nargs; ++ix)
-	{
-	  arg2 = argvec[ix];
-
-	  if (binop_user_defined_p (op, arg1, arg2))
-	    {
-	      arg1 = value_x_binop (arg1, arg2, op, OP_NULL, noside);
-	    }
-	  else
-	    {
-	      arg1 = coerce_ref (arg1);
-	      type = check_typedef (value_type (arg1));
-
-	      switch (type->code ())
-		{
-		case TYPE_CODE_PTR:
-		case TYPE_CODE_ARRAY:
-		case TYPE_CODE_STRING:
-		  arg1 = value_subscript (arg1, value_as_long (arg2));
-		  break;
-
-		default:
-		  if (type->name ())
-		    error (_("cannot subscript something of type `%s'"),
-			   type->name ());
-		  else
-		    error (_("cannot subscript requested type"));
-		}
-	    }
-	}
-      return (arg1);
+      return eval_multi_subscript (expect_type, exp, noside, arg1,
+				   gdb::make_array_view (argvec, nargs));
 
     case BINOP_LOGICAL_AND:
       arg1 = evaluate_subexp (nullptr, exp, pos, noside);