From: Yao Qi <yao@codesourcery.com>
Date: Tue, 15 Apr 2014 03:10:56 +0000 (+0800)
Subject: Remove operator BINOP_IN
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9c81664074faf6028036d9b3615ab860396b0c81;p=binutils-gdb.git

Remove operator BINOP_IN

Chill language support was removed several years ago, and BINOP_IN
isn't used for Pascal.  This patch is to remove BINOP_IN.

gdb:

2014-07-20  Yao Qi  <yao@codesourcery.com>

	* std-operator.def: Remove BINOP_IN.
	* breakpoint.c (watchpoint_exp_is_const): Update.
	* eval.c (evaluate_subexp_standard): Likewise.
	* expprint.c (dump_subexp_body_standard): Likewise.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index a212b476b5c..7cd8ada6063 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2014-07-20  Yao Qi  <yao@codesourcery.com>
+
+	* std-operator.def: Remove BINOP_IN.
+	* breakpoint.c (watchpoint_exp_is_const): Update.
+	* eval.c (evaluate_subexp_standard): Likewise.
+	* expprint.c (dump_subexp_body_standard): Likewise.
+
 2014-07-19  Ajit Agarwal  <ajitkum@xilinx.com>
 
 	* microblaze-tdep.c (microblaze_register_names): Add
diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index 908a1ea22d9..bad375bb26e 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -10602,7 +10602,6 @@ watchpoint_exp_is_const (const struct expression *exp)
 	case BINOP_MAX:
 	case BINOP_INTDIV:
 	case BINOP_CONCAT:
-	case BINOP_IN:
 	case BINOP_RANGE:
 	case TERNOP_COND:
 	case TERNOP_SLICE:
diff --git a/gdb/eval.c b/gdb/eval.c
index d374b6a4c50..949b2f830de 100644
--- a/gdb/eval.c
+++ b/gdb/eval.c
@@ -2164,15 +2164,6 @@ evaluate_subexp_standard (struct type *expect_type,
 	  else
 	    return value_subscript (arg1, value_as_long (arg2));
 	}
-
-    case BINOP_IN:
-      arg1 = evaluate_subexp_with_coercion (exp, pos, noside);
-      arg2 = evaluate_subexp_with_coercion (exp, pos, noside);
-      if (noside == EVAL_SKIP)
-	goto nosideret;
-      type = language_bool_type (exp->language_defn, exp->gdbarch);
-      return value_from_longest (type, (LONGEST) value_in (arg1, arg2));
-
     case MULTI_SUBSCRIPT:
       (*pos) += 2;
       nargs = longest_to_int (exp->elts[pc + 1].longconst);
diff --git a/gdb/expprint.c b/gdb/expprint.c
index aa9e4d76a34..505bd485fac 100644
--- a/gdb/expprint.c
+++ b/gdb/expprint.c
@@ -802,7 +802,6 @@ dump_subexp_body_standard (struct expression *exp,
     case BINOP_ASSIGN_MODIFY:
     case BINOP_VAL:
     case BINOP_CONCAT:
-    case BINOP_IN:
     case BINOP_RANGE:
     case BINOP_END:
     case STRUCTOP_MEMBER:
diff --git a/gdb/std-operator.def b/gdb/std-operator.def
index e530654ffda..16014e0914a 100644
--- a/gdb/std-operator.def
+++ b/gdb/std-operator.def
@@ -87,9 +87,6 @@ OP (BINOP_VAL)
    the second operand with itself that many times.  */
 OP (BINOP_CONCAT)
 
-/* For (the deleted) Chill and Pascal.  */
-OP (BINOP_IN)			/* Returns 1 iff ARG1 IN ARG2.  */
-
 /* This is the "colon operator" used various places in (the
    deleted) Chill.  */
 OP (BINOP_RANGE)