Turn parse_gdbarch into a method

[deliverable/binutils-gdb.git] / gdb / d-exp.y

diff --git a/gdb/d-exp.y b/gdb/d-exp.y
index eab346c368a4e27af0072fd40e4c087aa55f01a3..73d5cfc368ad8e63a719fefc6ee00c771a1c5e79 100644 (file)
--- a/gdb/d-exp.y
+++ b/gdb/d-exp.y
@@ -52,8 +52,8 @@
 #include "charset.h"
 #include "block.h"
 
-#define parse_type(ps) builtin_type (parse_gdbarch (ps))
-#define parse_d_type(ps) builtin_d_type (parse_gdbarch (ps))
+#define parse_type(ps) builtin_type (ps->gdbarch ())
+#define parse_d_type(ps) builtin_d_type (ps->gdbarch ())
 
 /* Remap normal yacc parser interface names (yyparse, yylex, yyerror,
    etc).  */
@@ -97,7 +97,6 @@ static int type_aggregate_p (struct type *);
     struct symtoken ssym;
     int ival;
     int voidval;
-    struct block *bval;
     enum exp_opcode opcode;
     struct stoken_vector svec;
   }
@@ -1290,7 +1289,7 @@ lex_one_token (struct parser_state *par_state)
 
   yylval.tsym.type
     = language_lookup_primitive_type (parse_language (par_state),
-                                     parse_gdbarch (par_state), copy);
+                                     par_state->gdbarch (), copy);
   if (yylval.tsym.type != NULL)
     return TYPENAME;