From 79ab486e97be04fb719b3ef91ea3e2b3c9c345c8 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Mon, 8 Mar 2021 07:27:57 -0700 Subject: Remove BINOP_END BINOP_END is used only as a "meaningless" value in various tables. This patch changes these to use OP_NULL instead, and removes BINOP_END. gdb/ChangeLog 2021-03-08 Tom Tromey * std-operator.def (BINOP_END): Remove. * p-exp.y (tokentab3, tokentab2): Use OP_NULL, not BINOP_END. * go-exp.y (tokentab2): Use OP_NULL, not BINOP_END. * f-exp.y (dot_ops, f77_keywords): Use OP_NULL, not BINOP_END. * d-exp.y (tokentab2, ident_tokens): Use OP_NULL, not BINOP_END. * c-exp.y (tokentab3, tokentab2, ident_tokens): Use OP_NULL, not BINOP_END. --- gdb/d-exp.y | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'gdb/d-exp.y') diff --git a/gdb/d-exp.y b/gdb/d-exp.y index 1a75431..d74fb87 100644 --- a/gdb/d-exp.y +++ b/gdb/d-exp.y @@ -965,25 +965,25 @@ static const struct token tokentab2[] = {"|=", ASSIGN_MODIFY, BINOP_BITWISE_IOR}, {"&=", ASSIGN_MODIFY, BINOP_BITWISE_AND}, {"^=", ASSIGN_MODIFY, BINOP_BITWISE_XOR}, - {"++", INCREMENT, BINOP_END}, - {"--", DECREMENT, BINOP_END}, - {"&&", ANDAND, BINOP_END}, - {"||", OROR, BINOP_END}, - {"^^", HATHAT, BINOP_END}, - {"<<", LSH, BINOP_END}, - {">>", RSH, BINOP_END}, - {"==", EQUAL, BINOP_END}, - {"!=", NOTEQUAL, BINOP_END}, - {"<=", LEQ, BINOP_END}, - {">=", GEQ, BINOP_END}, - {"..", DOTDOT, BINOP_END}, + {"++", INCREMENT, OP_NULL}, + {"--", DECREMENT, OP_NULL}, + {"&&", ANDAND, OP_NULL}, + {"||", OROR, OP_NULL}, + {"^^", HATHAT, OP_NULL}, + {"<<", LSH, OP_NULL}, + {">>", RSH, OP_NULL}, + {"==", EQUAL, OP_NULL}, + {"!=", NOTEQUAL, OP_NULL}, + {"<=", LEQ, OP_NULL}, + {">=", GEQ, OP_NULL}, + {"..", DOTDOT, OP_NULL}, }; /* Identifier-like tokens. */ static const struct token ident_tokens[] = { - {"is", IDENTITY, BINOP_END}, - {"!is", NOTIDENTITY, BINOP_END}, + {"is", IDENTITY, OP_NULL}, + {"!is", NOTIDENTITY, OP_NULL}, {"cast", CAST_KEYWORD, OP_NULL}, {"const", CONST_KEYWORD, OP_NULL}, -- cgit v1.1