gdb: remove BLOCK_NAMESPACE macro
[binutils-gdb.git] / gdb / p-exp.y
index b025ac36070d9a88950305c5998c633a936fa223..ffa82f6e42c34f1b0006d259f31150e5856c4f21 100644 (file)
@@ -1,5 +1,5 @@
 /* YACC parser for Pascal expressions, for GDB.
-   Copyright (C) 2000-2021 Free Software Foundation, Inc.
+   Copyright (C) 2000-2022 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -55,6 +55,7 @@
 #include "objfiles.h" /* For have_full_symbols and have_partial_symbols.  */
 #include "block.h"
 #include "completer.h"
+#include "expop.h"
 
 #define parse_type(ps) builtin_type (ps->gdbarch ())
 
@@ -78,6 +79,8 @@ static int yylex (void);
 static void yyerror (const char *);
 
 static char *uptok (const char *, int);
+
+using namespace expr;
 %}
 
 /* Although the yacc "value" of an expression is not used,
@@ -203,44 +206,43 @@ normal_start      :
        ;
 
 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);
                          current_type = $1; } ;
 
 /* Expressions, including the comma operator.  */
 exp1   :       exp
        |       exp1 ',' exp
-                       { write_exp_elt_opcode (pstate, BINOP_COMMA); }
+                       { pstate->wrap2<comma_operation> (); }
        ;
 
 /* Expressions, not including the comma operator.  */
 exp    :       exp '^'   %prec UNARY
-                       { write_exp_elt_opcode (pstate, UNOP_IND);
+                       { pstate->wrap<unop_ind_operation> ();
                          if (current_type)
                            current_type = TYPE_TARGET_TYPE (current_type); }
        ;
 
 exp    :       '@' exp    %prec UNARY
-                       { write_exp_elt_opcode (pstate, UNOP_ADDR);
+                       { pstate->wrap<unop_addr_operation> ();
                          if (current_type)
                            current_type = TYPE_POINTER_TYPE (current_type); }
        ;
 
 exp    :       '-' exp    %prec UNARY
-                       { write_exp_elt_opcode (pstate, UNOP_NEG); }
+                       { pstate->wrap<unary_neg_operation> (); }
        ;
 
 exp    :       NOT exp    %prec UNARY
-                       { write_exp_elt_opcode (pstate, UNOP_LOGICAL_NOT); }
+                       { pstate->wrap<unary_logical_not_operation> (); }
        ;
 
 exp    :       INCREMENT '(' exp ')'   %prec UNARY
-                       { write_exp_elt_opcode (pstate, UNOP_PREINCREMENT); }
+                       { pstate->wrap<preinc_operation> (); }
        ;
 
 exp    :       DECREMENT  '(' exp ')'   %prec UNARY
-                       { write_exp_elt_opcode (pstate, UNOP_PREDECREMENT); }
+                       { pstate->wrap<predec_operation> (); }
        ;
 
 
@@ -249,9 +251,9 @@ field_exp   :       exp '.' %prec UNARY
        ;
 
 exp    :       field_exp FIELDNAME
-                       { write_exp_elt_opcode (pstate, STRUCTOP_STRUCT);
-                         write_exp_string (pstate, $2);
-                         write_exp_elt_opcode (pstate, STRUCTOP_STRUCT);
+                       {
+                         pstate->push_new<structop_operation>
+                           (pstate->pop (), copy_name ($2));
                          search_field = 0;
                          if (current_type)
                            {
@@ -267,9 +269,9 @@ exp :       field_exp FIELDNAME
 
 
 exp    :       field_exp name
-                       { write_exp_elt_opcode (pstate, STRUCTOP_STRUCT);
-                         write_exp_string (pstate, $2);
-                         write_exp_elt_opcode (pstate, STRUCTOP_STRUCT);
+                       {
+                         pstate->push_new<structop_operation>
+                           (pstate->pop (), copy_name ($2));
                          search_field = 0;
                          if (current_type)
                            {
@@ -283,19 +285,21 @@ exp       :       field_exp name
                        }
        ;
 exp    :       field_exp  name COMPLETE
-                       { pstate->mark_struct_expression ();
-                         write_exp_elt_opcode (pstate, STRUCTOP_STRUCT);
-                         write_exp_string (pstate, $2);
-                         write_exp_elt_opcode (pstate, STRUCTOP_STRUCT); }
+                       {
+                         structop_base_operation *op
+                           = new structop_ptr_operation (pstate->pop (),
+                                                         copy_name ($2));
+                         pstate->mark_struct_expression (op);
+                         pstate->push (operation_up (op));
+                       }
        ;
 exp    :       field_exp COMPLETE
-                       { struct stoken s;
-                         pstate->mark_struct_expression ();
-                         write_exp_elt_opcode (pstate, STRUCTOP_STRUCT);
-                         s.ptr = "";
-                         s.length = 0;
-                         write_exp_string (pstate, s);
-                         write_exp_elt_opcode (pstate, STRUCTOP_STRUCT); }
+                       {
+                         structop_base_operation *op
+                           = new structop_ptr_operation (pstate->pop (), "");
+                         pstate->mark_struct_expression (op);
+                         pstate->push (operation_up (op));
+                       }
        ;
 
 exp    :       exp '['
@@ -306,24 +310,16 @@ exp       :       exp '['
                                                     NULL, NULL, &arrayname);
                          if (arrayfieldindex)
                            {
-                             struct stoken stringsval;
-                             char *buf;
-
-                             buf = (char *) alloca (strlen (arrayname) + 1);
-                             stringsval.ptr = buf;
-                             stringsval.length = strlen (arrayname);
-                             strcpy (buf, arrayname);
                              current_type
                                = (current_type
                                   ->field (arrayfieldindex - 1).type ());
-                             write_exp_elt_opcode (pstate, STRUCTOP_STRUCT);
-                             write_exp_string (pstate, stringsval);
-                             write_exp_elt_opcode (pstate, STRUCTOP_STRUCT);
+                             pstate->push_new<structop_operation>
+                               (pstate->pop (), arrayname);
                            }
                          push_current_type ();  }
                exp1 ']'
                        { pop_current_type ();
-                         write_exp_elt_opcode (pstate, BINOP_SUBSCRIPT);
+                         pstate->wrap2<subscript_operation> ();
                          if (current_type)
                            current_type = TYPE_TARGET_TYPE (current_type); }
        ;
@@ -334,10 +330,11 @@ exp       :       exp '('
                        { push_current_type ();
                          pstate->start_arglist (); }
                arglist ')'     %prec ARROW
-                       { write_exp_elt_opcode (pstate, OP_FUNCALL);
-                         write_exp_elt_longcst (pstate,
-                                                pstate->end_arglist ());
-                         write_exp_elt_opcode (pstate, OP_FUNCALL);
+                       {
+                         std::vector<operation_up> args
+                           = pstate->pop_vector (pstate->end_arglist ());
+                         pstate->push_new<funcall_operation>
+                           (pstate->pop (), std::move (args));
                          pop_current_type ();
                          if (current_type)
                            current_type = TYPE_TARGET_TYPE (current_type);
@@ -358,11 +355,10 @@ exp       :       type '(' exp ')' %prec UNARY
                              if ((current_type->code () == TYPE_CODE_PTR)
                                  && (TYPE_TARGET_TYPE (current_type)->code () == TYPE_CODE_STRUCT)
                                  && (($1)->code () == TYPE_CODE_STRUCT))
-                               write_exp_elt_opcode (pstate, UNOP_IND);
+                               pstate->wrap<unop_ind_operation> ();
                            }
-                         write_exp_elt_opcode (pstate, UNOP_CAST);
-                         write_exp_elt_type (pstate, $1);
-                         write_exp_elt_opcode (pstate, UNOP_CAST);
+                         pstate->push_new<unop_cast_operation>
+                           (pstate->pop (), $1);
                          current_type = $1; }
        ;
 
@@ -373,7 +369,7 @@ exp :       '(' exp1 ')'
 /* Binary operators in order of decreasing precedence.  */
 
 exp    :       exp '*' exp
-                       { write_exp_elt_opcode (pstate, BINOP_MUL); }
+                       { pstate->wrap2<mul_operation> (); }
        ;
 
 exp    :       exp '/' {
@@ -385,138 +381,141 @@ exp     :       exp '/' {
                          if (leftdiv_is_integer && current_type
                              && is_integral_type (current_type))
                            {
-                             write_exp_elt_opcode (pstate, UNOP_CAST);
-                             write_exp_elt_type (pstate,
-                                                 parse_type (pstate)
-                                                 ->builtin_long_double);
+                             pstate->push_new<unop_cast_operation>
+                               (pstate->pop (),
+                                parse_type (pstate)->builtin_long_double);
                              current_type
                                = parse_type (pstate)->builtin_long_double;
-                             write_exp_elt_opcode (pstate, UNOP_CAST);
                              leftdiv_is_integer = 0;
                            }
 
-                         write_exp_elt_opcode (pstate, BINOP_DIV);
+                         pstate->wrap2<div_operation> ();
                        }
        ;
 
 exp    :       exp DIV exp
-                       { write_exp_elt_opcode (pstate, BINOP_INTDIV); }
+                       { pstate->wrap2<intdiv_operation> (); }
        ;
 
 exp    :       exp MOD exp
-                       { write_exp_elt_opcode (pstate, BINOP_REM); }
+                       { pstate->wrap2<rem_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 '=' exp
-                       { write_exp_elt_opcode (pstate, BINOP_EQUAL);
+                       {
+                         pstate->wrap2<equal_operation> ();
                          current_type = parse_type (pstate)->builtin_bool;
                        }
        ;
 
 exp    :       exp NOTEQUAL exp
-                       { write_exp_elt_opcode (pstate, BINOP_NOTEQUAL);
+                       {
+                         pstate->wrap2<notequal_operation> ();
                          current_type = parse_type (pstate)->builtin_bool;
                        }
        ;
 
 exp    :       exp LEQ exp
-                       { write_exp_elt_opcode (pstate, BINOP_LEQ);
+                       {
+                         pstate->wrap2<leq_operation> ();
                          current_type = parse_type (pstate)->builtin_bool;
                        }
        ;
 
 exp    :       exp GEQ exp
-                       { write_exp_elt_opcode (pstate, BINOP_GEQ);
+                       {
+                         pstate->wrap2<geq_operation> ();
                          current_type = parse_type (pstate)->builtin_bool;
                        }
        ;
 
 exp    :       exp '<' exp
-                       { write_exp_elt_opcode (pstate, BINOP_LESS);
+                       {
+                         pstate->wrap2<less_operation> ();
                          current_type = parse_type (pstate)->builtin_bool;
                        }
        ;
 
 exp    :       exp '>' exp
-                       { write_exp_elt_opcode (pstate, BINOP_GTR);
+                       {
+                         pstate->wrap2<gtr_operation> ();
                          current_type = parse_type (pstate)->builtin_bool;
                        }
        ;
 
 exp    :       exp ANDAND exp
-                       { write_exp_elt_opcode (pstate, BINOP_BITWISE_AND); }
+                       { pstate->wrap2<bitwise_and_operation> (); }
        ;
 
 exp    :       exp XOR exp
-                       { write_exp_elt_opcode (pstate, BINOP_BITWISE_XOR); }
+                       { pstate->wrap2<bitwise_xor_operation> (); }
        ;
 
 exp    :       exp OR exp
-                       { write_exp_elt_opcode (pstate, BINOP_BITWISE_IOR); }
+                       { pstate->wrap2<bitwise_ior_operation> (); }
        ;
 
 exp    :       exp ASSIGN exp
-                       { write_exp_elt_opcode (pstate, BINOP_ASSIGN); }
+                       { pstate->wrap2<assign_operation> (); }
        ;
 
 exp    :       TRUEKEYWORD
-                       { write_exp_elt_opcode (pstate, OP_BOOL);
-                         write_exp_elt_longcst (pstate, (LONGEST) $1);
+                       {
+                         pstate->push_new<bool_operation> ($1);
                          current_type = parse_type (pstate)->builtin_bool;
-                         write_exp_elt_opcode (pstate, OP_BOOL); }
+                       }
        ;
 
 exp    :       FALSEKEYWORD
-                       { write_exp_elt_opcode (pstate, OP_BOOL);
-                         write_exp_elt_longcst (pstate, (LONGEST) $1);
+                       {
+                         pstate->push_new<bool_operation> ($1);
                          current_type = parse_type (pstate)->builtin_bool;
-                         write_exp_elt_opcode (pstate, OP_BOOL); }
+                       }
        ;
 
 exp    :       INT
-                       { write_exp_elt_opcode (pstate, OP_LONG);
-                         write_exp_elt_type (pstate, $1.type);
+                       {
+                         pstate->push_new<long_const_operation>
+                           ($1.type, $1.val);
                          current_type = $1.type;
-                         write_exp_elt_longcst (pstate, (LONGEST)($1.val));
-                         write_exp_elt_opcode (pstate, OP_LONG); }
+                       }
        ;
 
 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_int.type);
+                         pstate->push_new<long_const_operation>
+                           (val.typed_val_int.type,
+                            val.typed_val_int.val);
                          current_type = val.typed_val_int.type;
-                         write_exp_elt_longcst (pstate, (LONGEST)
-                                                val.typed_val_int.val);
-                         write_exp_elt_opcode (pstate, OP_LONG);
                        }
        ;
 
 
 exp    :       FLOAT
-                       { write_exp_elt_opcode (pstate, OP_FLOAT);
-                         write_exp_elt_type (pstate, $1.type);
-                         current_type = $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
@@ -524,7 +523,7 @@ exp :       variable
 
 exp    :       DOLLAR_VARIABLE
                        {
-                         write_dollar_variable (pstate, $1);
+                         pstate->push_dollar ($1);
 
                          /* $ is the normal prefix for pascal
                             hexadecimal values but this conflicts
@@ -549,18 +548,16 @@ exp       :       DOLLAR_VARIABLE
        ;
 
 exp    :       SIZEOF '(' type ')'     %prec UNARY
-                       { write_exp_elt_opcode (pstate, OP_LONG);
-                         write_exp_elt_type (pstate,
-                                           parse_type (pstate)->builtin_int);
+                       {
                          current_type = parse_type (pstate)->builtin_int;
                          $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_type (pstate)->builtin_int,
+                            TYPE_LENGTH ($3)); }
        ;
 
 exp    :       SIZEOF  '(' exp ')'      %prec UNARY
-                       { write_exp_elt_opcode (pstate, UNOP_SIZEOF);
+                       { pstate->wrap<unop_sizeof_operation> ();
                          current_type = parse_type (pstate)->builtin_int; }
 
 exp    :       STRING
@@ -571,27 +568,17 @@ exp       :       STRING
                             string.  */
                          const char *sp = $1.ptr; int count = $1.length;
 
-                         while (count-- > 0)
-                           {
-                             write_exp_elt_opcode (pstate, OP_LONG);
-                             write_exp_elt_type (pstate,
-                                                 parse_type (pstate)
-                                                 ->builtin_char);
-                             write_exp_elt_longcst (pstate,
-                                                    (LONGEST) (*sp++));
-                             write_exp_elt_opcode (pstate, OP_LONG);
-                           }
-                         write_exp_elt_opcode (pstate, OP_LONG);
-                         write_exp_elt_type (pstate,
-                                             parse_type (pstate)
-                                             ->builtin_char);
-                         write_exp_elt_longcst (pstate, (LONGEST)'\0');
-                         write_exp_elt_opcode (pstate, OP_LONG);
-                         write_exp_elt_opcode (pstate, OP_ARRAY);
-                         write_exp_elt_longcst (pstate, (LONGEST) 0);
-                         write_exp_elt_longcst (pstate,
-                                                (LONGEST) ($1.length));
-                         write_exp_elt_opcode (pstate, OP_ARRAY); }
+                         std::vector<operation_up> args (count + 1);
+                         for (int i = 0; i < count; ++i)
+                           args[i] = (make_operation<long_const_operation>
+                                      (parse_type (pstate)->builtin_char,
+                                       *sp++));
+                         args[count] = (make_operation<long_const_operation>
+                                        (parse_type (pstate)->builtin_char,
+                                         '\0'));
+                         pstate->push_new<array_operation>
+                           (0, $1.length, std::move (args));
+                       }
        ;
 
 /* Object pascal  */
@@ -599,8 +586,7 @@ exp :       THIS
                        {
                          struct value * this_val;
                          struct type * this_type;
-                         write_exp_elt_opcode (pstate, OP_THIS);
-                         write_exp_elt_opcode (pstate, OP_THIS);
+                         pstate->push_new<op_this_operation> ();
                          /* We need type of this.  */
                          this_val
                            = value_of_this_silent (pstate->language ());
@@ -613,7 +599,7 @@ exp :       THIS
                              if (this_type->code () == TYPE_CODE_PTR)
                                {
                                  this_type = TYPE_TARGET_TYPE (this_type);
-                                 write_exp_elt_opcode (pstate, UNOP_IND);
+                                 pstate->wrap<unop_ind_operation> ();
                                }
                            }
 
@@ -626,15 +612,16 @@ exp       :       THIS
 block  :       BLOCKNAME
                        {
                          if ($1.sym.symbol != 0)
-                             $$ = SYMBOL_BLOCK_VALUE ($1.sym.symbol);
+                             $$ = $1.sym.symbol->value_block ();
                          else
                            {
                              std::string copy = copy_name ($1.stoken);
                              struct symtab *tem =
                                  lookup_symtab (copy.c_str ());
                              if (tem)
-                               $$ = BLOCKVECTOR_BLOCK (SYMTAB_BLOCKVECTOR (tem),
-                                                       STATIC_BLOCK);
+                               $$ = BLOCKVECTOR_BLOCK
+                                 (tem->compunit ()->blockvector (),
+                                  STATIC_BLOCK);
                              else
                                error (_("No file or function \"%s\"."),
                                       copy.c_str ());
@@ -649,10 +636,10 @@ block     :       block COLONCOLON name
                            = lookup_symbol (copy.c_str (), $1,
                                             VAR_DOMAIN, NULL).symbol;
 
-                         if (!tem || SYMBOL_CLASS (tem) != LOC_BLOCK)
+                         if (!tem || tem->aclass () != LOC_BLOCK)
                            error (_("No function \"%s\" in specified context."),
                                   copy.c_str ());
-                         $$ = SYMBOL_BLOCK_VALUE (tem); }
+                         $$ = tem->value_block (); }
        ;
 
 variable:      block COLONCOLON name
@@ -665,10 +652,8 @@ variable:  block COLONCOLON name
                            error (_("No symbol \"%s\" in specified context."),
                                   copy.c_str ());
 
-                         write_exp_elt_opcode (pstate, OP_VAR_VALUE);
-                         write_exp_elt_block (pstate, sym.block);
-                         write_exp_elt_sym (pstate, sym.symbol);
-                         write_exp_elt_opcode (pstate, OP_VAR_VALUE); }
+                         pstate->push_new<var_value_operation> (sym);
+                       }
        ;
 
 qualified_name:        typebase COLONCOLON name
@@ -680,10 +665,8 @@ qualified_name:    typebase COLONCOLON name
                            error (_("`%s' is not defined as an aggregate type."),
                                   type->name ());
 
-                         write_exp_elt_opcode (pstate, OP_SCOPE);
-                         write_exp_elt_type (pstate, type);
-                         write_exp_string (pstate, $3);
-                         write_exp_elt_opcode (pstate, OP_SCOPE);
+                         pstate->push_new<scope_operation>
+                           (type, copy_name ($3));
                        }
        ;
 
@@ -695,8 +678,7 @@ variable:   qualified_name
                          struct block_symbol sym
                            = lookup_symbol (name.c_str (), nullptr,
                                             VAR_DOMAIN, nullptr);
-                         write_exp_symbol_reference (pstate, name.c_str (),
-                                                     sym);
+                         pstate->push_symbol (name.c_str (), sym);
                        }
        ;
 
@@ -708,11 +690,8 @@ variable:  name_not_typename
                              if (symbol_read_needs_frame (sym.symbol))
                                pstate->block_tracker->update (sym);
 
-                             write_exp_elt_opcode (pstate, OP_VAR_VALUE);
-                             write_exp_elt_block (pstate, sym.block);
-                             write_exp_elt_sym (pstate, sym.symbol);
-                             write_exp_elt_opcode (pstate, OP_VAR_VALUE);
-                             current_type = sym.symbol->type; }
+                             pstate->push_new<var_value_operation> (sym);
+                             current_type = sym.symbol->type (); }
                          else if ($1.is_a_field_of_this)
                            {
                              struct value * this_val;
@@ -721,11 +700,10 @@ variable: name_not_typename
                                 not inadvertently convert from a method call
                                 to data ref.  */
                              pstate->block_tracker->update (sym);
-                             write_exp_elt_opcode (pstate, OP_THIS);
-                             write_exp_elt_opcode (pstate, OP_THIS);
-                             write_exp_elt_opcode (pstate, STRUCTOP_PTR);
-                             write_exp_string (pstate, $1.stoken);
-                             write_exp_elt_opcode (pstate, STRUCTOP_PTR);
+                             operation_up thisop
+                               = make_operation<op_this_operation> ();
+                             pstate->push_new<structop_operation>
+                               (std::move (thisop), copy_name ($1.stoken));
                              /* We need type of this.  */
                              this_val
                                = value_of_this_silent (pstate->language ());
@@ -748,7 +726,8 @@ variable:   name_not_typename
                              msymbol =
                                lookup_bound_minimal_symbol (arg.c_str ());
                              if (msymbol.minsym != NULL)
-                               write_exp_msymbol (pstate, msymbol);
+                               pstate->push_new<var_msym_value_operation>
+                                 (msymbol);
                              else if (!have_full_symbols ()
                                       && !have_partial_symbols ())
                                error (_("No symbol table is loaded.  "
@@ -824,10 +803,8 @@ static int
 parse_number (struct parser_state *par_state,
              const char *p, int len, int parsed_float, YYSTYPE *putithere)
 {
-  /* FIXME: Shouldn't these be unsigned?  We don't deal with negative values
-     here, and we do kind of silly things like cast to unsigned.  */
-  LONGEST n = 0;
-  LONGEST prevn = 0;
+  ULONGEST n = 0;
+  ULONGEST prevn = 0;
   ULONGEST un;
 
   int i = 0;
@@ -876,7 +853,7 @@ parse_number (struct parser_state *par_state,
     }
 
   /* Handle base-switching prefixes 0x, 0t, 0d, 0.  */
-  if (p[0] == '0')
+  if (p[0] == '0' && len > 1)
     switch (p[1])
       {
       case 'x':
@@ -954,7 +931,7 @@ parse_number (struct parser_state *par_state,
         on 0x123456789 when LONGEST is 32 bits.  */
       if (c != 'l' && c != 'u' && n != 0)
        {
-         if ((unsigned_p && (ULONGEST) prevn >= (ULONGEST) n))
+         if (unsigned_p && prevn >= n)
            error (_("Numeric constant too large."));
        }
       prevn = n;
@@ -972,7 +949,7 @@ parse_number (struct parser_state *par_state,
      the case where it is we just always shift the value more than
      once, with fewer bits each time.  */
 
-  un = (ULONGEST)n >> 2;
+  un = n >> 2;
   if (long_p == 0
       && (un >> (gdbarch_int_bit (par_state->gdbarch ()) - 2)) == 0)
     {
@@ -1068,25 +1045,25 @@ struct token
 
 static const struct token tokentab3[] =
   {
-    {"shr", RSH, BINOP_END},
-    {"shl", LSH, BINOP_END},
-    {"and", ANDAND, BINOP_END},
-    {"div", DIV, BINOP_END},
-    {"not", NOT, BINOP_END},
-    {"mod", MOD, BINOP_END},
-    {"inc", INCREMENT, BINOP_END},
-    {"dec", DECREMENT, BINOP_END},
-    {"xor", XOR, BINOP_END}
+    {"shr", RSH, OP_NULL},
+    {"shl", LSH, OP_NULL},
+    {"and", ANDAND, OP_NULL},
+    {"div", DIV, OP_NULL},
+    {"not", NOT, OP_NULL},
+    {"mod", MOD, OP_NULL},
+    {"inc", INCREMENT, OP_NULL},
+    {"dec", DECREMENT, OP_NULL},
+    {"xor", XOR, OP_NULL}
   };
 
 static const struct token tokentab2[] =
   {
-    {"or", OR, BINOP_END},
-    {"<>", NOTEQUAL, BINOP_END},
-    {"<=", LEQ, BINOP_END},
-    {">=", GEQ, BINOP_END},
-    {":=", ASSIGN, BINOP_END},
-    {"::", COLONCOLON, BINOP_END} };
+    {"or", OR, OP_NULL},
+    {"<>", NOTEQUAL, OP_NULL},
+    {"<=", LEQ, OP_NULL},
+    {">=", GEQ, OP_NULL},
+    {":=", ASSIGN, OP_NULL},
+    {"::", COLONCOLON, OP_NULL} };
 
 /* Allocate uppercased var: */
 /* make an uppercased copy of tokstart.  */
@@ -1129,28 +1106,28 @@ yylex (void)
 
   /* See if it is a special token of length 3.  */
   if (explen > 2)
-    for (int i = 0; i < sizeof (tokentab3) / sizeof (tokentab3[0]); i++)
-      if (strncasecmp (tokstart, tokentab3[i].oper, 3) == 0
-         && (!isalpha (tokentab3[i].oper[0]) || explen == 3
+    for (const auto &token : tokentab3)
+      if (strncasecmp (tokstart, token.oper, 3) == 0
+         && (!isalpha (token.oper[0]) || explen == 3
              || (!isalpha (tokstart[3])
                  && !isdigit (tokstart[3]) && tokstart[3] != '_')))
        {
          pstate->lexptr += 3;
-         yylval.opcode = tokentab3[i].opcode;
-         return tokentab3[i].token;
+         yylval.opcode = token.opcode;
+         return token.token;
        }
 
   /* See if it is a special token of length 2.  */
   if (explen > 1)
-  for (int i = 0; i < sizeof (tokentab2) / sizeof (tokentab2[0]); i++)
-      if (strncasecmp (tokstart, tokentab2[i].oper, 2) == 0
-         && (!isalpha (tokentab2[i].oper[0]) || explen == 2
+    for (const auto &token : tokentab2)
+      if (strncasecmp (tokstart, token.oper, 2) == 0
+         && (!isalpha (token.oper[0]) || explen == 2
              || (!isalpha (tokstart[2])
                  && !isdigit (tokstart[2]) && tokstart[2] != '_')))
        {
          pstate->lexptr += 2;
-         yylval.opcode = tokentab2[i].opcode;
-         return tokentab2[i].token;
+         yylval.opcode = token.opcode;
+         return token.token;
        }
 
   switch (c = *tokstart)
@@ -1566,7 +1543,7 @@ yylex (void)
     /* Call lookup_symtab, not lookup_partial_symtab, in case there are
        no psymtabs (coff, xcoff, or some future change to blow away the
        psymtabs once once symbols are read).  */
-    if ((sym && SYMBOL_CLASS (sym) == LOC_BLOCK)
+    if ((sym && sym->aclass () == LOC_BLOCK)
        || lookup_symtab (tmp.c_str ()))
       {
        yylval.ssym.sym.symbol = sym;
@@ -1575,7 +1552,7 @@ yylex (void)
        free (uptokstart);
        return BLOCKNAME;
       }
-    if (sym && SYMBOL_CLASS (sym) == LOC_TYPEDEF)
+    if (sym && sym->aclass () == LOC_TYPEDEF)
        {
 #if 1
          /* Despite the following flaw, we need to keep this code enabled.
@@ -1644,7 +1621,7 @@ yylex (void)
                                         VAR_DOMAIN, NULL).symbol;
                      if (cur_sym)
                        {
-                         if (SYMBOL_CLASS (cur_sym) == LOC_TYPEDEF)
+                         if (cur_sym->aclass () == LOC_TYPEDEF)
                            {
                              best_sym = cur_sym;
                              pstate->lexptr = p;
@@ -1662,9 +1639,9 @@ yylex (void)
                break;
            }
 
-         yylval.tsym.type = SYMBOL_TYPE (best_sym);
+         yylval.tsym.type = best_sym->type ();
 #else /* not 0 */
-         yylval.tsym.type = SYMBOL_TYPE (sym);
+         yylval.tsym.type = sym->type ();
 #endif /* not 0 */
          free (uptokstart);
          return TYPENAME;
@@ -1716,7 +1693,10 @@ pascal_language::parser (struct parser_state *par_state) const
   pstate = par_state;
   paren_depth = 0;
 
-  return yyparse ();
+  int result = yyparse ();
+  if (!result)
+    pstate->set_operation (pstate->pop ());
+  return result;
 }
 
 static void