[PATCH 183/203] Convert f-exp.y to use operations

Tom Tromey
2021-01-01T21:49:46Z

This converts the Fortran parser to generate operations rather than
exp_elements.

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

* f-exp.y: Create operations.
(f_language::parser): Update.
---
gdb/ChangeLog | 5 +
gdb/f-exp.y | 322 ++++++++++++++++++++++++++++++--------------------
2 files changed, 198 insertions(+), 129 deletions(-)

diff --git a/gdb/f-exp.y b/gdb/f-exp.y
index 6001e77060b..3aee19facce 100644
--- a/gdb/f-exp.y
+++ b/gdb/f-exp.y
@@ -55,6 +55,7 @@
#include <ctype.h>
#include <algorithm>
#include "type-stack.h"
+#include "f-exp.h"

#define parse_type(ps) builtin_type (ps->gdbarch ())
#define parse_f_type(ps) builtin_f_type (ps->gdbarch ())
@@ -89,6 +90,7 @@ static void push_kind_type (LONGEST val, struct type *type);

static struct type *convert_to_kind_type (struct type *basetype, int kind);

+using namespace expr;
%}

/* Although the yacc "value" of an expression is not used,
@@ -208,9 +210,7 @@ start : exp
;

type_exp: type
- { write_exp_elt_opcode (pstate, OP_TYPE);
- write_exp_elt_type (pstate, $1);
- write_exp_elt_opcode (pstate, OP_TYPE); }
+ { pstate->push_new<type_operation> ($1); }
;

exp : '(' exp ')'
@@ -219,31 +219,31 @@ exp : '(' exp ')'

/* Expressions, not including the comma operator. */
exp : '*' exp %prec UNARY
- { write_exp_elt_opcode (pstate, UNOP_IND); }
+ { pstate->wrap<unop_ind_operation> (); }
;

exp : '&' exp %prec UNARY
- { write_exp_elt_opcode (pstate, UNOP_ADDR); }
+ { pstate->wrap<unop_addr_operation> (); }
;

exp : '-' exp %prec UNARY
- { write_exp_elt_opcode (pstate, UNOP_NEG); }
+ { pstate->wrap<unary_neg_operation> (); }
;

exp : BOOL_NOT exp %prec UNARY
- { write_exp_elt_opcode (pstate, UNOP_LOGICAL_NOT); }
+ { pstate->wrap<unary_logical_not_operation> (); }
;

exp : '~' exp %prec UNARY
- { write_exp_elt_opcode (pstate, UNOP_COMPLEMENT); }
+ { pstate->wrap<unary_complement_operation> (); }
;

exp : SIZEOF exp %prec UNARY
- { write_exp_elt_opcode (pstate, UNOP_SIZEOF); }
+ { pstate->wrap<unop_sizeof_operation> (); }
;

exp : KIND '(' exp ')' %prec UNARY
- { write_exp_elt_opcode (pstate, UNOP_FORTRAN_KIND); }
+ { pstate->wrap<fortran_kind_operation> (); }
;

/* No more explicit array operators, we treat everything in F77 as
@@ -254,20 +254,50 @@ exp : KIND '(' exp ')' %prec UNARY
exp : exp '('
{ pstate->start_arglist (); }
arglist ')'
- { write_exp_elt_opcode (pstate,
- OP_F77_UNDETERMINED_ARGLIST);
- write_exp_elt_longcst (pstate,
- pstate->end_arglist ());
- write_exp_elt_opcode (pstate,
- OP_F77_UNDETERMINED_ARGLIST); }
+ {
+ std::vector<operation_up> args
+ = pstate->pop_vector (pstate->end_arglist ());
+ pstate->push_new<fortran_undetermined>
+ (pstate->pop (), std::move (args));
+ }
;

exp : UNOP_INTRINSIC '(' exp ')'
- { write_exp_elt_opcode (pstate, $1); }
+ {
+ switch ($1)
+ {
+ case UNOP_ABS:
+ pstate->wrap<fortran_abs_operation> ();
+ break;
+ case UNOP_FORTRAN_FLOOR:
+ pstate->wrap<fortran_floor_operation> ();
+ break;
+ case UNOP_FORTRAN_CEILING:
+ pstate->wrap<fortran_ceil_operation> ();
+ break;
+ default:
+ gdb_assert_not_reached ("unhandled intrinsic");
+ }
+ }
;

exp : BINOP_INTRINSIC '(' exp ',' exp ')'
- { write_exp_elt_opcode (pstate, $1); }
+ {
+ switch ($1)
+ {
+ case BINOP_MOD:
+ pstate->wrap2<fortran_mod_operation> ();
+ break;
+ case BINOP_FORTRAN_MODULO:
+ pstate->wrap2<fortran_modulo_operation> ();
+ break;
+ case BINOP_FORTRAN_CMPLX:
+ pstate->wrap2<fortran_cmplx_operation> ();
+ break;
+ default:
+ gdb_assert_not_reached ("unhandled intrinsic");
+ }
+ }
;

arglist :
@@ -292,63 +322,90 @@ arglist : arglist ',' subrange %prec ABOVE_COMMA
/* There are four sorts of subrange types in F90. */

subrange: exp ':' exp %prec ABOVE_COMMA
- { write_exp_elt_opcode (pstate, OP_RANGE);
- write_exp_elt_longcst (pstate, RANGE_STANDARD);
- write_exp_elt_opcode (pstate, OP_RANGE); }
+ {
+ operation_up high = pstate->pop ();
+ operation_up low = pstate->pop ();
+ pstate->push_new<fortran_range_operation>
+ (RANGE_STANDARD, std::move (low),
+ std::move (high), operation_up ());
+ }
;

subrange: exp ':' %prec ABOVE_COMMA
- { write_exp_elt_opcode (pstate, OP_RANGE);
- write_exp_elt_longcst (pstate,
- RANGE_HIGH_BOUND_DEFAULT);
- write_exp_elt_opcode (pstate, OP_RANGE); }
+ {
+ operation_up low = pstate->pop ();
+ pstate->push_new<fortran_range_operation>
+ (RANGE_HIGH_BOUND_DEFAULT, std::move (low),
+ operation_up (), operation_up ());
+ }
;

subrange: ':' exp %prec ABOVE_COMMA
- { write_exp_elt_opcode (pstate, OP_RANGE);
- write_exp_elt_longcst (pstate,
- RANGE_LOW_BOUND_DEFAULT);
- write_exp_elt_opcode (pstate, OP_RANGE); }
+ {
+ operation_up high = pstate->pop ();
+ pstate->push_new<fortran_range_operation>
+ (RANGE_LOW_BOUND_DEFAULT, operation_up (),
+ std::move (high), operation_up ());
+ }
;

subrange: ':' %prec ABOVE_COMMA
- { write_exp_elt_opcode (pstate, OP_RANGE);
- write_exp_elt_longcst (pstate,
- (RANGE_LOW_BOUND_DEFAULT
- | RANGE_HIGH_BOUND_DEFAULT));
- write_exp_elt_opcode (pstate, OP_RANGE); }
+ {
+ pstate->push_new<fortran_range_operation>
+ (RANGE_LOW_BOUND_DEFAULT
+ | RANGE_HIGH_BOUND_DEFAULT,
+ operation_up (), operation_up (),
+ operation_up ());
+ }
;

/* And each of the four subrange types can also have a stride. */
subrange: exp ':' exp ':' exp %prec ABOVE_COMMA
- { write_exp_elt_opcode (pstate, OP_RANGE);
- write_exp_elt_longcst (pstate, RANGE_HAS_STRIDE);
- write_exp_elt_opcode (pstate, OP_RANGE); }
+ {
+ operation_up stride = pstate->pop ();
+ operation_up high = pstate->pop ();
+ operation_up low = pstate->pop ();
+ pstate->push_new<fortran_range_operation>
+ (RANGE_STANDARD | RANGE_HAS_STRIDE,
+ std::move (low), std::move (high),
+ std::move (stride));
+ }
;

subrange: exp ':' ':' exp %prec ABOVE_COMMA
- { write_exp_elt_opcode (pstate, OP_RANGE);
- write_exp_elt_longcst (pstate,
- (RANGE_HIGH_BOUND_DEFAULT
- | RANGE_HAS_STRIDE));
- write_exp_elt_opcode (pstate, OP_RANGE); }
+ {
+ operation_up stride = pstate->pop ();
+ operation_up low = pstate->pop ();
+ pstate->push_new<fortran_range_operation>
+ (RANGE_HIGH_BOUND_DEFAULT
+ | RANGE_HAS_STRIDE,
+ std::move (low), operation_up (),
+ std::move (stride));
+ }
;

subrange: ':' exp ':' exp %prec ABOVE_COMMA
- { write_exp_elt_opcode (pstate, OP_RANGE);
- write_exp_elt_longcst (pstate,
- (RANGE_LOW_BOUND_DEFAULT
- | RANGE_HAS_STRIDE));
- write_exp_elt_opcode (pstate, OP_RANGE); }
+ {
+ operation_up stride = pstate->pop ();
+ operation_up high = pstate->pop ();
+ pstate->push_new<fortran_range_operation>
+ (RANGE_LOW_BOUND_DEFAULT
+ | RANGE_HAS_STRIDE,
+ operation_up (), std::move (high),
+ std::move (stride));
+ }
;

subrange: ':' ':' exp %prec ABOVE_COMMA
- { write_exp_elt_opcode (pstate, OP_RANGE);
- write_exp_elt_longcst (pstate,
- (RANGE_LOW_BOUND_DEFAULT
- | RANGE_HIGH_BOUND_DEFAULT
- | RANGE_HAS_STRIDE));
- write_exp_elt_opcode (pstate, OP_RANGE); }
+ {
+ operation_up stride = pstate->pop ();
+ pstate->push_new<fortran_range_operation>
+ (RANGE_LOW_BOUND_DEFAULT
+ | RANGE_HIGH_BOUND_DEFAULT
+ | RANGE_HAS_STRIDE,
+ operation_up (), operation_up (),
+ std::move (stride));
+ }
;

complexnum: exp ',' exp
@@ -356,193 +413,197 @@ complexnum: exp ',' exp
;

exp : '(' complexnum ')'
- { write_exp_elt_opcode (pstate, OP_COMPLEX);
- write_exp_elt_type (pstate,
- parse_f_type (pstate)
- ->builtin_complex_s16);
- write_exp_elt_opcode (pstate, OP_COMPLEX); }
+ {
+ operation_up rhs = pstate->pop ();
+ operation_up lhs = pstate->pop ();
+ pstate->push_new<complex_operation>
+ (std::move (lhs), std::move (rhs),
+ parse_f_type (pstate)->builtin_complex_s16);
+ }
;

exp : '(' type ')' exp %prec UNARY
- { write_exp_elt_opcode (pstate, UNOP_CAST);
- write_exp_elt_type (pstate, $2);
- write_exp_elt_opcode (pstate, UNOP_CAST); }
+ {
+ pstate->push_new<unop_cast_operation>
+ (pstate->pop (), $2);
+ }
;

exp : exp '%' name
- { write_exp_elt_opcode (pstate, STRUCTOP_STRUCT);
- write_exp_string (pstate, $3);
- write_exp_elt_opcode (pstate, STRUCTOP_STRUCT); }
+ {
+ pstate->push_new<structop_operation>
+ (pstate->pop (), copy_name ($3));
+ }
;

exp : exp '%' name COMPLETE
- { pstate->mark_struct_expression ();
- write_exp_elt_opcode (pstate, STRUCTOP_STRUCT);
- write_exp_string (pstate, $3);
- write_exp_elt_opcode (pstate, STRUCTOP_STRUCT); }
+ {
+ structop_base_operation *op
+ = new structop_operation (pstate->pop (),
+ copy_name ($3));
+ pstate->mark_struct_expression (op);
+ pstate->push (operation_up (op));
+ }
;

exp : exp '%' COMPLETE
- { struct stoken s;
- pstate->mark_struct_expression ();
- write_exp_elt_opcode (pstate, STRUCTOP_PTR);
- s.ptr = "";
- s.length = 0;
- write_exp_string (pstate, s);
- write_exp_elt_opcode (pstate, STRUCTOP_PTR); }
+ {
+ structop_base_operation *op
+ = new structop_operation (pstate->pop (), "");
+ pstate->mark_struct_expression (op);
+ pstate->push (operation_up (op));
+ }
+ ;

/* Binary operators in order of decreasing precedence. */

exp : exp '@' exp
- { write_exp_elt_opcode (pstate, BINOP_REPEAT); }
+ { pstate->wrap2<repeat_operation> (); }
;

exp : exp STARSTAR exp
- { write_exp_elt_opcode (pstate, BINOP_EXP); }
+ { pstate->wrap2<exp_operation> (); }
;

exp : exp '*' exp
- { write_exp_elt_opcode (pstate, BINOP_MUL); }
+ { pstate->wrap2<mul_operation> (); }
;

exp : exp '/' exp
- { write_exp_elt_opcode (pstate, BINOP_DIV); }
+ { pstate->wrap2<div_operation> (); }
;

exp : exp '+' exp
- { write_exp_elt_opcode (pstate, BINOP_ADD); }
+ { pstate->wrap2<add_operation> (); }
;

exp : exp '-' exp
- { write_exp_elt_opcode (pstate, BINOP_SUB); }
+ { pstate->wrap2<sub_operation> (); }
;

exp : exp LSH exp
- { write_exp_elt_opcode (pstate, BINOP_LSH); }
+ { pstate->wrap2<lsh_operation> (); }
;

exp : exp RSH exp
- { write_exp_elt_opcode (pstate, BINOP_RSH); }
+ { pstate->wrap2<rsh_operation> (); }
;

exp : exp EQUAL exp
- { write_exp_elt_opcode (pstate, BINOP_EQUAL); }
+ { pstate->wrap2<equal_operation> (); }
;

exp : exp NOTEQUAL exp
- { write_exp_elt_opcode (pstate, BINOP_NOTEQUAL); }
+ { pstate->wrap2<notequal_operation> (); }
;

exp : exp LEQ exp
- { write_exp_elt_opcode (pstate, BINOP_LEQ); }
+ { pstate->wrap2<leq_operation> (); }
;

exp : exp GEQ exp
- { write_exp_elt_opcode (pstate, BINOP_GEQ); }
+ { pstate->wrap2<geq_operation> (); }
;

exp : exp LESSTHAN exp
- { write_exp_elt_opcode (pstate, BINOP_LESS); }
+ { pstate->wrap2<less_operation> (); }
;

exp : exp GREATERTHAN exp
- { write_exp_elt_opcode (pstate, BINOP_GTR); }
+ { pstate->wrap2<gtr_operation> (); }
;

exp : exp '&' exp
- { write_exp_elt_opcode (pstate, BINOP_BITWISE_AND); }
+ { pstate->wrap2<bitwise_and_operation> (); }
;

exp : exp '^' exp
- { write_exp_elt_opcode (pstate, BINOP_BITWISE_XOR); }
+ { pstate->wrap2<bitwise_xor_operation> (); }
;

exp : exp '|' exp
- { write_exp_elt_opcode (pstate, BINOP_BITWISE_IOR); }
+ { pstate->wrap2<bitwise_ior_operation> (); }
;

exp : exp BOOL_AND exp
- { write_exp_elt_opcode (pstate, BINOP_LOGICAL_AND); }
+ { pstate->wrap2<logical_and_operation> (); }
;

exp : exp BOOL_OR exp
- { write_exp_elt_opcode (pstate, BINOP_LOGICAL_OR); }
+ { pstate->wrap2<logical_or_operation> (); }
;

exp : exp '=' exp
- { write_exp_elt_opcode (pstate, BINOP_ASSIGN); }
+ { pstate->wrap2<assign_operation> (); }
;

exp : exp ASSIGN_MODIFY exp
- { write_exp_elt_opcode (pstate, BINOP_ASSIGN_MODIFY);
- write_exp_elt_opcode (pstate, $2);
- write_exp_elt_opcode (pstate, BINOP_ASSIGN_MODIFY); }
+ {
+ operation_up rhs = pstate->pop ();
+ operation_up lhs = pstate->pop ();
+ pstate->push_new<assign_modify_operation>
+ ($2, std::move (lhs), std::move (rhs));
+ }
;

exp : INT
- { write_exp_elt_opcode (pstate, OP_LONG);
- write_exp_elt_type (pstate, $1.type);
- write_exp_elt_longcst (pstate, (LONGEST) ($1.val));
- write_exp_elt_opcode (pstate, OP_LONG); }
+ {
+ pstate->push_new<long_const_operation>
+ ($1.type, $1.val);
+ }
;

exp : NAME_OR_INT
{ YYSTYPE val;
parse_number (pstate, $1.stoken.ptr,
$1.stoken.length, 0, &val);
- write_exp_elt_opcode (pstate, OP_LONG);
- write_exp_elt_type (pstate, val.typed_val.type);
- write_exp_elt_longcst (pstate,
- (LONGEST)val.typed_val.val);
- write_exp_elt_opcode (pstate, OP_LONG); }
+ pstate->push_new<long_const_operation>
+ (val.typed_val.type,
+ val.typed_val.val);
+ }
;

exp : FLOAT
- { write_exp_elt_opcode (pstate, OP_FLOAT);
- write_exp_elt_type (pstate, $1.type);
- write_exp_elt_floatcst (pstate, $1.val);
- write_exp_elt_opcode (pstate, OP_FLOAT); }
+ {
+ float_data data;
+ std::copy (std::begin ($1.val), std::end ($1.val),
+ std::begin (data));
+ pstate->push_new<float_const_operation> ($1.type, data);
+ }
;

exp : variable
;

exp : DOLLAR_VARIABLE
- { write_dollar_variable (pstate, $1); }
+ { pstate->push_dollar ($1); }
;

exp : SIZEOF '(' type ')' %prec UNARY
- { write_exp_elt_opcode (pstate, OP_LONG);
- write_exp_elt_type (pstate,
- parse_f_type (pstate)
- ->builtin_integer);
+ {
$3 = check_typedef ($3);
- write_exp_elt_longcst (pstate,
- (LONGEST) TYPE_LENGTH ($3));
- write_exp_elt_opcode (pstate, OP_LONG); }
+ pstate->push_new<long_const_operation>
+ (parse_f_type (pstate)->builtin_integer,
+ TYPE_LENGTH ($3));
+ }
;

exp : BOOLEAN_LITERAL
- { write_exp_elt_opcode (pstate, OP_BOOL);
- write_exp_elt_longcst (pstate, (LONGEST) $1);
- write_exp_elt_opcode (pstate, OP_BOOL);
- }
+ { pstate->push_new<bool_operation> ($1); }
;

exp : STRING_LITERAL
{
- write_exp_elt_opcode (pstate, OP_STRING);
- write_exp_string (pstate, $1);
- write_exp_elt_opcode (pstate, OP_STRING);
+ pstate->push_new<string_operation>
+ (copy_name ($1));
}
;

variable: name_not_typename
{ struct block_symbol sym = $1.sym;
std::string name = copy_name ($1.stoken);
- write_exp_symbol_reference (pstate, name.c_str (),
- sym.symbol);
+ pstate->push_symbol (name.c_str (), sym.symbol);
}
;

@@ -1415,7 +1476,10 @@ f_language::parser (struct parser_state *par_state) const
scoped_restore restore_type_stack = make_scoped_restore (&type_stack,
&stack);

- return yyparse ();
+ int result = yyparse ();
+ if (!result)
+ pstate->set_operation (pstate->pop ());
+ return result;
}

static void
--
2.26.2