PR 17819: Fix --build-id=tree when using --compress-debug-sections.
[deliverable/binutils-gdb.git] / gdb / m2-exp.y
index 201ba8223993451d5c6f2923dec1c051bcaf60f9..933fa7d98d8a0219e1889b54c6bbd8b44b39c90d 100644 (file)
@@ -1,25 +1,22 @@
 /* YACC grammar for Modula-2 expressions, for GDB.
-   Copyright (C) 1986, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1999,
-   2000, 2007 Free Software Foundation, Inc.
+   Copyright (C) 1986-2015 Free Software Foundation, Inc.
    Generated from expread.y (now c-exp.y) and contributed by the Department
    of Computer Science at the State University of New York at Buffalo, 1991.
 
-This file is part of GDB.
+   This file is part of GDB.
 
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.  */
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Parse a Modula-2 expression from text in a string,
    and return the result as a  struct expression  pointer.
@@ -36,12 +33,11 @@ Boston, MA 02110-1301, USA.  */
    generator.  Doing this with #defines and trying to control the interaction
    with include files (<malloc.h> and <stdlib.h> for example) just became
    too messy, particularly when such includes can be inserted at random
-   times by the parser generator. */
+   times by the parser generator.  */
    
 %{
 
 #include "defs.h"
-#include "gdb_string.h"
 #include "expression.h"
 #include "language.h"
 #include "value.h"
@@ -52,15 +48,18 @@ Boston, MA 02110-1301, USA.  */
 #include "objfiles.h" /* For have_full_symbols and have_partial_symbols */
 #include "block.h"
 
+#define parse_type(ps) builtin_type (parse_gdbarch (ps))
+#define parse_m2_type(ps) builtin_m2_type (parse_gdbarch (ps))
+
 /* Remap normal yacc parser interface names (yyparse, yylex, yyerror, etc),
    as well as gratuitiously global symbol names, so we can have multiple
    yacc generated parsers in gdb.  Note that these are only the variables
    produced by yacc.  If other parser generators (bison, byacc, etc) produce
    additional global names that conflict at link time, then those parser
-   generators need to be fixed instead of adding those names to this list. */
+   generators need to be fixed instead of adding those names to this list.  */
 
 #define        yymaxdepth m2_maxdepth
-#define        yyparse m2_parse
+#define        yyparse m2_parse_internal
 #define        yylex   m2_lex
 #define        yyerror m2_error
 #define        yylval  m2_lval
@@ -99,6 +98,12 @@ Boston, MA 02110-1301, USA.  */
 #define yygindex m2_yygindex
 #define yytable         m2_yytable
 #define yycheck         m2_yycheck
+#define yyss   m2_yyss
+#define yysslim        m2_yysslim
+#define yyssp  m2_yyssp
+#define yystacksize m2_yystacksize
+#define yyvs   m2_yyvs
+#define yyvsp  m2_yyvsp
 
 #ifndef YYDEBUG
 #define        YYDEBUG 1               /* Default to yydebug support */
@@ -106,27 +111,22 @@ Boston, MA 02110-1301, USA.  */
 
 #define YYFPRINTF parser_fprintf
 
+/* The state of the parser, used internally when we are parsing the
+   expression.  */
+
+static struct parser_state *pstate = NULL;
+
 int yyparse (void);
 
 static int yylex (void);
 
 void yyerror (char *);
 
-#if 0
-static char *make_qualname (char *, char *);
-#endif
-
 static int parse_number (int);
 
-/* The sign of the number being parsed. */
+/* The sign of the number being parsed.  */
 static int number_sign = 1;
 
-/* The block that the module specified by the qualifer on an identifer is
-   contained in, */
-#if 0
-static struct block *modblock=0;
-#endif
-
 %}
 
 /* Although the yacc "value" of an expression is not used,
@@ -142,7 +142,7 @@ static struct block *modblock=0;
     struct type *tval;
     struct stoken sval;
     int voidval;
-    struct block *bval;
+    const struct block *bval;
     enum exp_opcode opcode;
     struct internalvar *ivar;
 
@@ -174,6 +174,7 @@ static struct block *modblock=0;
 %token <sval> TYPENAME
 
 %token SIZE CAP ORD HIGH ABS MIN_FUNC MAX_FUNC FLOAT_FUNC VAL CHR ODD TRUNC
+%token TSIZE
 %token INC DEC INCL EXCL
 
 /* The GDB scope operator */
@@ -207,31 +208,31 @@ start   : exp
        ;
 
 type_exp:      type
-               { write_exp_elt_opcode(OP_TYPE);
-                 write_exp_elt_type($1);
-                 write_exp_elt_opcode(OP_TYPE);
+               { write_exp_elt_opcode (pstate, OP_TYPE);
+                 write_exp_elt_type (pstate, $1);
+                 write_exp_elt_opcode (pstate, OP_TYPE);
                }
        ;
 
 /* Expressions */
 
 exp     :       exp '^'   %prec UNARY
-                        { write_exp_elt_opcode (UNOP_IND); }
+                        { write_exp_elt_opcode (pstate, UNOP_IND); }
        ;
 
 exp    :       '-'
                        { number_sign = -1; }
                exp    %prec UNARY
                        { number_sign = 1;
-                         write_exp_elt_opcode (UNOP_NEG); }
+                         write_exp_elt_opcode (pstate, UNOP_NEG); }
        ;
 
 exp    :       '+' exp    %prec UNARY
-               { write_exp_elt_opcode(UNOP_PLUS); }
+               { write_exp_elt_opcode (pstate, UNOP_PLUS); }
        ;
 
 exp    :       not_exp exp %prec UNARY
-                       { write_exp_elt_opcode (UNOP_LOGICAL_NOT); }
+                       { write_exp_elt_opcode (pstate, UNOP_LOGICAL_NOT); }
        ;
 
 not_exp        :       NOT
@@ -239,105 +240,111 @@ not_exp :       NOT
        ;
 
 exp    :       CAP '(' exp ')'
-                       { write_exp_elt_opcode (UNOP_CAP); }
+                       { write_exp_elt_opcode (pstate, UNOP_CAP); }
        ;
 
 exp    :       ORD '(' exp ')'
-                       { write_exp_elt_opcode (UNOP_ORD); }
+                       { write_exp_elt_opcode (pstate, UNOP_ORD); }
        ;
 
 exp    :       ABS '(' exp ')'
-                       { write_exp_elt_opcode (UNOP_ABS); }
+                       { write_exp_elt_opcode (pstate, UNOP_ABS); }
        ;
 
 exp    :       HIGH '(' exp ')'
-                       { write_exp_elt_opcode (UNOP_HIGH); }
+                       { write_exp_elt_opcode (pstate, UNOP_HIGH); }
        ;
 
 exp    :       MIN_FUNC '(' type ')'
-                       { write_exp_elt_opcode (UNOP_MIN);
-                         write_exp_elt_type ($3);
-                         write_exp_elt_opcode (UNOP_MIN); }
+                       { write_exp_elt_opcode (pstate, UNOP_MIN);
+                         write_exp_elt_type (pstate, $3);
+                         write_exp_elt_opcode (pstate, UNOP_MIN); }
        ;
 
 exp    :       MAX_FUNC '(' type ')'
-                       { write_exp_elt_opcode (UNOP_MAX);
-                         write_exp_elt_type ($3);
-                         write_exp_elt_opcode (UNOP_MIN); }
+                       { write_exp_elt_opcode (pstate, UNOP_MAX);
+                         write_exp_elt_type (pstate, $3);
+                         write_exp_elt_opcode (pstate, UNOP_MAX); }
        ;
 
 exp    :       FLOAT_FUNC '(' exp ')'
-                       { write_exp_elt_opcode (UNOP_FLOAT); }
+                       { write_exp_elt_opcode (pstate, UNOP_FLOAT); }
        ;
 
 exp    :       VAL '(' type ',' exp ')'
-                       { write_exp_elt_opcode (BINOP_VAL);
-                         write_exp_elt_type ($3);
-                         write_exp_elt_opcode (BINOP_VAL); }
+                       { write_exp_elt_opcode (pstate, BINOP_VAL);
+                         write_exp_elt_type (pstate, $3);
+                         write_exp_elt_opcode (pstate, BINOP_VAL); }
        ;
 
 exp    :       CHR '(' exp ')'
-                       { write_exp_elt_opcode (UNOP_CHR); }
+                       { write_exp_elt_opcode (pstate, UNOP_CHR); }
        ;
 
 exp    :       ODD '(' exp ')'
-                       { write_exp_elt_opcode (UNOP_ODD); }
+                       { write_exp_elt_opcode (pstate, UNOP_ODD); }
        ;
 
 exp    :       TRUNC '(' exp ')'
-                       { write_exp_elt_opcode (UNOP_TRUNC); }
+                       { write_exp_elt_opcode (pstate, UNOP_TRUNC); }
+       ;
+
+exp    :       TSIZE '(' exp ')'
+                       { write_exp_elt_opcode (pstate, UNOP_SIZEOF); }
        ;
 
 exp    :       SIZE exp       %prec UNARY
-                       { write_exp_elt_opcode (UNOP_SIZEOF); }
+                       { write_exp_elt_opcode (pstate, UNOP_SIZEOF); }
        ;
 
 
 exp    :       INC '(' exp ')'
-                       { write_exp_elt_opcode(UNOP_PREINCREMENT); }
+                       { write_exp_elt_opcode (pstate, UNOP_PREINCREMENT); }
        ;
 
 exp    :       INC '(' exp ',' exp ')'
-                       { write_exp_elt_opcode(BINOP_ASSIGN_MODIFY);
-                         write_exp_elt_opcode(BINOP_ADD);
-                         write_exp_elt_opcode(BINOP_ASSIGN_MODIFY); }
+                       { write_exp_elt_opcode (pstate, BINOP_ASSIGN_MODIFY);
+                         write_exp_elt_opcode (pstate, BINOP_ADD);
+                         write_exp_elt_opcode (pstate,
+                                               BINOP_ASSIGN_MODIFY); }
        ;
 
 exp    :       DEC '(' exp ')'
-                       { write_exp_elt_opcode(UNOP_PREDECREMENT);}
+                       { write_exp_elt_opcode (pstate, UNOP_PREDECREMENT);}
        ;
 
 exp    :       DEC '(' exp ',' exp ')'
-                       { write_exp_elt_opcode(BINOP_ASSIGN_MODIFY);
-                         write_exp_elt_opcode(BINOP_SUB);
-                         write_exp_elt_opcode(BINOP_ASSIGN_MODIFY); }
+                       { write_exp_elt_opcode (pstate, BINOP_ASSIGN_MODIFY);
+                         write_exp_elt_opcode (pstate, BINOP_SUB);
+                         write_exp_elt_opcode (pstate,
+                                               BINOP_ASSIGN_MODIFY); }
        ;
 
 exp    :       exp DOT NAME
-                       { write_exp_elt_opcode (STRUCTOP_STRUCT);
-                         write_exp_string ($3);
-                         write_exp_elt_opcode (STRUCTOP_STRUCT); }
+                       { write_exp_elt_opcode (pstate, STRUCTOP_STRUCT);
+                         write_exp_string (pstate, $3);
+                         write_exp_elt_opcode (pstate, STRUCTOP_STRUCT); }
        ;
 
 exp    :       set
        ;
 
 exp    :       exp IN set
-                       { error("Sets are not implemented.");}
+                       { error (_("Sets are not implemented."));}
        ;
 
 exp    :       INCL '(' exp ',' exp ')'
-                       { error("Sets are not implemented.");}
+                       { error (_("Sets are not implemented."));}
        ;
 
 exp    :       EXCL '(' exp ',' exp ')'
-                       { error("Sets are not implemented.");}
+                       { error (_("Sets are not implemented."));}
        ;
 
 set    :       '{' arglist '}'
-                       { error("Sets are not implemented.");}
+                       { error (_("Sets are not implemented."));}
        |       type '{' arglist '}'
-                       { error("Sets are not implemented.");}
+                       { error (_("Sets are not implemented."));}
        ;
 
 
@@ -348,19 +355,25 @@ exp     :       exp '['
                           function types */
                         { start_arglist(); }
                 non_empty_arglist ']'  %prec DOT
-                        { write_exp_elt_opcode (MULTI_SUBSCRIPT);
-                         write_exp_elt_longcst ((LONGEST) end_arglist());
-                         write_exp_elt_opcode (MULTI_SUBSCRIPT); }
+                        { write_exp_elt_opcode (pstate, MULTI_SUBSCRIPT);
+                         write_exp_elt_longcst (pstate,
+                                                (LONGEST) end_arglist());
+                         write_exp_elt_opcode (pstate, MULTI_SUBSCRIPT); }
         ;
 
+exp    :       exp '[' exp ']'
+                       { write_exp_elt_opcode (pstate, BINOP_SUBSCRIPT); }
+       ;
+
 exp    :       exp '('
                        /* This is to save the value of arglist_len
                           being accumulated by an outer function call.  */
                        { start_arglist (); }
                arglist ')'     %prec DOT
-                       { write_exp_elt_opcode (OP_FUNCALL);
-                         write_exp_elt_longcst ((LONGEST) end_arglist ());
-                         write_exp_elt_opcode (OP_FUNCALL); }
+                       { write_exp_elt_opcode (pstate, OP_FUNCALL);
+                         write_exp_elt_longcst (pstate,
+                                                (LONGEST) end_arglist ());
+                         write_exp_elt_opcode (pstate, OP_FUNCALL); }
        ;
 
 arglist        :
@@ -386,15 +399,15 @@ non_empty_arglist
 
 /* GDB construct */
 exp    :       '{' type '}' exp  %prec UNARY
-                       { write_exp_elt_opcode (UNOP_MEMVAL);
-                         write_exp_elt_type ($2);
-                         write_exp_elt_opcode (UNOP_MEMVAL); }
+                       { write_exp_elt_opcode (pstate, UNOP_MEMVAL);
+                         write_exp_elt_type (pstate, $2);
+                         write_exp_elt_opcode (pstate, UNOP_MEMVAL); }
        ;
 
 exp     :       type '(' exp ')' %prec UNARY
-                        { write_exp_elt_opcode (UNOP_CAST);
-                         write_exp_elt_type ($1);
-                         write_exp_elt_opcode (UNOP_CAST); }
+                        { write_exp_elt_opcode (pstate, UNOP_CAST);
+                         write_exp_elt_type (pstate, $1);
+                         write_exp_elt_opcode (pstate, UNOP_CAST); }
        ;
 
 exp    :       '(' exp ')'
@@ -406,142 +419,152 @@ exp     :       '(' exp ')'
 
 /* GDB construct */
 exp    :       exp '@' exp
-                       { write_exp_elt_opcode (BINOP_REPEAT); }
+                       { write_exp_elt_opcode (pstate, BINOP_REPEAT); }
        ;
 
 exp    :       exp '*' exp
-                       { write_exp_elt_opcode (BINOP_MUL); }
+                       { write_exp_elt_opcode (pstate, BINOP_MUL); }
        ;
 
 exp    :       exp '/' exp
-                       { write_exp_elt_opcode (BINOP_DIV); }
+                       { write_exp_elt_opcode (pstate, BINOP_DIV); }
        ;
 
 exp     :       exp DIV exp
-                        { write_exp_elt_opcode (BINOP_INTDIV); }
+                        { write_exp_elt_opcode (pstate, BINOP_INTDIV); }
         ;
 
 exp    :       exp MOD exp
-                       { write_exp_elt_opcode (BINOP_REM); }
+                       { write_exp_elt_opcode (pstate, BINOP_REM); }
        ;
 
 exp    :       exp '+' exp
-                       { write_exp_elt_opcode (BINOP_ADD); }
+                       { write_exp_elt_opcode (pstate, BINOP_ADD); }
        ;
 
 exp    :       exp '-' exp
-                       { write_exp_elt_opcode (BINOP_SUB); }
+                       { write_exp_elt_opcode (pstate, BINOP_SUB); }
        ;
 
 exp    :       exp '=' exp
-                       { write_exp_elt_opcode (BINOP_EQUAL); }
+                       { write_exp_elt_opcode (pstate, BINOP_EQUAL); }
        ;
 
 exp    :       exp NOTEQUAL exp
-                       { write_exp_elt_opcode (BINOP_NOTEQUAL); }
+                       { write_exp_elt_opcode (pstate, BINOP_NOTEQUAL); }
         |       exp '#' exp
-                        { write_exp_elt_opcode (BINOP_NOTEQUAL); }
+                        { write_exp_elt_opcode (pstate, BINOP_NOTEQUAL); }
        ;
 
 exp    :       exp LEQ exp
-                       { write_exp_elt_opcode (BINOP_LEQ); }
+                       { write_exp_elt_opcode (pstate, BINOP_LEQ); }
        ;
 
 exp    :       exp GEQ exp
-                       { write_exp_elt_opcode (BINOP_GEQ); }
+                       { write_exp_elt_opcode (pstate, BINOP_GEQ); }
        ;
 
 exp    :       exp '<' exp
-                       { write_exp_elt_opcode (BINOP_LESS); }
+                       { write_exp_elt_opcode (pstate, BINOP_LESS); }
        ;
 
 exp    :       exp '>' exp
-                       { write_exp_elt_opcode (BINOP_GTR); }
+                       { write_exp_elt_opcode (pstate, BINOP_GTR); }
        ;
 
 exp    :       exp LOGICAL_AND exp
-                       { write_exp_elt_opcode (BINOP_LOGICAL_AND); }
+                       { write_exp_elt_opcode (pstate, BINOP_LOGICAL_AND); }
        ;
 
 exp    :       exp OROR exp
-                       { write_exp_elt_opcode (BINOP_LOGICAL_OR); }
+                       { write_exp_elt_opcode (pstate, BINOP_LOGICAL_OR); }
        ;
 
 exp    :       exp ASSIGN exp
-                       { write_exp_elt_opcode (BINOP_ASSIGN); }
+                       { write_exp_elt_opcode (pstate, BINOP_ASSIGN); }
        ;
 
 
 /* Constants */
 
 exp    :       M2_TRUE
-                       { write_exp_elt_opcode (OP_BOOL);
-                         write_exp_elt_longcst ((LONGEST) $1);
-                         write_exp_elt_opcode (OP_BOOL); }
+                       { write_exp_elt_opcode (pstate, OP_BOOL);
+                         write_exp_elt_longcst (pstate, (LONGEST) $1);
+                         write_exp_elt_opcode (pstate, OP_BOOL); }
        ;
 
 exp    :       M2_FALSE
-                       { write_exp_elt_opcode (OP_BOOL);
-                         write_exp_elt_longcst ((LONGEST) $1);
-                         write_exp_elt_opcode (OP_BOOL); }
+                       { write_exp_elt_opcode (pstate, OP_BOOL);
+                         write_exp_elt_longcst (pstate, (LONGEST) $1);
+                         write_exp_elt_opcode (pstate, OP_BOOL); }
        ;
 
 exp    :       INT
-                       { write_exp_elt_opcode (OP_LONG);
-                         write_exp_elt_type (builtin_type_m2_int);
-                         write_exp_elt_longcst ((LONGEST) $1);
-                         write_exp_elt_opcode (OP_LONG); }
+                       { write_exp_elt_opcode (pstate, OP_LONG);
+                         write_exp_elt_type (pstate,
+                                       parse_m2_type (pstate)->builtin_int);
+                         write_exp_elt_longcst (pstate, (LONGEST) $1);
+                         write_exp_elt_opcode (pstate, OP_LONG); }
        ;
 
 exp    :       UINT
                        {
-                         write_exp_elt_opcode (OP_LONG);
-                         write_exp_elt_type (builtin_type_m2_card);
-                         write_exp_elt_longcst ((LONGEST) $1);
-                         write_exp_elt_opcode (OP_LONG);
+                         write_exp_elt_opcode (pstate, OP_LONG);
+                         write_exp_elt_type (pstate,
+                                             parse_m2_type (pstate)
+                                             ->builtin_card);
+                         write_exp_elt_longcst (pstate, (LONGEST) $1);
+                         write_exp_elt_opcode (pstate, OP_LONG);
                        }
        ;
 
 exp    :       CHAR
-                       { write_exp_elt_opcode (OP_LONG);
-                         write_exp_elt_type (builtin_type_m2_char);
-                         write_exp_elt_longcst ((LONGEST) $1);
-                         write_exp_elt_opcode (OP_LONG); }
+                       { write_exp_elt_opcode (pstate, OP_LONG);
+                         write_exp_elt_type (pstate,
+                                             parse_m2_type (pstate)
+                                             ->builtin_char);
+                         write_exp_elt_longcst (pstate, (LONGEST) $1);
+                         write_exp_elt_opcode (pstate, OP_LONG); }
        ;
 
 
 exp    :       FLOAT
-                       { write_exp_elt_opcode (OP_DOUBLE);
-                         write_exp_elt_type (builtin_type_m2_real);
-                         write_exp_elt_dblcst ($1);
-                         write_exp_elt_opcode (OP_DOUBLE); }
+                       { write_exp_elt_opcode (pstate, OP_DOUBLE);
+                         write_exp_elt_type (pstate,
+                                             parse_m2_type (pstate)
+                                             ->builtin_real);
+                         write_exp_elt_dblcst (pstate, $1);
+                         write_exp_elt_opcode (pstate, OP_DOUBLE); }
        ;
 
 exp    :       variable
        ;
 
 exp    :       SIZE '(' type ')'       %prec UNARY
-                       { write_exp_elt_opcode (OP_LONG);
-                         write_exp_elt_type (builtin_type_int);
-                         write_exp_elt_longcst ((LONGEST) TYPE_LENGTH ($3));
-                         write_exp_elt_opcode (OP_LONG); }
+                       { write_exp_elt_opcode (pstate, OP_LONG);
+                         write_exp_elt_type (pstate,
+                                           parse_type (pstate)->builtin_int);
+                         write_exp_elt_longcst (pstate,
+                                                (LONGEST) TYPE_LENGTH ($3));
+                         write_exp_elt_opcode (pstate, OP_LONG); }
        ;
 
 exp    :       STRING
-                       { write_exp_elt_opcode (OP_M2_STRING);
-                         write_exp_string ($1);
-                         write_exp_elt_opcode (OP_M2_STRING); }
+                       { write_exp_elt_opcode (pstate, OP_M2_STRING);
+                         write_exp_string (pstate, $1);
+                         write_exp_elt_opcode (pstate, OP_M2_STRING); }
        ;
 
-/* This will be used for extensions later.  Like adding modules. */
+/* This will be used for extensions later.  Like adding modules.  */
 block  :       fblock  
                        { $$ = SYMBOL_BLOCK_VALUE($1); }
        ;
 
 fblock :       BLOCKNAME
                        { struct symbol *sym
-                           = lookup_symbol (copy_name ($1), expression_context_block,
-                                            VAR_DOMAIN, 0, NULL);
+                           = lookup_symbol (copy_name ($1),
+                                            expression_context_block,
+                                            VAR_DOMAIN, 0);
                          $$ = sym;}
        ;
                             
@@ -550,9 +573,9 @@ fblock      :       BLOCKNAME
 fblock :       block COLONCOLON BLOCKNAME
                        { struct symbol *tem
                            = lookup_symbol (copy_name ($3), $1,
-                                            VAR_DOMAIN, 0, NULL);
+                                            VAR_DOMAIN, 0);
                          if (!tem || SYMBOL_CLASS (tem) != LOC_BLOCK)
-                           error ("No function \"%s\" in specified context.",
+                           error (_("No function \"%s\" in specified context."),
                                   copy_name ($3));
                          $$ = tem;
                        }
@@ -560,10 +583,10 @@ fblock    :       block COLONCOLON BLOCKNAME
 
 /* Useful for assigning to PROCEDURE variables */
 variable:      fblock
-                       { write_exp_elt_opcode(OP_VAR_VALUE);
-                         write_exp_elt_block (NULL);
-                         write_exp_elt_sym ($1);
-                         write_exp_elt_opcode (OP_VAR_VALUE); }
+                       { write_exp_elt_opcode (pstate, OP_VAR_VALUE);
+                         write_exp_elt_block (pstate, NULL);
+                         write_exp_elt_sym (pstate, $1);
+                         write_exp_elt_opcode (pstate, OP_VAR_VALUE); }
        ;
 
 /* GDB internal ($foo) variable */
@@ -574,28 +597,34 @@ variable: INTERNAL_VAR
 variable:      block COLONCOLON NAME
                        { struct symbol *sym;
                          sym = lookup_symbol (copy_name ($3), $1,
-                                              VAR_DOMAIN, 0, NULL);
+                                              VAR_DOMAIN, 0);
                          if (sym == 0)
-                           error ("No symbol \"%s\" in specified context.",
+                           error (_("No symbol \"%s\" in specified context."),
                                   copy_name ($3));
+                         if (symbol_read_needs_frame (sym))
+                           {
+                             if (innermost_block == 0
+                                 || contained_in (block_found,
+                                                  innermost_block))
+                               innermost_block = block_found;
+                           }
 
-                         write_exp_elt_opcode (OP_VAR_VALUE);
+                         write_exp_elt_opcode (pstate, OP_VAR_VALUE);
                          /* block_found is set by lookup_symbol.  */
-                         write_exp_elt_block (block_found);
-                         write_exp_elt_sym (sym);
-                         write_exp_elt_opcode (OP_VAR_VALUE); }
+                         write_exp_elt_block (pstate, block_found);
+                         write_exp_elt_sym (pstate, sym);
+                         write_exp_elt_opcode (pstate, OP_VAR_VALUE); }
        ;
 
-/* Base case for variables. */
+/* Base case for variables.  */
 variable:      NAME
                        { struct symbol *sym;
-                         int is_a_field_of_this;
+                         struct field_of_this_result is_a_field_of_this;
 
                          sym = lookup_symbol (copy_name ($1),
                                               expression_context_block,
                                               VAR_DOMAIN,
-                                              &is_a_field_of_this,
-                                              NULL);
+                                              &is_a_field_of_this);
                          if (sym)
                            {
                              if (symbol_read_needs_frame (sym))
@@ -606,32 +635,27 @@ variable: NAME
                                    innermost_block = block_found;
                                }
 
-                             write_exp_elt_opcode (OP_VAR_VALUE);
+                             write_exp_elt_opcode (pstate, OP_VAR_VALUE);
                              /* We want to use the selected frame, not
                                 another more inner frame which happens to
                                 be in the same block.  */
-                             write_exp_elt_block (NULL);
-                             write_exp_elt_sym (sym);
-                             write_exp_elt_opcode (OP_VAR_VALUE);
+                             write_exp_elt_block (pstate, NULL);
+                             write_exp_elt_sym (pstate, sym);
+                             write_exp_elt_opcode (pstate, OP_VAR_VALUE);
                            }
                          else
                            {
-                             struct minimal_symbol *msymbol;
+                             struct bound_minimal_symbol msymbol;
                              char *arg = copy_name ($1);
 
                              msymbol =
-                               lookup_minimal_symbol (arg, NULL, NULL);
-                             if (msymbol != NULL)
-                               {
-                                 write_exp_msymbol
-                                   (msymbol,
-                                    lookup_function_type (builtin_type_int),
-                                    builtin_type_int);
-                               }
+                               lookup_bound_minimal_symbol (arg);
+                             if (msymbol.minsym != NULL)
+                               write_exp_msymbol (pstate, msymbol);
                              else if (!have_full_symbols () && !have_partial_symbols ())
-                               error ("No symbol table is loaded.  Use the \"symbol-file\" command.");
+                               error (_("No symbol table is loaded.  Use the \"symbol-file\" command."));
                              else
-                               error ("No symbol \"%s\" in current context.",
+                               error (_("No symbol \"%s\" in current context."),
                                       copy_name ($1));
                            }
                        }
@@ -639,29 +663,15 @@ variable: NAME
 
 type
        :       TYPENAME
-                       { $$ = lookup_typename (copy_name ($1),
+                       { $$ = lookup_typename (parse_language (pstate),
+                                               parse_gdbarch (pstate),
+                                               copy_name ($1),
                                                expression_context_block, 0); }
 
        ;
 
 %%
 
-#if 0  /* FIXME! */
-int
-overflow(a,b)
-   long a,b;
-{
-   return (MAX_OF_TYPE(builtin_type_m2_int) - b) < a;
-}
-
-int
-uoverflow(a,b)
-   unsigned long a,b;
-{
-   return (MAX_OF_TYPE(builtin_type_m2_card) - b) < a;
-}
-#endif /* FIXME */
-
 /* Take care of parsing a number (anything that starts with a digit).
    Set yylval and return the token type; update lexptr.
    LEN is the number of characters in it.  */
@@ -669,10 +679,9 @@ uoverflow(a,b)
 /*** Needs some error checking for the float case ***/
 
 static int
-parse_number (olen)
-     int olen;
+parse_number (int olen)
 {
-  char *p = lexptr;
+  const char *p = lexptr;
   LONGEST n = 0;
   LONGEST prevn = 0;
   int c,i,ischar=0;
@@ -703,9 +712,9 @@ parse_number (olen)
        return FLOAT;
       }
     if (p[c] == '.' && base != 10)
-       error("Floating point numbers must be base 10.");
+       error (_("Floating point numbers must be base 10."));
     if (base == 10 && (p[c] < '0' || p[c] > '9'))
-       error("Invalid digit \'%c\' in number.",p[c]);
+       error (_("Invalid digit \'%c\' in number."),p[c]);
  }
 
   while (len-- > 0)
@@ -713,7 +722,7 @@ parse_number (olen)
       c = *p++;
       n *= base;
       if( base == 8 && (c == '8' || c == '9'))
-        error("Invalid digit \'%c\' in octal number.",c);
+        error (_("Invalid digit \'%c\' in octal number."),c);
       if (c >= '0' && c <= '9')
        i = c - '0';
       else
@@ -729,12 +738,12 @@ parse_number (olen)
       if(!unsigned_p && number_sign == 1 && (prevn >= n))
         unsigned_p=1;          /* Try something unsigned */
       /* Don't do the range check if n==i and i==0, since that special
-        case will give an overflow error. */
+        case will give an overflow error.  */
       if(RANGE_CHECK && n!=i && i)
       {
         if((unsigned_p && (unsigned)prevn >= (unsigned)n) ||
            ((!unsigned_p && number_sign==-1) && -prevn <= -n))
-           range_error("Overflow on numeric constant.");
+           range_error (_("Overflow on numeric constant."));
       }
         prevn=n;
     }
@@ -754,7 +763,7 @@ parse_number (olen)
      return UINT;
   }
   else if((unsigned_p && (n<0))) {
-     range_error("Overflow on numeric constant -- number too large.");
+     range_error (_("Overflow on numeric constant -- number too large."));
      /* But, this can return if range_check == range_warn.  */
   }
   yylval.lval = n;
@@ -809,21 +818,22 @@ static struct keyword keytab[] =
     {"SIZE",  SIZE       },
     {"FLOAT", FLOAT_FUNC },
     {"TRUNC", TRUNC     },
+    {"TSIZE", SIZE       },
 };
 
 
 /* Read one token, getting characters through lexptr.  */
 
-/* This is where we will check to make sure that the language and the operators used are
-   compatible  */
+/* This is where we will check to make sure that the language and the
+   operators used are compatible  */
 
 static int
-yylex ()
+yylex (void)
 {
   int c;
   int namelen;
   int i;
-  char *tokstart;
+  const char *tokstart;
   char quote;
 
  retry:
@@ -835,7 +845,7 @@ yylex ()
 
   /* See if it is a special token of length 2 */
   for( i = 0 ; i < (int) (sizeof tokentab2 / sizeof tokentab2[0]) ; i++)
-     if(DEPRECATED_STREQN(tokentab2[i].name, tokstart, 2))
+     if (strncmp (tokentab2[i].name, tokstart, 2) == 0)
      {
        lexptr += 2;
        return tokentab2[i].token;
@@ -915,7 +925,7 @@ yylex ()
              }
          }
       if(c != quote)
-        error("Unterminated string or character constant.");
+        error (_("Unterminated string or character constant."));
       yylval.sval.ptr = tokstart + 1;
       yylval.sval.length = namelen - 1;
       lexptr += namelen + 1;
@@ -936,7 +946,7 @@ yylex ()
     {
       /* It's a number.  */
       int got_dot = 0, got_e = 0;
-      char *p = tokstart;
+      const char *p = tokstart;
       int toktype;
 
       for (++p ;; ++p)
@@ -962,7 +972,7 @@ yylex ()
 
            memcpy (err_copy, tokstart, p - tokstart);
            err_copy[p - tokstart] = 0;
-           error ("Invalid number \"%s\".", err_copy);
+           error (_("Invalid number \"%s\"."), err_copy);
          }
        lexptr = p;
        return toktype;
@@ -971,7 +981,7 @@ yylex ()
   if (!(c == '_' || c == '$'
        || (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z')))
     /* We must have come across a bad character (e.g. ';').  */
-    error ("Invalid character '%c' in expression.", c);
+    error (_("Invalid character '%c' in expression."), c);
 
   /* It's a name.  See how long it is.  */
   namelen = 0;
@@ -992,7 +1002,8 @@ yylex ()
 
   /*  Lookup special keywords */
   for(i = 0 ; i < (int) (sizeof(keytab) / sizeof(keytab[0])) ; i++)
-     if(namelen == strlen(keytab[i].keyw) && DEPRECATED_STREQN(tokstart,keytab[i].keyw,namelen))
+     if (namelen == strlen (keytab[i].keyw)
+        && strncmp (tokstart, keytab[i].keyw, namelen) == 0)
           return keytab[i].token;
 
   yylval.sval.ptr = tokstart;
@@ -1000,7 +1011,7 @@ yylex ()
 
   if (*tokstart == '$')
     {
-      write_dollar_variable (yylval.sval);
+      write_dollar_variable (pstate, yylval.sval);
       return INTERNAL_VAR;
     }
 
@@ -1015,34 +1026,30 @@ yylex ()
     char *tmp = copy_name (yylval.sval);
     struct symbol *sym;
 
-    if (lookup_partial_symtab (tmp))
+    if (lookup_symtab (tmp))
       return BLOCKNAME;
-    sym = lookup_symbol (tmp, expression_context_block,
-                        VAR_DOMAIN, 0, NULL);
+    sym = lookup_symbol (tmp, expression_context_block, VAR_DOMAIN, 0);
     if (sym && SYMBOL_CLASS (sym) == LOC_BLOCK)
       return BLOCKNAME;
-    if (lookup_typename (copy_name (yylval.sval), expression_context_block, 1))
+    if (lookup_typename (parse_language (pstate), parse_gdbarch (pstate),
+                        copy_name (yylval.sval),
+                        expression_context_block, 1))
       return TYPENAME;
 
     if(sym)
     {
-       switch(sym->aclass)
+      switch(SYMBOL_CLASS (sym))
        {
        case LOC_STATIC:
        case LOC_REGISTER:
        case LOC_ARG:
        case LOC_REF_ARG:
-       case LOC_REGPARM:
        case LOC_REGPARM_ADDR:
        case LOC_LOCAL:
-       case LOC_LOCAL_ARG:
-       case LOC_BASEREG:
-       case LOC_BASEREG_ARG:
        case LOC_CONST:
        case LOC_CONST_BYTES:
        case LOC_OPTIMIZED_OUT:
        case LOC_COMPUTED:
-       case LOC_COMPUTED_ARG:
          return NAME;
 
        case LOC_TYPEDEF:
@@ -1052,57 +1059,58 @@ yylex ()
          return BLOCKNAME;
 
        case LOC_UNDEF:
-         error("internal:  Undefined class in m2lex()");
+         error (_("internal:  Undefined class in m2lex()"));
 
        case LOC_LABEL:
        case LOC_UNRESOLVED:
-         error("internal:  Unforseen case in m2lex()");
+         error (_("internal:  Unforseen case in m2lex()"));
 
        default:
-         error ("unhandled token in m2lex()");
+         error (_("unhandled token in m2lex()"));
          break;
        }
     }
     else
     {
-       /* Built-in BOOLEAN type.  This is sort of a hack. */
-       if(DEPRECATED_STREQN(tokstart,"TRUE",4))
+       /* Built-in BOOLEAN type.  This is sort of a hack.  */
+       if (strncmp (tokstart, "TRUE", 4) == 0)
        {
          yylval.ulval = 1;
          return M2_TRUE;
        }
-       else if(DEPRECATED_STREQN(tokstart,"FALSE",5))
+       else if (strncmp (tokstart, "FALSE", 5) == 0)
        {
          yylval.ulval = 0;
          return M2_FALSE;
        }
     }
 
-    /* Must be another type of name... */
+    /* Must be another type of name...  */
     return NAME;
  }
 }
 
-#if 0          /* Unused */
-static char *
-make_qualname(mod,ident)
-   char *mod, *ident;
+int
+m2_parse (struct parser_state *par_state)
 {
-   char *new = malloc(strlen(mod)+strlen(ident)+2);
+  int result;
+  struct cleanup *c = make_cleanup_clear_parser_state (&pstate);
+
+  /* Setting up the parser state.  */
+  gdb_assert (par_state != NULL);
+  pstate = par_state;
+
+  result = yyparse ();
+  do_cleanups (c);
 
-   strcpy(new,mod);
-   strcat(new,".");
-   strcat(new,ident);
-   return new;
+  return result;
 }
-#endif  /* 0 */
 
 void
-yyerror (msg)
-     char *msg;
+yyerror (char *msg)
 {
   if (prev_lexptr)
     lexptr = prev_lexptr;
 
-  error ("A %s in expression, near `%s'.", (msg ? msg : "error"), lexptr);
+  error (_("A %s in expression, near `%s'."), (msg ? msg : "error"), lexptr);
 }
This page took 0.050567 seconds and 4 git commands to generate.