diff options
author | Tom Tromey <tom@tromey.com> | 2021-03-08 07:27:57 -0700 |
---|---|---|
committer | Tom Tromey <tom@tromey.com> | 2021-03-08 07:28:42 -0700 |
commit | 79ab486e97be04fb719b3ef91ea3e2b3c9c345c8 (patch) | |
tree | 1b39de74730be6deff4867a32e2d077a832a4654 /gdb/f-exp.y | |
parent | 48fa6f23ec1aaf2ad031673f4c98adb6d411f043 (diff) | |
download | gdb-79ab486e97be04fb719b3ef91ea3e2b3c9c345c8.zip gdb-79ab486e97be04fb719b3ef91ea3e2b3c9c345c8.tar.gz gdb-79ab486e97be04fb719b3ef91ea3e2b3c9c345c8.tar.bz2 |
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 <tom@tromey.com>
* 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.
Diffstat (limited to 'gdb/f-exp.y')
-rw-r--r-- | gdb/f-exp.y | 74 |
1 files changed, 37 insertions, 37 deletions
diff --git a/gdb/f-exp.y b/gdb/f-exp.y index 0e56669..c33b507 100644 --- a/gdb/f-exp.y +++ b/gdb/f-exp.y @@ -1066,24 +1066,24 @@ struct token static const struct token fortran_operators[] = { - { ".and.", BOOL_AND, BINOP_END, false }, - { ".or.", BOOL_OR, BINOP_END, false }, - { ".not.", BOOL_NOT, BINOP_END, false }, - { ".eq.", EQUAL, BINOP_END, false }, - { ".eqv.", EQUAL, BINOP_END, false }, - { ".neqv.", NOTEQUAL, BINOP_END, false }, - { ".xor.", NOTEQUAL, BINOP_END, false }, - { "==", EQUAL, BINOP_END, false }, - { ".ne.", NOTEQUAL, BINOP_END, false }, - { "/=", NOTEQUAL, BINOP_END, false }, - { ".le.", LEQ, BINOP_END, false }, - { "<=", LEQ, BINOP_END, false }, - { ".ge.", GEQ, BINOP_END, false }, - { ">=", GEQ, BINOP_END, false }, - { ".gt.", GREATERTHAN, BINOP_END, false }, - { ">", GREATERTHAN, BINOP_END, false }, - { ".lt.", LESSTHAN, BINOP_END, false }, - { "<", LESSTHAN, BINOP_END, false }, + { ".and.", BOOL_AND, OP_NULL, false }, + { ".or.", BOOL_OR, OP_NULL, false }, + { ".not.", BOOL_NOT, OP_NULL, false }, + { ".eq.", EQUAL, OP_NULL, false }, + { ".eqv.", EQUAL, OP_NULL, false }, + { ".neqv.", NOTEQUAL, OP_NULL, false }, + { ".xor.", NOTEQUAL, OP_NULL, false }, + { "==", EQUAL, OP_NULL, false }, + { ".ne.", NOTEQUAL, OP_NULL, false }, + { "/=", NOTEQUAL, OP_NULL, false }, + { ".le.", LEQ, OP_NULL, false }, + { "<=", LEQ, OP_NULL, false }, + { ".ge.", GEQ, OP_NULL, false }, + { ">=", GEQ, OP_NULL, false }, + { ".gt.", GREATERTHAN, OP_NULL, false }, + { ">", GREATERTHAN, OP_NULL, false }, + { ".lt.", LESSTHAN, OP_NULL, false }, + { "<", LESSTHAN, OP_NULL, false }, { "**", STARSTAR, BINOP_EXP, false }, }; @@ -1108,27 +1108,27 @@ static const struct f77_boolean_val boolean_values[] = static const struct token f77_keywords[] = { /* Historically these have always been lowercase only in GDB. */ - { "complex_16", COMPLEX_S16_KEYWORD, BINOP_END, true }, - { "complex_32", COMPLEX_S32_KEYWORD, BINOP_END, true }, - { "character", CHARACTER, BINOP_END, true }, - { "integer_2", INT_S2_KEYWORD, BINOP_END, true }, - { "logical_1", LOGICAL_S1_KEYWORD, BINOP_END, true }, - { "logical_2", LOGICAL_S2_KEYWORD, BINOP_END, true }, - { "logical_8", LOGICAL_S8_KEYWORD, BINOP_END, true }, - { "complex_8", COMPLEX_S8_KEYWORD, BINOP_END, true }, - { "integer", INT_KEYWORD, BINOP_END, true }, - { "logical", LOGICAL_KEYWORD, BINOP_END, true }, - { "real_16", REAL_S16_KEYWORD, BINOP_END, true }, - { "complex", COMPLEX_KEYWORD, BINOP_END, true }, - { "sizeof", SIZEOF, BINOP_END, true }, - { "real_8", REAL_S8_KEYWORD, BINOP_END, true }, - { "real", REAL_KEYWORD, BINOP_END, true }, - { "single", SINGLE, BINOP_END, true }, - { "double", DOUBLE, BINOP_END, true }, - { "precision", PRECISION, BINOP_END, true }, + { "complex_16", COMPLEX_S16_KEYWORD, OP_NULL, true }, + { "complex_32", COMPLEX_S32_KEYWORD, OP_NULL, true }, + { "character", CHARACTER, OP_NULL, true }, + { "integer_2", INT_S2_KEYWORD, OP_NULL, true }, + { "logical_1", LOGICAL_S1_KEYWORD, OP_NULL, true }, + { "logical_2", LOGICAL_S2_KEYWORD, OP_NULL, true }, + { "logical_8", LOGICAL_S8_KEYWORD, OP_NULL, true }, + { "complex_8", COMPLEX_S8_KEYWORD, OP_NULL, true }, + { "integer", INT_KEYWORD, OP_NULL, true }, + { "logical", LOGICAL_KEYWORD, OP_NULL, true }, + { "real_16", REAL_S16_KEYWORD, OP_NULL, true }, + { "complex", COMPLEX_KEYWORD, OP_NULL, true }, + { "sizeof", SIZEOF, OP_NULL, true }, + { "real_8", REAL_S8_KEYWORD, OP_NULL, true }, + { "real", REAL_KEYWORD, OP_NULL, true }, + { "single", SINGLE, OP_NULL, true }, + { "double", DOUBLE, OP_NULL, true }, + { "precision", PRECISION, OP_NULL, true }, /* The following correspond to actual functions in Fortran and are case insensitive. */ - { "kind", KIND, BINOP_END, false }, + { "kind", KIND, OP_NULL, false }, { "abs", UNOP_INTRINSIC, UNOP_ABS, false }, { "mod", BINOP_INTRINSIC, BINOP_MOD, false }, { "floor", UNOP_INTRINSIC, UNOP_FORTRAN_FLOOR, false }, |