Move PTRACE_GETREGSET and PTRACE_SETREGSET to nat/linux-ptrace.h

[binutils-gdb.git] / gdb / c-exp.y
diff --git a/gdb/c-exp.y b/gdb/c-exp.y

index 376c5743d552255cd8d2e305dff499cbae4d2993..f458545e839e387773391f643696cd8962b3c249 100644 (file)
--- a/gdb/c-exp.y
+++ b/gdb/c-exp.y
@@ -1,5 +1,5 @@
  /* YACC parser for C expressions, for GDB.
  /* YACC parser for C expressions, for GDB.
-   Copyright (C) 1986-2013 Free Software Foundation, Inc.
+   Copyright (C) 1986-2015 Free Software Foundation, Inc.
  
     This file is part of GDB.
  
  
     This file is part of GDB.
  
@@ -32,11 +32,10 @@
     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.  */
     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.  */
-   
+
  %{
  
  #include "defs.h"
  %{
  
  #include "defs.h"
-#include "gdb_string.h"
  #include <ctype.h>
  #include "expression.h"
  #include "value.h"
  #include <ctype.h>
  #include "expression.h"
  #include "value.h"
@@ -50,13 +49,12 @@
  #include "block.h"
  #include "cp-support.h"
  #include "dfp.h"
  #include "block.h"
  #include "cp-support.h"
  #include "dfp.h"
-#include "gdb_assert.h"
  #include "macroscope.h"
  #include "objc-lang.h"
  #include "typeprint.h"
  #include "cp-abi.h"
  
  #include "macroscope.h"
  #include "objc-lang.h"
  #include "typeprint.h"
  #include "cp-abi.h"
  
-#define parse_type builtin_type (parse_gdbarch)
+#define parse_type(ps) builtin_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
  
  /* Remap normal yacc parser interface names (yyparse, yylex, yyerror, etc),
     as well as gratuitiously global symbol names, so we can have multiple
@@ -118,12 +116,19 @@
  
  #define YYFPRINTF parser_fprintf
  
  
  #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 *);
  
  int yyparse (void);
  
  static int yylex (void);
  
  void yyerror (char *);
  
+static int type_aggregate_p (struct type *);
+
  %}
  
  /* Although the yacc "value" of an expression is not used,
  %}
  
  /* Although the yacc "value" of an expression is not used,
@@ -145,31 +150,36 @@ void yyerror (char *);
        gdb_byte val[16];
        struct type *type;
      } typed_val_decfloat;
        gdb_byte val[16];
        struct type *type;
      } typed_val_decfloat;
-    struct symbol *sym;
      struct type *tval;
      struct stoken sval;
      struct typed_stoken tsval;
      struct ttype tsym;
      struct symtoken ssym;
      int voidval;
      struct type *tval;
      struct stoken sval;
      struct typed_stoken tsval;
      struct ttype tsym;
      struct symtoken ssym;
      int voidval;
-    struct block *bval;
+    const struct block *bval;
      enum exp_opcode opcode;
      enum exp_opcode opcode;
-    struct internalvar *ivar;
  
      struct stoken_vector svec;
      VEC (type_ptr) *tvec;
  
      struct stoken_vector svec;
      VEC (type_ptr) *tvec;
-    int *ivec;
  
      struct type_stack *type_stack;
  
  
      struct type_stack *type_stack;
  
-    struct objc_class_str class;
+    struct objc_class_str theclass;
    }
  
  %{
  /* YYSTYPE gets defined by %union */
    }
  
  %{
  /* YYSTYPE gets defined by %union */
-static int parse_number (char *, int, int, YYSTYPE *);
+static int parse_number (struct parser_state *par_state,
+                        const char *, int, int, YYSTYPE *);
  static struct stoken operator_stoken (const char *);
  static void check_parameter_typelist (VEC (type_ptr) *);
  static struct stoken operator_stoken (const char *);
  static void check_parameter_typelist (VEC (type_ptr) *);
+static void write_destructor_name (struct parser_state *par_state,
+                                  struct stoken);
+
+#ifdef YYBISON
+static void c_print_token (FILE *file, int type, YYSTYPE value);
+#define YYPRINT(FILE, TYPE, VALUE) c_print_token (FILE, TYPE, VALUE)
+#endif
  %}
  
  %type <voidval> exp exp1 type_exp start variable qualified_name lcurly
  %}
  
  %type <voidval> exp exp1 type_exp start variable qualified_name lcurly
@@ -205,11 +215,11 @@ static void check_parameter_typelist (VEC (type_ptr) *);
  %token <ssym> UNKNOWN_CPP_NAME
  %token <voidval> COMPLETE
  %token <tsym> TYPENAME
  %token <ssym> UNKNOWN_CPP_NAME
  %token <voidval> COMPLETE
  %token <tsym> TYPENAME
-%token <class> CLASSNAME       /* ObjC Class name */
+%token <theclass> CLASSNAME    /* ObjC Class name */
  %type <sval> name
  %type <svec> string_exp
  %type <ssym> name_not_typename
  %type <sval> name
  %type <svec> string_exp
  %type <ssym> name_not_typename
-%type <tsym> typename
+%type <tsym> type_name
  
   /* This is like a '[' token, but is only generated when parsing
      Objective C.  This lets us reuse the same parser without
  
   /* This is like a '[' token, but is only generated when parsing
      Objective C.  This lets us reuse the same parser without
@@ -221,18 +231,19 @@ static void check_parameter_typelist (VEC (type_ptr) *);
     E.g. "c" when input_radix==16.  Depending on the parse, it will be
     turned into a name or into a number.  */
  
     E.g. "c" when input_radix==16.  Depending on the parse, it will be
     turned into a name or into a number.  */
  
-%token <ssym> NAME_OR_INT 
+%token <ssym> NAME_OR_INT
  
  %token OPERATOR
  %token STRUCT CLASS UNION ENUM SIZEOF UNSIGNED COLONCOLON
  %token TEMPLATE
  %token ERROR
  %token NEW DELETE
  
  %token OPERATOR
  %token STRUCT CLASS UNION ENUM SIZEOF UNSIGNED COLONCOLON
  %token TEMPLATE
  %token ERROR
  %token NEW DELETE
-%type <sval> operator
+%type <sval> oper
  %token REINTERPRET_CAST DYNAMIC_CAST STATIC_CAST CONST_CAST
  %token ENTRY
  %token TYPEOF
  %token DECLTYPE
  %token REINTERPRET_CAST DYNAMIC_CAST STATIC_CAST CONST_CAST
  %token ENTRY
  %token TYPEOF
  %token DECLTYPE
+%token TYPEID
  
  /* Special type cases, put in to allow the parser to distinguish different
     legal basetypes.  */
  
  /* Special type cases, put in to allow the parser to distinguish different
     legal basetypes.  */
@@ -264,7 +275,7 @@ static void check_parameter_typelist (VEC (type_ptr) *);
  %left '*' '/' '%'
  %right UNARY INCREMENT DECREMENT
  %right ARROW ARROW_STAR '.' DOT_STAR '[' OBJC_LBRAC '('
  %left '*' '/' '%'
  %right UNARY INCREMENT DECREMENT
  %right ARROW ARROW_STAR '.' DOT_STAR '[' OBJC_LBRAC '('
-%token <ssym> BLOCKNAME 
+%token <ssym> BLOCKNAME
  %token <bval> FILENAME
  %type <bval> block
  %left COLONCOLON
  %token <bval> FILENAME
  %type <bval> block
  %left COLONCOLON
@@ -279,152 +290,186 @@ start   :       exp1
         ;
  
  type_exp:      type
         ;
  
  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);}
         |       TYPEOF '(' exp ')'
                         {
         |       TYPEOF '(' exp ')'
                         {
-                         write_exp_elt_opcode (OP_TYPEOF);
+                         write_exp_elt_opcode (pstate, OP_TYPEOF);
                         }
         |       TYPEOF '(' type ')'
                         {
                         }
         |       TYPEOF '(' type ')'
                         {
-                         write_exp_elt_opcode (OP_TYPE);
-                         write_exp_elt_type ($3);
-                         write_exp_elt_opcode (OP_TYPE);
+                         write_exp_elt_opcode (pstate, OP_TYPE);
+                         write_exp_elt_type (pstate, $3);
+                         write_exp_elt_opcode (pstate, OP_TYPE);
                         }
         |       DECLTYPE '(' exp ')'
                         {
                         }
         |       DECLTYPE '(' exp ')'
                         {
-                         write_exp_elt_opcode (OP_DECLTYPE);
+                         write_exp_elt_opcode (pstate, OP_DECLTYPE);
                         }
         ;
  
  /* Expressions, including the comma operator.  */
  exp1   :       exp
         |       exp1 ',' exp
                         }
         ;
  
  /* Expressions, including the comma operator.  */
  exp1   :       exp
         |       exp1 ',' exp
-                       { write_exp_elt_opcode (BINOP_COMMA); }
+                       { write_exp_elt_opcode (pstate, BINOP_COMMA); }
         ;
  
  /* Expressions, not including the comma operator.  */
  exp    :       '*' exp    %prec UNARY
         ;
  
  /* Expressions, not including the comma operator.  */
  exp    :       '*' exp    %prec UNARY
-                       { write_exp_elt_opcode (UNOP_IND); }
+                       { write_exp_elt_opcode (pstate, UNOP_IND); }
         ;
  
  exp    :       '&' exp    %prec UNARY
         ;
  
  exp    :       '&' exp    %prec UNARY
-                       { write_exp_elt_opcode (UNOP_ADDR); }
+                       { write_exp_elt_opcode (pstate, UNOP_ADDR); }
         ;
  
  exp    :       '-' exp    %prec UNARY
         ;
  
  exp    :       '-' exp    %prec UNARY
-                       { write_exp_elt_opcode (UNOP_NEG); }
+                       { write_exp_elt_opcode (pstate, UNOP_NEG); }
         ;
  
  exp    :       '+' exp    %prec UNARY
         ;
  
  exp    :       '+' exp    %prec UNARY
-                       { write_exp_elt_opcode (UNOP_PLUS); }
+                       { write_exp_elt_opcode (pstate, UNOP_PLUS); }
         ;
  
  exp    :       '!' exp    %prec UNARY
         ;
  
  exp    :       '!' exp    %prec UNARY
-                       { write_exp_elt_opcode (UNOP_LOGICAL_NOT); }
+                       { write_exp_elt_opcode (pstate, UNOP_LOGICAL_NOT); }
         ;
  
  exp    :       '~' exp    %prec UNARY
         ;
  
  exp    :       '~' exp    %prec UNARY
-                       { write_exp_elt_opcode (UNOP_COMPLEMENT); }
+                       { write_exp_elt_opcode (pstate, UNOP_COMPLEMENT); }
         ;
  
  exp    :       INCREMENT exp    %prec UNARY
         ;
  
  exp    :       INCREMENT exp    %prec UNARY
-                       { write_exp_elt_opcode (UNOP_PREINCREMENT); }
+                       { write_exp_elt_opcode (pstate, UNOP_PREINCREMENT); }
         ;
  
  exp    :       DECREMENT exp    %prec UNARY
         ;
  
  exp    :       DECREMENT exp    %prec UNARY
-                       { write_exp_elt_opcode (UNOP_PREDECREMENT); }
+                       { write_exp_elt_opcode (pstate, UNOP_PREDECREMENT); }
         ;
  
  exp    :       exp INCREMENT    %prec UNARY
         ;
  
  exp    :       exp INCREMENT    %prec UNARY
-                       { write_exp_elt_opcode (UNOP_POSTINCREMENT); }
+                       { write_exp_elt_opcode (pstate, UNOP_POSTINCREMENT); }
         ;
  
  exp    :       exp DECREMENT    %prec UNARY
         ;
  
  exp    :       exp DECREMENT    %prec UNARY
-                       { write_exp_elt_opcode (UNOP_POSTDECREMENT); }
+                       { write_exp_elt_opcode (pstate, UNOP_POSTDECREMENT); }
+       ;
+
+exp    :       TYPEID '(' exp ')' %prec UNARY
+                       { write_exp_elt_opcode (pstate, OP_TYPEID); }
+       ;
+
+exp    :       TYPEID '(' type_exp ')' %prec UNARY
+                       { write_exp_elt_opcode (pstate, OP_TYPEID); }
         ;
  
  exp    :       SIZEOF exp       %prec UNARY
         ;
  
  exp    :       SIZEOF exp       %prec UNARY
-                       { write_exp_elt_opcode (UNOP_SIZEOF); }
+                       { write_exp_elt_opcode (pstate, UNOP_SIZEOF); }
         ;
  
  exp    :       exp ARROW name
         ;
  
  exp    :       exp ARROW name
-                       { write_exp_elt_opcode (STRUCTOP_PTR);
-                         write_exp_string ($3);
-                         write_exp_elt_opcode (STRUCTOP_PTR); }
+                       { write_exp_elt_opcode (pstate, STRUCTOP_PTR);
+                         write_exp_string (pstate, $3);
+                         write_exp_elt_opcode (pstate, STRUCTOP_PTR); }
         ;
  
  exp    :       exp ARROW name COMPLETE
         ;
  
  exp    :       exp ARROW name COMPLETE
-                       { mark_struct_expression ();
-                         write_exp_elt_opcode (STRUCTOP_PTR);
-                         write_exp_string ($3);
-                         write_exp_elt_opcode (STRUCTOP_PTR); }
+                       { mark_struct_expression (pstate);
+                         write_exp_elt_opcode (pstate, STRUCTOP_PTR);
+                         write_exp_string (pstate, $3);
+                         write_exp_elt_opcode (pstate, STRUCTOP_PTR); }
         ;
  
  exp    :       exp ARROW COMPLETE
                         { struct stoken s;
         ;
  
  exp    :       exp ARROW COMPLETE
                         { struct stoken s;
-                         mark_struct_expression ();
-                         write_exp_elt_opcode (STRUCTOP_PTR);
+                         mark_struct_expression (pstate);
+                         write_exp_elt_opcode (pstate, STRUCTOP_PTR);
                           s.ptr = "";
                           s.length = 0;
                           s.ptr = "";
                           s.length = 0;
-                         write_exp_string (s);
-                         write_exp_elt_opcode (STRUCTOP_PTR); }
+                         write_exp_string (pstate, s);
+                         write_exp_elt_opcode (pstate, STRUCTOP_PTR); }
+       ;
+
+exp    :       exp ARROW '~' name
+                       { write_exp_elt_opcode (pstate, STRUCTOP_PTR);
+                         write_destructor_name (pstate, $4);
+                         write_exp_elt_opcode (pstate, STRUCTOP_PTR); }
+       ;
+
+exp    :       exp ARROW '~' name COMPLETE
+                       { mark_struct_expression (pstate);
+                         write_exp_elt_opcode (pstate, STRUCTOP_PTR);
+                         write_destructor_name (pstate, $4);
+                         write_exp_elt_opcode (pstate, STRUCTOP_PTR); }
         ;
  
  exp    :       exp ARROW qualified_name
                         { /* exp->type::name becomes exp->*(&type::name) */
                           /* Note: this doesn't work if name is a
                              static member!  FIXME */
         ;
  
  exp    :       exp ARROW qualified_name
                         { /* exp->type::name becomes exp->*(&type::name) */
                           /* Note: this doesn't work if name is a
                              static member!  FIXME */
-                         write_exp_elt_opcode (UNOP_ADDR);
-                         write_exp_elt_opcode (STRUCTOP_MPTR); }
+                         write_exp_elt_opcode (pstate, UNOP_ADDR);
+                         write_exp_elt_opcode (pstate, STRUCTOP_MPTR); }
         ;
  
  exp    :       exp ARROW_STAR exp
         ;
  
  exp    :       exp ARROW_STAR exp
-                       { write_exp_elt_opcode (STRUCTOP_MPTR); }
+                       { write_exp_elt_opcode (pstate, STRUCTOP_MPTR); }
         ;
  
  exp    :       exp '.' name
         ;
  
  exp    :       exp '.' 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    :       exp '.' name COMPLETE
         ;
  
  exp    :       exp '.' name COMPLETE
-                       { mark_struct_expression ();
-                         write_exp_elt_opcode (STRUCTOP_STRUCT);
-                         write_exp_string ($3);
-                         write_exp_elt_opcode (STRUCTOP_STRUCT); }
+                       { mark_struct_expression (pstate);
+                         write_exp_elt_opcode (pstate, STRUCTOP_STRUCT);
+                         write_exp_string (pstate, $3);
+                         write_exp_elt_opcode (pstate, STRUCTOP_STRUCT); }
         ;
  
  exp    :       exp '.' COMPLETE
                         { struct stoken s;
         ;
  
  exp    :       exp '.' COMPLETE
                         { struct stoken s;
-                         mark_struct_expression ();
-                         write_exp_elt_opcode (STRUCTOP_STRUCT);
+                         mark_struct_expression (pstate);
+                         write_exp_elt_opcode (pstate, STRUCTOP_STRUCT);
                           s.ptr = "";
                           s.length = 0;
                           s.ptr = "";
                           s.length = 0;
-                         write_exp_string (s);
-                         write_exp_elt_opcode (STRUCTOP_STRUCT); }
+                         write_exp_string (pstate, s);
+                         write_exp_elt_opcode (pstate, STRUCTOP_STRUCT); }
+       ;
+
+exp    :       exp '.' '~' name
+                       { write_exp_elt_opcode (pstate, STRUCTOP_STRUCT);
+                         write_destructor_name (pstate, $4);
+                         write_exp_elt_opcode (pstate, STRUCTOP_STRUCT); }
+       ;
+
+exp    :       exp '.' '~' name COMPLETE
+                       { mark_struct_expression (pstate);
+                         write_exp_elt_opcode (pstate, STRUCTOP_STRUCT);
+                         write_destructor_name (pstate, $4);
+                         write_exp_elt_opcode (pstate, STRUCTOP_STRUCT); }
         ;
  
  exp    :       exp '.' qualified_name
                         { /* exp.type::name becomes exp.*(&type::name) */
                           /* Note: this doesn't work if name is a
                              static member!  FIXME */
         ;
  
  exp    :       exp '.' qualified_name
                         { /* exp.type::name becomes exp.*(&type::name) */
                           /* Note: this doesn't work if name is a
                              static member!  FIXME */
-                         write_exp_elt_opcode (UNOP_ADDR);
-                         write_exp_elt_opcode (STRUCTOP_MEMBER); }
+                         write_exp_elt_opcode (pstate, UNOP_ADDR);
+                         write_exp_elt_opcode (pstate, STRUCTOP_MEMBER); }
         ;
  
  exp    :       exp DOT_STAR exp
         ;
  
  exp    :       exp DOT_STAR exp
-                       { write_exp_elt_opcode (STRUCTOP_MEMBER); }
+                       { write_exp_elt_opcode (pstate, STRUCTOP_MEMBER); }
         ;
  
  exp    :       exp '[' exp1 ']'
         ;
  
  exp    :       exp '[' exp1 ']'
-                       { write_exp_elt_opcode (BINOP_SUBSCRIPT); }
+                       { write_exp_elt_opcode (pstate, BINOP_SUBSCRIPT); }
         ;
  
  exp    :       exp OBJC_LBRAC exp1 ']'
         ;
  
  exp    :       exp OBJC_LBRAC exp1 ']'
-                       { write_exp_elt_opcode (BINOP_SUBSCRIPT); }
+                       { write_exp_elt_opcode (pstate, BINOP_SUBSCRIPT); }
         ;
  
  /*
         ;
  
  /*
@@ -434,47 +479,49 @@ exp       :       exp OBJC_LBRAC exp1 ']'
  
  exp    :       OBJC_LBRAC TYPENAME
                         {
  
  exp    :       OBJC_LBRAC TYPENAME
                         {
-                         CORE_ADDR class;
+                         CORE_ADDR theclass;
  
  
-                         class = lookup_objc_class (parse_gdbarch,
+                         theclass = lookup_objc_class (parse_gdbarch (pstate),
                                                      copy_name ($2.stoken));
                                                      copy_name ($2.stoken));
-                         if (class == 0)
+                         if (theclass == 0)
                             error (_("%s is not an ObjC Class"),
                                    copy_name ($2.stoken));
                             error (_("%s is not an ObjC Class"),
                                    copy_name ($2.stoken));
-                         write_exp_elt_opcode (OP_LONG);
-                         write_exp_elt_type (parse_type->builtin_int);
-                         write_exp_elt_longcst ((LONGEST) class);
-                         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) theclass);
+                         write_exp_elt_opcode (pstate, OP_LONG);
                           start_msglist();
                         }
                 msglist ']'
                           start_msglist();
                         }
                 msglist ']'
-                       { write_exp_elt_opcode (OP_OBJC_MSGCALL);
-                         end_msglist();
-                         write_exp_elt_opcode (OP_OBJC_MSGCALL);
+                       { write_exp_elt_opcode (pstate, OP_OBJC_MSGCALL);
+                         end_msglist (pstate);
+                         write_exp_elt_opcode (pstate, OP_OBJC_MSGCALL);
                         }
         ;
  
  exp    :       OBJC_LBRAC CLASSNAME
                         {
                         }
         ;
  
  exp    :       OBJC_LBRAC CLASSNAME
                         {
-                         write_exp_elt_opcode (OP_LONG);
-                         write_exp_elt_type (parse_type->builtin_int);
-                         write_exp_elt_longcst ((LONGEST) $2.class);
-                         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) $2.theclass);
+                         write_exp_elt_opcode (pstate, OP_LONG);
                           start_msglist();
                         }
                 msglist ']'
                           start_msglist();
                         }
                 msglist ']'
-                       { write_exp_elt_opcode (OP_OBJC_MSGCALL);
-                         end_msglist();
-                         write_exp_elt_opcode (OP_OBJC_MSGCALL);
+                       { write_exp_elt_opcode (pstate, OP_OBJC_MSGCALL);
+                         end_msglist (pstate);
+                         write_exp_elt_opcode (pstate, OP_OBJC_MSGCALL);
                         }
         ;
  
  exp    :       OBJC_LBRAC exp
                         { start_msglist(); }
                 msglist ']'
                         }
         ;
  
  exp    :       OBJC_LBRAC exp
                         { start_msglist(); }
                 msglist ']'
-                       { write_exp_elt_opcode (OP_OBJC_MSGCALL);
-                         end_msglist();
-                         write_exp_elt_opcode (OP_OBJC_MSGCALL);
+                       { write_exp_elt_opcode (pstate, OP_OBJC_MSGCALL);
+                         end_msglist (pstate);
+                         write_exp_elt_opcode (pstate, OP_OBJC_MSGCALL);
                         }
         ;
  
                         }
         ;
  
@@ -495,25 +542,28 @@ msgarg    :       name ':' exp
                         { add_msglist(0, 0);   }
         ;
  
                         { add_msglist(0, 0);   }
         ;
  
-exp    :       exp '(' 
+exp    :       exp '('
                         /* This is to save the value of arglist_len
                            being accumulated by an outer function call.  */
                         { start_arglist (); }
                 arglist ')'     %prec ARROW
                         /* This is to save the value of arglist_len
                            being accumulated by an outer function call.  */
                         { start_arglist (); }
                 arglist ')'     %prec ARROW
-                       { 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); }
         ;
  
  exp    :       UNKNOWN_CPP_NAME '('
                         {
                           /* This could potentially be a an argument defined
                              lookup function (Koenig).  */
         ;
  
  exp    :       UNKNOWN_CPP_NAME '('
                         {
                           /* This could potentially be a an argument defined
                              lookup function (Koenig).  */
-                         write_exp_elt_opcode (OP_ADL_FUNC);
-                         write_exp_elt_block (expression_context_block);
-                         write_exp_elt_sym (NULL); /* Placeholder.  */
-                         write_exp_string ($1.stoken);
-                         write_exp_elt_opcode (OP_ADL_FUNC);
+                         write_exp_elt_opcode (pstate, OP_ADL_FUNC);
+                         write_exp_elt_block (pstate,
+                                              expression_context_block);
+                         write_exp_elt_sym (pstate,
+                                            NULL); /* Placeholder.  */
+                         write_exp_string (pstate, $1.stoken);
+                         write_exp_elt_opcode (pstate, OP_ADL_FUNC);
  
                         /* This is to save the value of arglist_len
                            being accumulated by an outer function call.  */
  
                         /* This is to save the value of arglist_len
                            being accumulated by an outer function call.  */
@@ -522,9 +572,10 @@ exp        :       UNKNOWN_CPP_NAME '('
                         }
                 arglist ')'     %prec ARROW
                         {
                         }
                 arglist ')'     %prec ARROW
                         {
-                         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);
                         }
         ;
  
                         }
         ;
  
@@ -549,14 +600,14 @@ exp     :       exp '(' parameter_typelist ')' const_or_volatile
                           struct type *type_elt;
                           LONGEST len = VEC_length (type_ptr, type_list);
  
                           struct type *type_elt;
                           LONGEST len = VEC_length (type_ptr, type_list);
  
-                         write_exp_elt_opcode (TYPE_INSTANCE);
-                         write_exp_elt_longcst (len);
+                         write_exp_elt_opcode (pstate, TYPE_INSTANCE);
+                         write_exp_elt_longcst (pstate, len);
                           for (i = 0;
                                VEC_iterate (type_ptr, type_list, i, type_elt);
                                ++i)
                           for (i = 0;
                                VEC_iterate (type_ptr, type_list, i, type_elt);
                                ++i)
-                           write_exp_elt_type (type_elt);
-                         write_exp_elt_longcst(len);
-                         write_exp_elt_opcode (TYPE_INSTANCE);
+                           write_exp_elt_type (pstate, type_elt);
+                         write_exp_elt_longcst(pstate, len);
+                         write_exp_elt_opcode (pstate, TYPE_INSTANCE);
                           VEC_free (type_ptr, type_list);
                         }
         ;
                           VEC_free (type_ptr, type_list);
                         }
         ;
@@ -565,18 +616,18 @@ rcurly    :       '}'
                         { $$ = end_arglist () - 1; }
         ;
  exp    :       lcurly arglist rcurly   %prec ARROW
                         { $$ = end_arglist () - 1; }
         ;
  exp    :       lcurly arglist rcurly   %prec ARROW
-                       { write_exp_elt_opcode (OP_ARRAY);
-                         write_exp_elt_longcst ((LONGEST) 0);
-                         write_exp_elt_longcst ((LONGEST) $3);
-                         write_exp_elt_opcode (OP_ARRAY); }
+                       { write_exp_elt_opcode (pstate, OP_ARRAY);
+                         write_exp_elt_longcst (pstate, (LONGEST) 0);
+                         write_exp_elt_longcst (pstate, (LONGEST) $3);
+                         write_exp_elt_opcode (pstate, OP_ARRAY); }
         ;
  
  exp    :       lcurly type_exp rcurly exp  %prec UNARY
         ;
  
  exp    :       lcurly type_exp rcurly exp  %prec UNARY
-                       { write_exp_elt_opcode (UNOP_MEMVAL_TYPE); }
+                       { write_exp_elt_opcode (pstate, UNOP_MEMVAL_TYPE); }
         ;
  
  exp    :       '(' type_exp ')' exp  %prec UNARY
         ;
  
  exp    :       '(' type_exp ')' exp  %prec UNARY
-                       { write_exp_elt_opcode (UNOP_CAST_TYPE); }
+                       { write_exp_elt_opcode (pstate, UNOP_CAST_TYPE); }
         ;
  
  exp    :       '(' exp1 ')'
         ;
  
  exp    :       '(' exp1 ')'
@@ -586,100 +637,101 @@ exp     :       '(' exp1 ')'
  /* Binary operators in order of decreasing precedence.  */
  
  exp    :       exp '@' exp
  /* Binary operators in order of decreasing precedence.  */
  
  exp    :       exp '@' exp
-                       { write_exp_elt_opcode (BINOP_REPEAT); }
+                       { write_exp_elt_opcode (pstate, BINOP_REPEAT); }
         ;
  
  exp    :       exp '*' exp
         ;
  
  exp    :       exp '*' exp
-                       { write_exp_elt_opcode (BINOP_MUL); }
+                       { write_exp_elt_opcode (pstate, BINOP_MUL); }
         ;
  
  exp    :       exp '/' exp
         ;
  
  exp    :       exp '/' exp
-                       { write_exp_elt_opcode (BINOP_DIV); }
+                       { write_exp_elt_opcode (pstate, BINOP_DIV); }
         ;
  
  exp    :       exp '%' exp
         ;
  
  exp    :       exp '%' exp
-                       { write_exp_elt_opcode (BINOP_REM); }
+                       { write_exp_elt_opcode (pstate, BINOP_REM); }
         ;
  
  exp    :       exp '+' exp
         ;
  
  exp    :       exp '+' exp
-                       { write_exp_elt_opcode (BINOP_ADD); }
+                       { write_exp_elt_opcode (pstate, BINOP_ADD); }
         ;
  
  exp    :       exp '-' exp
         ;
  
  exp    :       exp '-' exp
-                       { write_exp_elt_opcode (BINOP_SUB); }
+                       { write_exp_elt_opcode (pstate, BINOP_SUB); }
         ;
  
  exp    :       exp LSH exp
         ;
  
  exp    :       exp LSH exp
-                       { write_exp_elt_opcode (BINOP_LSH); }
+                       { write_exp_elt_opcode (pstate, BINOP_LSH); }
         ;
  
  exp    :       exp RSH exp
         ;
  
  exp    :       exp RSH exp
-                       { write_exp_elt_opcode (BINOP_RSH); }
+                       { write_exp_elt_opcode (pstate, BINOP_RSH); }
         ;
  
  exp    :       exp EQUAL exp
         ;
  
  exp    :       exp EQUAL exp
-                       { write_exp_elt_opcode (BINOP_EQUAL); }
+                       { write_exp_elt_opcode (pstate, BINOP_EQUAL); }
         ;
  
  exp    :       exp NOTEQUAL exp
         ;
  
  exp    :       exp NOTEQUAL exp
-                       { write_exp_elt_opcode (BINOP_NOTEQUAL); }
+                       { write_exp_elt_opcode (pstate, BINOP_NOTEQUAL); }
         ;
  
  exp    :       exp LEQ exp
         ;
  
  exp    :       exp LEQ exp
-                       { write_exp_elt_opcode (BINOP_LEQ); }
+                       { write_exp_elt_opcode (pstate, BINOP_LEQ); }
         ;
  
  exp    :       exp GEQ exp
         ;
  
  exp    :       exp GEQ exp
-                       { write_exp_elt_opcode (BINOP_GEQ); }
+                       { write_exp_elt_opcode (pstate, BINOP_GEQ); }
         ;
  
  exp    :       exp '<' exp
         ;
  
  exp    :       exp '<' exp
-                       { write_exp_elt_opcode (BINOP_LESS); }
+                       { write_exp_elt_opcode (pstate, BINOP_LESS); }
         ;
  
  exp    :       exp '>' exp
         ;
  
  exp    :       exp '>' exp
-                       { write_exp_elt_opcode (BINOP_GTR); }
+                       { write_exp_elt_opcode (pstate, BINOP_GTR); }
         ;
  
  exp    :       exp '&' exp
         ;
  
  exp    :       exp '&' exp
-                       { write_exp_elt_opcode (BINOP_BITWISE_AND); }
+                       { write_exp_elt_opcode (pstate, BINOP_BITWISE_AND); }
         ;
  
  exp    :       exp '^' exp
         ;
  
  exp    :       exp '^' exp
-                       { write_exp_elt_opcode (BINOP_BITWISE_XOR); }
+                       { write_exp_elt_opcode (pstate, BINOP_BITWISE_XOR); }
         ;
  
  exp    :       exp '|' exp
         ;
  
  exp    :       exp '|' exp
-                       { write_exp_elt_opcode (BINOP_BITWISE_IOR); }
+                       { write_exp_elt_opcode (pstate, BINOP_BITWISE_IOR); }
         ;
  
  exp    :       exp ANDAND exp
         ;
  
  exp    :       exp ANDAND exp
-                       { write_exp_elt_opcode (BINOP_LOGICAL_AND); }
+                       { write_exp_elt_opcode (pstate, BINOP_LOGICAL_AND); }
         ;
  
  exp    :       exp OROR exp
         ;
  
  exp    :       exp OROR exp
-                       { write_exp_elt_opcode (BINOP_LOGICAL_OR); }
+                       { write_exp_elt_opcode (pstate, BINOP_LOGICAL_OR); }
         ;
  
  exp    :       exp '?' exp ':' exp     %prec '?'
         ;
  
  exp    :       exp '?' exp ':' exp     %prec '?'
-                       { write_exp_elt_opcode (TERNOP_COND); }
+                       { write_exp_elt_opcode (pstate, TERNOP_COND); }
         ;
         ;
-                         
+
  exp    :       exp '=' exp
  exp    :       exp '=' exp
-                       { write_exp_elt_opcode (BINOP_ASSIGN); }
+                       { write_exp_elt_opcode (pstate, BINOP_ASSIGN); }
         ;
  
  exp    :       exp ASSIGN_MODIFY exp
         ;
  
  exp    :       exp ASSIGN_MODIFY exp
-                       { write_exp_elt_opcode (BINOP_ASSIGN_MODIFY);
-                         write_exp_elt_opcode ($2);
-                         write_exp_elt_opcode (BINOP_ASSIGN_MODIFY); }
+                       { write_exp_elt_opcode (pstate, BINOP_ASSIGN_MODIFY);
+                         write_exp_elt_opcode (pstate, $2);
+                         write_exp_elt_opcode (pstate,
+                                               BINOP_ASSIGN_MODIFY); }
         ;
  
  exp    :       INT
         ;
  
  exp    :       INT
-                       { write_exp_elt_opcode (OP_LONG);
-                         write_exp_elt_type ($1.type);
-                         write_exp_elt_longcst ((LONGEST)($1.val));
-                         write_exp_elt_opcode (OP_LONG); }
+                       { 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); }
         ;
  
  exp    :       CHAR
         ;
  
  exp    :       CHAR
@@ -687,33 +739,35 @@ exp       :       CHAR
                           struct stoken_vector vec;
                           vec.len = 1;
                           vec.tokens = &$1;
                           struct stoken_vector vec;
                           vec.len = 1;
                           vec.tokens = &$1;
-                         write_exp_string_vector ($1.type, &vec);
+                         write_exp_string_vector (pstate, $1.type, &vec);
                         }
         ;
  
  exp    :       NAME_OR_INT
                         { YYSTYPE val;
                         }
         ;
  
  exp    :       NAME_OR_INT
                         { YYSTYPE val;
-                         parse_number ($1.stoken.ptr, $1.stoken.length, 0, &val);
-                         write_exp_elt_opcode (OP_LONG);
-                         write_exp_elt_type (val.typed_val_int.type);
-                         write_exp_elt_longcst ((LONGEST)val.typed_val_int.val);
-                         write_exp_elt_opcode (OP_LONG);
+                         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);
+                         write_exp_elt_longcst (pstate,
+                                           (LONGEST) val.typed_val_int.val);
+                         write_exp_elt_opcode (pstate, OP_LONG);
                         }
         ;
  
  
  exp    :       FLOAT
                         }
         ;
  
  
  exp    :       FLOAT
-                       { write_exp_elt_opcode (OP_DOUBLE);
-                         write_exp_elt_type ($1.type);
-                         write_exp_elt_dblcst ($1.dval);
-                         write_exp_elt_opcode (OP_DOUBLE); }
+                       { write_exp_elt_opcode (pstate, OP_DOUBLE);
+                         write_exp_elt_type (pstate, $1.type);
+                         write_exp_elt_dblcst (pstate, $1.dval);
+                         write_exp_elt_opcode (pstate, OP_DOUBLE); }
         ;
  
  exp    :       DECFLOAT
         ;
  
  exp    :       DECFLOAT
-                       { write_exp_elt_opcode (OP_DECFLOAT);
-                         write_exp_elt_type ($1.type);
-                         write_exp_elt_decfloatcst ($1.val);
-                         write_exp_elt_opcode (OP_DECFLOAT); }
+                       { write_exp_elt_opcode (pstate, OP_DECFLOAT);
+                         write_exp_elt_type (pstate, $1.type);
+                         write_exp_elt_decfloatcst (pstate, $1.val);
+                         write_exp_elt_opcode (pstate, OP_DECFLOAT); }
         ;
  
  exp    :       variable
         ;
  
  exp    :       variable
@@ -721,43 +775,54 @@ exp       :       variable
  
  exp    :       VARIABLE
                         {
  
  exp    :       VARIABLE
                         {
-                         write_dollar_variable ($1);
+                         write_dollar_variable (pstate, $1);
                         }
         ;
  
  exp    :       SELECTOR '(' name ')'
                         {
                         }
         ;
  
  exp    :       SELECTOR '(' name ')'
                         {
-                         write_exp_elt_opcode (OP_OBJC_SELECTOR);
-                         write_exp_string ($3);
-                         write_exp_elt_opcode (OP_OBJC_SELECTOR); }
+                         write_exp_elt_opcode (pstate, OP_OBJC_SELECTOR);
+                         write_exp_string (pstate, $3);
+                         write_exp_elt_opcode (pstate, OP_OBJC_SELECTOR); }
         ;
  
  exp    :       SIZEOF '(' type ')'     %prec UNARY
         ;
  
  exp    :       SIZEOF '(' type ')'     %prec UNARY
-                       { write_exp_elt_opcode (OP_LONG);
-                         write_exp_elt_type (lookup_signed_typename
-                                             (parse_language, parse_gdbarch,
+                       { struct type *type = $3;
+                         write_exp_elt_opcode (pstate, OP_LONG);
+                         write_exp_elt_type (pstate, lookup_signed_typename
+                                             (parse_language (pstate),
+                                              parse_gdbarch (pstate),
                                                "int"));
                                                "int"));
-                         CHECK_TYPEDEF ($3);
-                         write_exp_elt_longcst ((LONGEST) TYPE_LENGTH ($3));
-                         write_exp_elt_opcode (OP_LONG); }
+                         CHECK_TYPEDEF (type);
+
+                           /* $5.3.3/2 of the C++ Standard (n3290 draft)
+                              says of sizeof:  "When applied to a reference
+                              or a reference type, the result is the size of
+                              the referenced type."  */
+                         if (TYPE_CODE (type) == TYPE_CODE_REF)
+                           type = check_typedef (TYPE_TARGET_TYPE (type));
+                         write_exp_elt_longcst (pstate,
+                                                (LONGEST) TYPE_LENGTH (type));
+                         write_exp_elt_opcode (pstate, OP_LONG); }
         ;
  
  exp    :       REINTERPRET_CAST '<' type_exp '>' '(' exp ')' %prec UNARY
         ;
  
  exp    :       REINTERPRET_CAST '<' type_exp '>' '(' exp ')' %prec UNARY
-                       { write_exp_elt_opcode (UNOP_REINTERPRET_CAST); }
+                       { write_exp_elt_opcode (pstate,
+                                               UNOP_REINTERPRET_CAST); }
         ;
  
  exp    :       STATIC_CAST '<' type_exp '>' '(' exp ')' %prec UNARY
         ;
  
  exp    :       STATIC_CAST '<' type_exp '>' '(' exp ')' %prec UNARY
-                       { write_exp_elt_opcode (UNOP_CAST_TYPE); }
+                       { write_exp_elt_opcode (pstate, UNOP_CAST_TYPE); }
         ;
  
  exp    :       DYNAMIC_CAST '<' type_exp '>' '(' exp ')' %prec UNARY
         ;
  
  exp    :       DYNAMIC_CAST '<' type_exp '>' '(' exp ')' %prec UNARY
-                       { write_exp_elt_opcode (UNOP_DYNAMIC_CAST); }
+                       { write_exp_elt_opcode (pstate, UNOP_DYNAMIC_CAST); }
         ;
  
  exp    :       CONST_CAST '<' type_exp '>' '(' exp ')' %prec UNARY
                         { /* We could do more error checking here, but
                              it doesn't seem worthwhile.  */
         ;
  
  exp    :       CONST_CAST '<' type_exp '>' '(' exp ')' %prec UNARY
                         { /* We could do more error checking here, but
                              it doesn't seem worthwhile.  */
-                         write_exp_elt_opcode (UNOP_CAST_TYPE); }
+                         write_exp_elt_opcode (pstate, UNOP_CAST_TYPE); }
         ;
  
  string_exp:
         ;
  
  string_exp:
@@ -822,7 +887,7 @@ exp :       string_exp
                                 }
                             }
  
                                 }
                             }
  
-                         write_exp_string_vector (type, &$1);
+                         write_exp_string_vector (pstate, type, &$1);
                           for (i = 0; i < $1.len; ++i)
                             free ($1.tokens[i].ptr);
                           free ($1.tokens);
                           for (i = 0; i < $1.len; ++i)
                             free ($1.tokens[i].ptr);
                           free ($1.tokens);
@@ -832,24 +897,26 @@ exp       :       string_exp
  exp     :      NSSTRING        /* ObjC NextStep NSString constant
                                  * of the form '@' '"' string '"'.
                                  */
  exp     :      NSSTRING        /* ObjC NextStep NSString constant
                                  * of the form '@' '"' string '"'.
                                  */
-                       { write_exp_elt_opcode (OP_OBJC_NSSTRING);
-                         write_exp_string ($1);
-                         write_exp_elt_opcode (OP_OBJC_NSSTRING); }
+                       { write_exp_elt_opcode (pstate, OP_OBJC_NSSTRING);
+                         write_exp_string (pstate, $1);
+                         write_exp_elt_opcode (pstate, OP_OBJC_NSSTRING); }
         ;
  
  /* C++.  */
         ;
  
  /* C++.  */
-exp     :       TRUEKEYWORD    
-                        { write_exp_elt_opcode (OP_LONG);
-                          write_exp_elt_type (parse_type->builtin_bool);
-                          write_exp_elt_longcst ((LONGEST) 1);
-                          write_exp_elt_opcode (OP_LONG); }
+exp     :       TRUEKEYWORD
+                        { write_exp_elt_opcode (pstate, OP_LONG);
+                          write_exp_elt_type (pstate,
+                                         parse_type (pstate)->builtin_bool);
+                          write_exp_elt_longcst (pstate, (LONGEST) 1);
+                          write_exp_elt_opcode (pstate, OP_LONG); }
         ;
  
         ;
  
-exp     :       FALSEKEYWORD   
-                        { write_exp_elt_opcode (OP_LONG);
-                          write_exp_elt_type (parse_type->builtin_bool);
-                          write_exp_elt_longcst ((LONGEST) 0);
-                          write_exp_elt_opcode (OP_LONG); }
+exp     :       FALSEKEYWORD
+                        { write_exp_elt_opcode (pstate, OP_LONG);
+                          write_exp_elt_type (pstate,
+                                         parse_type (pstate)->builtin_bool);
+                          write_exp_elt_longcst (pstate, (LONGEST) 0);
+                          write_exp_elt_opcode (pstate, OP_LONG); }
         ;
  
  /* end of C++.  */
         ;
  
  /* end of C++.  */
@@ -887,9 +954,9 @@ variable:   name_not_typename ENTRY
                                      "parameters, not for \"%s\""),
                                    copy_name ($1.stoken));
  
                                      "parameters, not for \"%s\""),
                                    copy_name ($1.stoken));
  
-                         write_exp_elt_opcode (OP_VAR_ENTRY_VALUE);
-                         write_exp_elt_sym (sym);
-                         write_exp_elt_opcode (OP_VAR_ENTRY_VALUE);
+                         write_exp_elt_opcode (pstate, OP_VAR_ENTRY_VALUE);
+                         write_exp_elt_sym (pstate, sym);
+                         write_exp_elt_opcode (pstate, OP_VAR_ENTRY_VALUE);
                         }
         ;
  
                         }
         ;
  
@@ -908,51 +975,49 @@ variable: block COLONCOLON name
                                 innermost_block = block_found;
                             }
  
                                 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.  */
                           /* 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); }
         ;
  
  qualified_name:        TYPENAME COLONCOLON name
                         {
                           struct type *type = $1.type;
                           CHECK_TYPEDEF (type);
         ;
  
  qualified_name:        TYPENAME COLONCOLON name
                         {
                           struct type *type = $1.type;
                           CHECK_TYPEDEF (type);
-                         if (TYPE_CODE (type) != TYPE_CODE_STRUCT
-                             && TYPE_CODE (type) != TYPE_CODE_UNION
-                             && TYPE_CODE (type) != TYPE_CODE_NAMESPACE)
+                         if (!type_aggregate_p (type))
                             error (_("`%s' is not defined as an aggregate type."),
                                    TYPE_SAFE_NAME (type));
  
                             error (_("`%s' is not defined as an aggregate type."),
                                    TYPE_SAFE_NAME (type));
  
-                         write_exp_elt_opcode (OP_SCOPE);
-                         write_exp_elt_type (type);
-                         write_exp_string ($3);
-                         write_exp_elt_opcode (OP_SCOPE);
+                         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);
                         }
         |       TYPENAME COLONCOLON '~' name
                         {
                           struct type *type = $1.type;
                           struct stoken tmp_token;
                         }
         |       TYPENAME COLONCOLON '~' name
                         {
                           struct type *type = $1.type;
                           struct stoken tmp_token;
+                         char *buf;
+
                           CHECK_TYPEDEF (type);
                           CHECK_TYPEDEF (type);
-                         if (TYPE_CODE (type) != TYPE_CODE_STRUCT
-                             && TYPE_CODE (type) != TYPE_CODE_UNION
-                             && TYPE_CODE (type) != TYPE_CODE_NAMESPACE)
+                         if (!type_aggregate_p (type))
                             error (_("`%s' is not defined as an aggregate type."),
                                    TYPE_SAFE_NAME (type));
                             error (_("`%s' is not defined as an aggregate type."),
                                    TYPE_SAFE_NAME (type));
-
-                         tmp_token.ptr = (char*) alloca ($4.length + 2);
+                         buf = alloca ($4.length + 2);
+                         tmp_token.ptr = buf;
                           tmp_token.length = $4.length + 1;
                           tmp_token.length = $4.length + 1;
-                         tmp_token.ptr[0] = '~';
-                         memcpy (tmp_token.ptr+1, $4.ptr, $4.length);
-                         tmp_token.ptr[tmp_token.length] = 0;
+                         buf[0] = '~';
+                         memcpy (buf+1, $4.ptr, $4.length);
+                         buf[tmp_token.length] = 0;
  
                           /* Check for valid destructor name.  */
                           destructor_name_p (tmp_token.ptr, $1.type);
  
                           /* Check for valid destructor name.  */
                           destructor_name_p (tmp_token.ptr, $1.type);
-                         write_exp_elt_opcode (OP_SCOPE);
-                         write_exp_elt_type (type);
-                         write_exp_string (tmp_token);
-                         write_exp_elt_opcode (OP_SCOPE);
+                         write_exp_elt_opcode (pstate, OP_SCOPE);
+                         write_exp_elt_type (pstate, type);
+                         write_exp_string (pstate, tmp_token);
+                         write_exp_elt_opcode (pstate, OP_SCOPE);
                         }
         |       TYPENAME COLONCOLON name COLONCOLON name
                         {
                         }
         |       TYPENAME COLONCOLON name COLONCOLON name
                         {
@@ -968,23 +1033,23 @@ variable:        qualified_name
                         {
                           char *name = copy_name ($2.stoken);
                           struct symbol *sym;
                         {
                           char *name = copy_name ($2.stoken);
                           struct symbol *sym;
-                         struct minimal_symbol *msymbol;
+                         struct bound_minimal_symbol msymbol;
  
                           sym =
                             lookup_symbol (name, (const struct block *) NULL,
                                            VAR_DOMAIN, NULL);
                           if (sym)
                             {
  
                           sym =
                             lookup_symbol (name, (const struct block *) NULL,
                                            VAR_DOMAIN, NULL);
                           if (sym)
                             {
-                             write_exp_elt_opcode (OP_VAR_VALUE);
-                             write_exp_elt_block (NULL);
-                             write_exp_elt_sym (sym);
-                             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, sym);
+                             write_exp_elt_opcode (pstate, OP_VAR_VALUE);
                               break;
                             }
  
                               break;
                             }
  
-                         msymbol = lookup_minimal_symbol (name, NULL, NULL);
-                         if (msymbol != NULL)
-                           write_exp_msymbol (msymbol);
+                         msymbol = lookup_bound_minimal_symbol (name);
+                         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 \"file\" command."));
                           else
                           else if (!have_full_symbols () && !have_partial_symbols ())
                             error (_("No symbol table is loaded.  Use the \"file\" command."));
                           else
@@ -1000,18 +1065,18 @@ variable:       name_not_typename
                               if (symbol_read_needs_frame (sym))
                                 {
                                   if (innermost_block == 0
                               if (symbol_read_needs_frame (sym))
                                 {
                                   if (innermost_block == 0
-                                     || contained_in (block_found, 
+                                     || contained_in (block_found,
                                                        innermost_block))
                                     innermost_block = block_found;
                                 }
  
                                                        innermost_block))
                                     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.  */
                               /* 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 if ($1.is_a_field_of_this)
                             {
                             }
                           else if ($1.is_a_field_of_this)
                             {
@@ -1022,21 +1087,21 @@ variable:       name_not_typename
                                   || contained_in (block_found,
                                                    innermost_block))
                                 innermost_block = block_found;
                                   || contained_in (block_found,
                                                    innermost_block))
                                 innermost_block = block_found;
-                             write_exp_elt_opcode (OP_THIS);
-                             write_exp_elt_opcode (OP_THIS);
-                             write_exp_elt_opcode (STRUCTOP_PTR);
-                             write_exp_string ($1.stoken);
-                             write_exp_elt_opcode (STRUCTOP_PTR);
+                             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);
                             }
                           else
                             {
                             }
                           else
                             {
-                             struct minimal_symbol *msymbol;
+                             struct bound_minimal_symbol msymbol;
                               char *arg = copy_name ($1.stoken);
  
                               msymbol =
                               char *arg = copy_name ($1.stoken);
  
                               msymbol =
-                               lookup_minimal_symbol (arg, NULL, NULL);
-                             if (msymbol != NULL)
-                               write_exp_msymbol (msymbol);
+                               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 \"file\" command."));
                               else
                               else if (!have_full_symbols () && !have_partial_symbols ())
                                 error (_("No symbol table is loaded.  Use the \"file\" command."));
                               else
@@ -1047,7 +1112,7 @@ variable: name_not_typename
         ;
  
  space_identifier : '@' NAME
         ;
  
  space_identifier : '@' NAME
-               { insert_type_address_space (copy_name ($2.stoken)); }
+               { insert_type_address_space (pstate, copy_name ($2.stoken)); }
         ;
  
  const_or_volatile: const_or_volatile_noopt
         ;
  
  const_or_volatile: const_or_volatile_noopt
@@ -1058,10 +1123,10 @@ cv_with_space_id : const_or_volatile space_identifier const_or_volatile
         ;
  
  const_or_volatile_or_space_identifier_noopt: cv_with_space_id
         ;
  
  const_or_volatile_or_space_identifier_noopt: cv_with_space_id
-       | const_or_volatile_noopt 
+       | const_or_volatile_noopt
         ;
  
         ;
  
-const_or_volatile_or_space_identifier: 
+const_or_volatile_or_space_identifier:
                 const_or_volatile_or_space_identifier_noopt
         |
         ;
                 const_or_volatile_or_space_identifier_noopt
         |
         ;
@@ -1070,7 +1135,7 @@ ptr_operator:
                 ptr_operator '*'
                         { insert_type (tp_pointer); }
                 const_or_volatile_or_space_identifier
                 ptr_operator '*'
                         { insert_type (tp_pointer); }
                 const_or_volatile_or_space_identifier
-       |       '*' 
+       |       '*'
                         { insert_type (tp_pointer); }
                 const_or_volatile_or_space_identifier
         |       '&'
                         { insert_type (tp_pointer); }
                 const_or_volatile_or_space_identifier
         |       '&'
@@ -1090,7 +1155,7 @@ ptr_operator_ts: ptr_operator
  
  abs_decl:      ptr_operator_ts direct_abs_decl
                         { $$ = append_type_stack ($2, $1); }
  
  abs_decl:      ptr_operator_ts direct_abs_decl
                         { $$ = append_type_stack ($2, $1); }
-       |       ptr_operator_ts 
+       |       ptr_operator_ts
         |       direct_abs_decl
         ;
  
         |       direct_abs_decl
         ;
  
@@ -1154,117 +1219,121 @@ typebase  /* Implements (approximately): (type-qualifier)* type-specifier */
         :       TYPENAME
                         { $$ = $1.type; }
         |       INT_KEYWORD
         :       TYPENAME
                         { $$ = $1.type; }
         |       INT_KEYWORD
-                       { $$ = lookup_signed_typename (parse_language,
-                                                      parse_gdbarch,
+                       { $$ = lookup_signed_typename (parse_language (pstate),
+                                                      parse_gdbarch (pstate),
                                                        "int"); }
         |       LONG
                                                        "int"); }
         |       LONG
-                       { $$ = lookup_signed_typename (parse_language,
-                                                      parse_gdbarch,
+                       { $$ = lookup_signed_typename (parse_language (pstate),
+                                                      parse_gdbarch (pstate),
                                                        "long"); }
         |       SHORT
                                                        "long"); }
         |       SHORT
-                       { $$ = lookup_signed_typename (parse_language,
-                                                      parse_gdbarch,
+                       { $$ = lookup_signed_typename (parse_language (pstate),
+                                                      parse_gdbarch (pstate),
                                                        "short"); }
         |       LONG INT_KEYWORD
                                                        "short"); }
         |       LONG INT_KEYWORD
-                       { $$ = lookup_signed_typename (parse_language,
-                                                      parse_gdbarch,
+                       { $$ = lookup_signed_typename (parse_language (pstate),
+                                                      parse_gdbarch (pstate),
                                                        "long"); }
         |       LONG SIGNED_KEYWORD INT_KEYWORD
                                                        "long"); }
         |       LONG SIGNED_KEYWORD INT_KEYWORD
-                       { $$ = lookup_signed_typename (parse_language,
-                                                      parse_gdbarch,
+                       { $$ = lookup_signed_typename (parse_language (pstate),
+                                                      parse_gdbarch (pstate),
                                                        "long"); }
         |       LONG SIGNED_KEYWORD
                                                        "long"); }
         |       LONG SIGNED_KEYWORD
-                       { $$ = lookup_signed_typename (parse_language,
-                                                      parse_gdbarch,
+                       { $$ = lookup_signed_typename (parse_language (pstate),
+                                                      parse_gdbarch (pstate),
                                                        "long"); }
         |       SIGNED_KEYWORD LONG INT_KEYWORD
                                                        "long"); }
         |       SIGNED_KEYWORD LONG INT_KEYWORD
-                       { $$ = lookup_signed_typename (parse_language,
-                                                      parse_gdbarch,
+                       { $$ = lookup_signed_typename (parse_language (pstate),
+                                                      parse_gdbarch (pstate),
                                                        "long"); }
         |       UNSIGNED LONG INT_KEYWORD
                                                        "long"); }
         |       UNSIGNED LONG INT_KEYWORD
-                       { $$ = lookup_unsigned_typename (parse_language,
-                                                        parse_gdbarch,
+                       { $$ = lookup_unsigned_typename (parse_language (pstate),
+                                                        parse_gdbarch (pstate),
                                                          "long"); }
         |       LONG UNSIGNED INT_KEYWORD
                                                          "long"); }
         |       LONG UNSIGNED INT_KEYWORD
-                       { $$ = lookup_unsigned_typename (parse_language,
-                                                        parse_gdbarch,
+                       { $$ = lookup_unsigned_typename (parse_language (pstate),
+                                                        parse_gdbarch (pstate),
                                                          "long"); }
         |       LONG UNSIGNED
                                                          "long"); }
         |       LONG UNSIGNED
-                       { $$ = lookup_unsigned_typename (parse_language,
-                                                        parse_gdbarch,
+                       { $$ = lookup_unsigned_typename (parse_language (pstate),
+                                                        parse_gdbarch (pstate),
                                                          "long"); }
         |       LONG LONG
                                                          "long"); }
         |       LONG LONG
-                       { $$ = lookup_signed_typename (parse_language,
-                                                      parse_gdbarch,
+                       { $$ = lookup_signed_typename (parse_language (pstate),
+                                                      parse_gdbarch (pstate),
                                                        "long long"); }
         |       LONG LONG INT_KEYWORD
                                                        "long long"); }
         |       LONG LONG INT_KEYWORD
-                       { $$ = lookup_signed_typename (parse_language,
-                                                      parse_gdbarch,
+                       { $$ = lookup_signed_typename (parse_language (pstate),
+                                                      parse_gdbarch (pstate),
                                                        "long long"); }
         |       LONG LONG SIGNED_KEYWORD INT_KEYWORD
                                                        "long long"); }
         |       LONG LONG SIGNED_KEYWORD INT_KEYWORD
-                       { $$ = lookup_signed_typename (parse_language,
-                                                      parse_gdbarch,
+                       { $$ = lookup_signed_typename (parse_language (pstate),
+                                                      parse_gdbarch (pstate),
                                                        "long long"); }
         |       LONG LONG SIGNED_KEYWORD
                                                        "long long"); }
         |       LONG LONG SIGNED_KEYWORD
-                       { $$ = lookup_signed_typename (parse_language,
-                                                      parse_gdbarch,
+                       { $$ = lookup_signed_typename (parse_language (pstate),
+                                                      parse_gdbarch (pstate),
                                                        "long long"); }
         |       SIGNED_KEYWORD LONG LONG
                                                        "long long"); }
         |       SIGNED_KEYWORD LONG LONG
-                       { $$ = lookup_signed_typename (parse_language,
-                                                      parse_gdbarch,
+                       { $$ = lookup_signed_typename (parse_language (pstate),
+                                                      parse_gdbarch (pstate),
                                                        "long long"); }
         |       SIGNED_KEYWORD LONG LONG INT_KEYWORD
                                                        "long long"); }
         |       SIGNED_KEYWORD LONG LONG INT_KEYWORD
-                       { $$ = lookup_signed_typename (parse_language,
-                                                      parse_gdbarch,
+                       { $$ = lookup_signed_typename (parse_language (pstate),
+                                                      parse_gdbarch (pstate),
                                                        "long long"); }
         |       UNSIGNED LONG LONG
                                                        "long long"); }
         |       UNSIGNED LONG LONG
-                       { $$ = lookup_unsigned_typename (parse_language,
-                                                        parse_gdbarch,
+                       { $$ = lookup_unsigned_typename (parse_language (pstate),
+                                                        parse_gdbarch (pstate),
                                                          "long long"); }
         |       UNSIGNED LONG LONG INT_KEYWORD
                                                          "long long"); }
         |       UNSIGNED LONG LONG INT_KEYWORD
-                       { $$ = lookup_unsigned_typename (parse_language,
-                                                        parse_gdbarch,
+                       { $$ = lookup_unsigned_typename (parse_language (pstate),
+                                                        parse_gdbarch (pstate),
                                                          "long long"); }
         |       LONG LONG UNSIGNED
                                                          "long long"); }
         |       LONG LONG UNSIGNED
-                       { $$ = lookup_unsigned_typename (parse_language,
-                                                        parse_gdbarch,
+                       { $$ = lookup_unsigned_typename (parse_language (pstate),
+                                                        parse_gdbarch (pstate),
                                                          "long long"); }
         |       LONG LONG UNSIGNED INT_KEYWORD
                                                          "long long"); }
         |       LONG LONG UNSIGNED INT_KEYWORD
-                       { $$ = lookup_unsigned_typename (parse_language,
-                                                        parse_gdbarch,
+                       { $$ = lookup_unsigned_typename (parse_language (pstate),
+                                                        parse_gdbarch (pstate),
                                                          "long long"); }
         |       SHORT INT_KEYWORD
                                                          "long long"); }
         |       SHORT INT_KEYWORD
-                       { $$ = lookup_signed_typename (parse_language,
-                                                      parse_gdbarch,
+                       { $$ = lookup_signed_typename (parse_language (pstate),
+                                                      parse_gdbarch (pstate),
                                                        "short"); }
         |       SHORT SIGNED_KEYWORD INT_KEYWORD
                                                        "short"); }
         |       SHORT SIGNED_KEYWORD INT_KEYWORD
-                       { $$ = lookup_signed_typename (parse_language,
-                                                      parse_gdbarch,
+                       { $$ = lookup_signed_typename (parse_language (pstate),
+                                                      parse_gdbarch (pstate),
                                                        "short"); }
         |       SHORT SIGNED_KEYWORD
                                                        "short"); }
         |       SHORT SIGNED_KEYWORD
-                       { $$ = lookup_signed_typename (parse_language,
-                                                      parse_gdbarch,
+                       { $$ = lookup_signed_typename (parse_language (pstate),
+                                                      parse_gdbarch (pstate),
                                                        "short"); }
         |       UNSIGNED SHORT INT_KEYWORD
                                                        "short"); }
         |       UNSIGNED SHORT INT_KEYWORD
-                       { $$ = lookup_unsigned_typename (parse_language,
-                                                        parse_gdbarch,
+                       { $$ = lookup_unsigned_typename (parse_language (pstate),
+                                                        parse_gdbarch (pstate),
                                                          "short"); }
                                                          "short"); }
-       |       SHORT UNSIGNED 
-                       { $$ = lookup_unsigned_typename (parse_language,
-                                                        parse_gdbarch,
+       |       SHORT UNSIGNED
+                       { $$ = lookup_unsigned_typename (parse_language (pstate),
+                                                        parse_gdbarch (pstate),
                                                          "short"); }
         |       SHORT UNSIGNED INT_KEYWORD
                                                          "short"); }
         |       SHORT UNSIGNED INT_KEYWORD
-                       { $$ = lookup_unsigned_typename (parse_language,
-                                                        parse_gdbarch,
+                       { $$ = lookup_unsigned_typename (parse_language (pstate),
+                                                        parse_gdbarch (pstate),
                                                          "short"); }
         |       DOUBLE_KEYWORD
                                                          "short"); }
         |       DOUBLE_KEYWORD
-                       { $$ = lookup_typename (parse_language, parse_gdbarch,
-                                               "double", (struct block *) NULL,
+                       { $$ = lookup_typename (parse_language (pstate),
+                                               parse_gdbarch (pstate),
+                                               "double",
+                                               (struct block *) NULL,
                                                 0); }
         |       LONG DOUBLE_KEYWORD
                                                 0); }
         |       LONG DOUBLE_KEYWORD
-                       { $$ = lookup_typename (parse_language, parse_gdbarch,
+                       { $$ = lookup_typename (parse_language (pstate),
+                                               parse_gdbarch (pstate),
                                                 "long double",
                                                 "long double",
-                                               (struct block *) NULL, 0); }
+                                               (struct block *) NULL,
+                                               0); }
         |       STRUCT name
                         { $$ = lookup_struct (copy_name ($2),
                                               expression_context_block); }
         |       STRUCT name
                         { $$ = lookup_struct (copy_name ($2),
                                               expression_context_block); }
@@ -1284,12 +1353,12 @@ typebase  /* Implements (approximately): (type-qualifier)* type-specifier */
                                               expression_context_block); }
         |       CLASS COMPLETE
                         {
                                               expression_context_block); }
         |       CLASS COMPLETE
                         {
-                         mark_completion_tag (TYPE_CODE_CLASS, "", 0);
+                         mark_completion_tag (TYPE_CODE_STRUCT, "", 0);
                           $$ = NULL;
                         }
         |       CLASS name COMPLETE
                         {
                           $$ = NULL;
                         }
         |       CLASS name COMPLETE
                         {
-                         mark_completion_tag (TYPE_CODE_CLASS, $2.ptr,
+                         mark_completion_tag (TYPE_CODE_STRUCT, $2.ptr,
                                                $2.length);
                           $$ = NULL;
                         }
                                                $2.length);
                           $$ = NULL;
                         }
@@ -1321,58 +1390,58 @@ typebase  /* Implements (approximately): (type-qualifier)* type-specifier */
                                                $2.length);
                           $$ = NULL;
                         }
                                                $2.length);
                           $$ = NULL;
                         }
-       |       UNSIGNED typename
-                       { $$ = lookup_unsigned_typename (parse_language,
-                                                        parse_gdbarch,
+       |       UNSIGNED type_name
+                       { $$ = lookup_unsigned_typename (parse_language (pstate),
+                                                        parse_gdbarch (pstate),
                                                          TYPE_NAME($2.type)); }
         |       UNSIGNED
                                                          TYPE_NAME($2.type)); }
         |       UNSIGNED
-                       { $$ = lookup_unsigned_typename (parse_language,
-                                                        parse_gdbarch,
+                       { $$ = lookup_unsigned_typename (parse_language (pstate),
+                                                        parse_gdbarch (pstate),
                                                          "int"); }
                                                          "int"); }
-       |       SIGNED_KEYWORD typename
-                       { $$ = lookup_signed_typename (parse_language,
-                                                      parse_gdbarch,
+       |       SIGNED_KEYWORD type_name
+                       { $$ = lookup_signed_typename (parse_language (pstate),
+                                                      parse_gdbarch (pstate),
                                                        TYPE_NAME($2.type)); }
         |       SIGNED_KEYWORD
                                                        TYPE_NAME($2.type)); }
         |       SIGNED_KEYWORD
-                       { $$ = lookup_signed_typename (parse_language,
-                                                      parse_gdbarch,
+                       { $$ = lookup_signed_typename (parse_language (pstate),
+                                                      parse_gdbarch (pstate),
                                                        "int"); }
                  /* It appears that this rule for templates is never
                     reduced; template recognition happens by lookahead
                                                        "int"); }
                  /* It appears that this rule for templates is never
                     reduced; template recognition happens by lookahead
-                   in the token processing code in yylex. */         
+                   in the token processing code in yylex. */
         |       TEMPLATE name '<' type '>'
                         { $$ = lookup_template_type(copy_name($2), $4,
                                                     expression_context_block);
                         }
         |       TEMPLATE name '<' type '>'
                         { $$ = lookup_template_type(copy_name($2), $4,
                                                     expression_context_block);
                         }
-       | const_or_volatile_or_space_identifier_noopt typebase 
+       | const_or_volatile_or_space_identifier_noopt typebase
                         { $$ = follow_types ($2); }
                         { $$ = follow_types ($2); }
-       | typebase const_or_volatile_or_space_identifier_noopt 
+       | typebase const_or_volatile_or_space_identifier_noopt
                         { $$ = follow_types ($1); }
         ;
  
                         { $$ = follow_types ($1); }
         ;
  
-typename:      TYPENAME
+type_name:     TYPENAME
         |       INT_KEYWORD
                 {
                   $$.stoken.ptr = "int";
                   $$.stoken.length = 3;
         |       INT_KEYWORD
                 {
                   $$.stoken.ptr = "int";
                   $$.stoken.length = 3;
-                 $$.type = lookup_signed_typename (parse_language,
-                                                   parse_gdbarch,
+                 $$.type = lookup_signed_typename (parse_language (pstate),
+                                                   parse_gdbarch (pstate),
                                                     "int");
                 }
         |       LONG
                 {
                   $$.stoken.ptr = "long";
                   $$.stoken.length = 4;
                                                     "int");
                 }
         |       LONG
                 {
                   $$.stoken.ptr = "long";
                   $$.stoken.length = 4;
-                 $$.type = lookup_signed_typename (parse_language,
-                                                   parse_gdbarch,
+                 $$.type = lookup_signed_typename (parse_language (pstate),
+                                                   parse_gdbarch (pstate),
                                                     "long");
                 }
         |       SHORT
                 {
                   $$.stoken.ptr = "short";
                   $$.stoken.length = 5;
                                                     "long");
                 }
         |       SHORT
                 {
                   $$.stoken.ptr = "short";
                   $$.stoken.length = 5;
-                 $$.type = lookup_signed_typename (parse_language,
-                                                   parse_gdbarch,
+                 $$.type = lookup_signed_typename (parse_language (pstate),
+                                                   parse_gdbarch (pstate),
                                                     "short");
                 }
         ;
                                                     "short");
                 }
         ;
@@ -1422,9 +1491,9 @@ const_and_volatile:       CONST_KEYWORD VOLATILE_KEYWORD
         |               VOLATILE_KEYWORD CONST_KEYWORD
         ;
  
         |               VOLATILE_KEYWORD CONST_KEYWORD
         ;
  
-const_or_volatile_noopt:       const_and_volatile 
+const_or_volatile_noopt:       const_and_volatile
                         { insert_type (tp_const);
                         { insert_type (tp_const);
-                         insert_type (tp_volatile); 
+                         insert_type (tp_volatile);
                         }
         |               CONST_KEYWORD
                         { insert_type (tp_const); }
                         }
         |               CONST_KEYWORD
                         { insert_type (tp_const); }
@@ -1432,7 +1501,7 @@ const_or_volatile_noopt:          const_and_volatile
                         { insert_type (tp_volatile); }
         ;
  
                         { insert_type (tp_volatile); }
         ;
  
-operator:      OPERATOR NEW
+oper:  OPERATOR NEW
                         { $$ = operator_stoken (" new"); }
         |       OPERATOR DELETE
                         { $$ = operator_stoken (" delete"); }
                         { $$ = operator_stoken (" new"); }
         |       OPERATOR DELETE
                         { $$ = operator_stoken (" delete"); }
@@ -1563,7 +1632,7 @@ name      :       NAME { $$ = $1.stoken; }
         |       TYPENAME { $$ = $1.stoken; }
         |       NAME_OR_INT  { $$ = $1.stoken; }
         |       UNKNOWN_CPP_NAME  { $$ = $1.stoken; }
         |       TYPENAME { $$ = $1.stoken; }
         |       NAME_OR_INT  { $$ = $1.stoken; }
         |       UNKNOWN_CPP_NAME  { $$ = $1.stoken; }
-       |       operator { $$ = $1; }
+       |       oper { $$ = $1; }
         ;
  
  name_not_typename :    NAME
         ;
  
  name_not_typename :    NAME
@@ -1575,7 +1644,7 @@ name_not_typename :       NAME
     context where only a name could occur, this might be useful.
         |       NAME_OR_INT
   */
     context where only a name could occur, this might be useful.
         |       NAME_OR_INT
   */
-       |       operator
+       |       oper
                         {
                           struct field_of_this_result is_a_field_of_this;
  
                         {
                           struct field_of_this_result is_a_field_of_this;
  
@@ -1592,23 +1661,55 @@ name_not_typename :     NAME
  
  %%
  
  
  %%
  
+/* Like write_exp_string, but prepends a '~'.  */
+
+static void
+write_destructor_name (struct parser_state *par_state, struct stoken token)
+{
+  char *copy = alloca (token.length + 1);
+
+  copy[0] = '~';
+  memcpy (&copy[1], token.ptr, token.length);
+
+  token.ptr = copy;
+  ++token.length;
+
+  write_exp_string (par_state, token);
+}
+
  /* Returns a stoken of the operator name given by OP (which does not
  /* Returns a stoken of the operator name given by OP (which does not
-   include the string "operator").  */ 
+   include the string "operator").  */
+
  static struct stoken
  operator_stoken (const char *op)
  {
    static const char *operator_string = "operator";
    struct stoken st = { NULL, 0 };
  static struct stoken
  operator_stoken (const char *op)
  {
    static const char *operator_string = "operator";
    struct stoken st = { NULL, 0 };
+  char *buf;
+
    st.length = strlen (operator_string) + strlen (op);
    st.length = strlen (operator_string) + strlen (op);
-  st.ptr = malloc (st.length + 1);
-  strcpy (st.ptr, operator_string);
-  strcat (st.ptr, op);
+  buf = malloc (st.length + 1);
+  strcpy (buf, operator_string);
+  strcat (buf, op);
+  st.ptr = buf;
  
    /* The toplevel (c_parse) will free the memory allocated here.  */
  
    /* The toplevel (c_parse) will free the memory allocated here.  */
-  make_cleanup (free, st.ptr);
+  make_cleanup (free, buf);
    return st;
  };
  
    return st;
  };
  
+/* Return true if the type is aggregate-like.  */
+
+static int
+type_aggregate_p (struct type *type)
+{
+  return (TYPE_CODE (type) == TYPE_CODE_STRUCT
+         || TYPE_CODE (type) == TYPE_CODE_UNION
+         || TYPE_CODE (type) == TYPE_CODE_NAMESPACE
+         || (TYPE_CODE (type) == TYPE_CODE_ENUM
+             && TYPE_DECLARED_CLASS (type)));
+}
+
  /* Validate a parameter typelist.  */
  
  static void
  /* Validate a parameter typelist.  */
  
  static void
@@ -1647,7 +1748,8 @@ check_parameter_typelist (VEC (type_ptr) *params)
  /*** Needs some error checking for the float case ***/
  
  static int
  /*** Needs some error checking for the float case ***/
  
  static int
-parse_number (char *p, int len, int parsed_float, YYSTYPE *putithere)
+parse_number (struct parser_state *par_state,
+             const char *buf, 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.  */
  {
    /* 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.  */
@@ -1669,6 +1771,10 @@ parse_number (char *p, int len, int parsed_float, YYSTYPE *putithere)
    ULONGEST high_bit;
    struct type *signed_type;
    struct type *unsigned_type;
    ULONGEST high_bit;
    struct type *signed_type;
    struct type *unsigned_type;
+  char *p;
+
+  p = alloca (len);
+  memcpy (p, buf, len);
  
    if (parsed_float)
      {
  
    if (parsed_float)
      {
@@ -1679,9 +1785,10 @@ parse_number (char *p, int len, int parsed_float, YYSTYPE *putithere)
         {
           p[len - 2] = '\0';
           putithere->typed_val_decfloat.type
         {
           p[len - 2] = '\0';
           putithere->typed_val_decfloat.type
-           = parse_type->builtin_decfloat;
+           = parse_type (par_state)->builtin_decfloat;
           decimal_from_string (putithere->typed_val_decfloat.val, 4,
           decimal_from_string (putithere->typed_val_decfloat.val, 4,
-                              gdbarch_byte_order (parse_gdbarch), p);
+                              gdbarch_byte_order (parse_gdbarch (par_state)),
+                              p);
           p[len - 2] = 'd';
           return DECFLOAT;
         }
           p[len - 2] = 'd';
           return DECFLOAT;
         }
@@ -1690,9 +1797,10 @@ parse_number (char *p, int len, int parsed_float, YYSTYPE *putithere)
         {
           p[len - 2] = '\0';
           putithere->typed_val_decfloat.type
         {
           p[len - 2] = '\0';
           putithere->typed_val_decfloat.type
-           = parse_type->builtin_decdouble;
+           = parse_type (par_state)->builtin_decdouble;
           decimal_from_string (putithere->typed_val_decfloat.val, 8,
           decimal_from_string (putithere->typed_val_decfloat.val, 8,
-                              gdbarch_byte_order (parse_gdbarch), p);
+                              gdbarch_byte_order (parse_gdbarch (par_state)),
+                              p);
           p[len - 2] = 'd';
           return DECFLOAT;
         }
           p[len - 2] = 'd';
           return DECFLOAT;
         }
@@ -1701,14 +1809,15 @@ parse_number (char *p, int len, int parsed_float, YYSTYPE *putithere)
         {
           p[len - 2] = '\0';
           putithere->typed_val_decfloat.type
         {
           p[len - 2] = '\0';
           putithere->typed_val_decfloat.type
-           = parse_type->builtin_declong;
+           = parse_type (par_state)->builtin_declong;
           decimal_from_string (putithere->typed_val_decfloat.val, 16,
           decimal_from_string (putithere->typed_val_decfloat.val, 16,
-                              gdbarch_byte_order (parse_gdbarch), p);
+                              gdbarch_byte_order (parse_gdbarch (par_state)),
+                              p);
           p[len - 2] = 'd';
           return DECFLOAT;
         }
  
           p[len - 2] = 'd';
           return DECFLOAT;
         }
  
-      if (! parse_c_float (parse_gdbarch, p, len,
+      if (! parse_c_float (parse_gdbarch (par_state), p, len,
                            &putithere->typed_val_float.dval,
                            &putithere->typed_val_float.type))
         return ERROR;
                            &putithere->typed_val_float.dval,
                            &putithere->typed_val_float.type))
         return ERROR;
@@ -1716,7 +1825,7 @@ parse_number (char *p, int len, int parsed_float, YYSTYPE *putithere)
      }
  
    /* Handle base-switching prefixes 0x, 0t, 0d, 0 */
      }
  
    /* Handle base-switching prefixes 0x, 0t, 0d, 0 */
-  if (p[0] == '0')
+  if (p[0] == '0' && len > 1)
      switch (p[1])
        {
        case 'x':
      switch (p[1])
        {
        case 'x':
@@ -1824,9 +1933,10 @@ parse_number (char *p, int len, int parsed_float, YYSTYPE *putithere)
  
    un = (ULONGEST)n >> 2;
    if (long_p == 0
  
    un = (ULONGEST)n >> 2;
    if (long_p == 0
-      && (un >> (gdbarch_int_bit (parse_gdbarch) - 2)) == 0)
+      && (un >> (gdbarch_int_bit (parse_gdbarch (par_state)) - 2)) == 0)
      {
      {
-      high_bit = ((ULONGEST)1) << (gdbarch_int_bit (parse_gdbarch) - 1);
+      high_bit
+       = ((ULONGEST)1) << (gdbarch_int_bit (parse_gdbarch (par_state)) - 1);
  
        /* A large decimal (not hex or octal) constant (between INT_MAX
          and UINT_MAX) is a long or unsigned long, according to ANSI,
  
        /* A large decimal (not hex or octal) constant (between INT_MAX
          and UINT_MAX) is a long or unsigned long, according to ANSI,
@@ -1834,28 +1944,29 @@ parse_number (char *p, int len, int parsed_float, YYSTYPE *putithere)
          int.  This probably should be fixed.  GCC gives a warning on
          such constants.  */
  
          int.  This probably should be fixed.  GCC gives a warning on
          such constants.  */
  
-      unsigned_type = parse_type->builtin_unsigned_int;
-      signed_type = parse_type->builtin_int;
+      unsigned_type = parse_type (par_state)->builtin_unsigned_int;
+      signed_type = parse_type (par_state)->builtin_int;
      }
    else if (long_p <= 1
      }
    else if (long_p <= 1
-          && (un >> (gdbarch_long_bit (parse_gdbarch) - 2)) == 0)
+          && (un >> (gdbarch_long_bit (parse_gdbarch (par_state)) - 2)) == 0)
      {
      {
-      high_bit = ((ULONGEST)1) << (gdbarch_long_bit (parse_gdbarch) - 1);
-      unsigned_type = parse_type->builtin_unsigned_long;
-      signed_type = parse_type->builtin_long;
+      high_bit
+       = ((ULONGEST)1) << (gdbarch_long_bit (parse_gdbarch (par_state)) - 1);
+      unsigned_type = parse_type (par_state)->builtin_unsigned_long;
+      signed_type = parse_type (par_state)->builtin_long;
      }
    else
      {
        int shift;
      }
    else
      {
        int shift;
-      if (sizeof (ULONGEST) * HOST_CHAR_BIT 
-         < gdbarch_long_long_bit (parse_gdbarch))
+      if (sizeof (ULONGEST) * HOST_CHAR_BIT
+         < gdbarch_long_long_bit (parse_gdbarch (par_state)))
         /* A long long does not fit in a LONGEST.  */
         shift = (sizeof (ULONGEST) * HOST_CHAR_BIT - 1);
        else
         /* A long long does not fit in a LONGEST.  */
         shift = (sizeof (ULONGEST) * HOST_CHAR_BIT - 1);
        else
-       shift = (gdbarch_long_long_bit (parse_gdbarch) - 1);
+       shift = (gdbarch_long_long_bit (parse_gdbarch (par_state)) - 1);
        high_bit = (ULONGEST) 1 << shift;
        high_bit = (ULONGEST) 1 << shift;
-      unsigned_type = parse_type->builtin_unsigned_long_long;
-      signed_type = parse_type->builtin_long_long;
+      unsigned_type = parse_type (par_state)->builtin_unsigned_long_long;
+      signed_type = parse_type (par_state)->builtin_long_long;
      }
  
     putithere->typed_val_int.val = n;
      }
  
     putithere->typed_val_int.val = n;
@@ -1863,11 +1974,11 @@ parse_number (char *p, int len, int parsed_float, YYSTYPE *putithere)
     /* If the high bit of the worked out type is set then this number
        has to be unsigned. */
  
     /* If the high bit of the worked out type is set then this number
        has to be unsigned. */
  
-   if (unsigned_p || (n & high_bit)) 
+   if (unsigned_p || (n & high_bit))
       {
         putithere->typed_val_int.type = unsigned_type;
       }
       {
         putithere->typed_val_int.type = unsigned_type;
       }
-   else 
+   else
       {
         putithere->typed_val_int.type = signed_type;
       }
       {
         putithere->typed_val_int.type = signed_type;
       }
@@ -1889,9 +2000,9 @@ static int tempbuf_init;
     character was emitted, 0 otherwise.  */
  
  int
     character was emitted, 0 otherwise.  */
  
  int
-c_parse_escape (char **ptr, struct obstack *output)
+c_parse_escape (const char **ptr, struct obstack *output)
  {
  {
-  char *tokptr = *ptr;
+  const char *tokptr = *ptr;
    int result = 1;
  
    /* Some escape sequences undergo character set conversion.  Those we
    int result = 1;
  
    /* Some escape sequences undergo character set conversion.  Those we
@@ -2049,9 +2160,10 @@ c_parse_escape (char **ptr, struct obstack *output)
     stored in VALUE.  This returns a token value, either STRING or
     CHAR, depending on what was parsed.  *HOST_CHARS is set to the
     number of host characters in the literal.  */
     stored in VALUE.  This returns a token value, either STRING or
     CHAR, depending on what was parsed.  *HOST_CHARS is set to the
     number of host characters in the literal.  */
+
  static int
  static int
-parse_string_or_char (char *tokptr, char **outptr, struct typed_stoken *value,
-                     int *host_chars)
+parse_string_or_char (const char *tokptr, const char **outptr,
+                     struct typed_stoken *value, int *host_chars)
  {
    int quote;
    enum c_string_type type;
  {
    int quote;
    enum c_string_type type;
@@ -2162,7 +2274,7 @@ enum token_flags
  
  struct token
  {
  
  struct token
  {
-  char *operator;
+  char *oper;
    int token;
    enum exp_opcode opcode;
    enum token_flags flags;
    int token;
    enum exp_opcode opcode;
    enum token_flags flags;
@@ -2247,7 +2359,9 @@ static const struct token ident_tokens[] =
      {"__typeof", TYPEOF, OP_TYPEOF, 0 },
      {"typeof", TYPEOF, OP_TYPEOF, FLAG_SHADOW },
      {"__decltype", DECLTYPE, OP_DECLTYPE, FLAG_CXX },
      {"__typeof", TYPEOF, OP_TYPEOF, 0 },
      {"typeof", TYPEOF, OP_TYPEOF, FLAG_SHADOW },
      {"__decltype", DECLTYPE, OP_DECLTYPE, FLAG_CXX },
-    {"decltype", DECLTYPE, OP_DECLTYPE, FLAG_CXX | FLAG_SHADOW }
+    {"decltype", DECLTYPE, OP_DECLTYPE, FLAG_CXX | FLAG_SHADOW },
+
+    {"typeid", TYPEID, OP_TYPEID, FLAG_CXX}
    };
  
  /* When we find that lexptr (the global var defined in parse.c) is
    };
  
  /* When we find that lexptr (the global var defined in parse.c) is
@@ -2267,7 +2381,7 @@ static const struct token ident_tokens[] =
     we evaluate ADDRESS in the scope of the current frame, but we
     evaluate CONDITION in the scope of the breakpoint's location.  So
     it's simply wrong to try to macro-expand the whole thing at once.  */
     we evaluate ADDRESS in the scope of the current frame, but we
     evaluate CONDITION in the scope of the breakpoint's location.  So
     it's simply wrong to try to macro-expand the whole thing at once.  */
-static char *macro_original_text;
+static const char *macro_original_text;
  
  /* We save all intermediate macro expansions on this obstack for the
     duration of a single parse.  The expansion text may sometimes have
  
  /* We save all intermediate macro expansions on this obstack for the
     duration of a single parse.  The expansion text may sometimes have
@@ -2296,15 +2410,13 @@ scan_macro_expansion (char *expansion)
    lexptr = copy;
  }
  
    lexptr = copy;
  }
  
-
  static int
  scanning_macro_expansion (void)
  {
    return macro_original_text != 0;
  }
  
  static int
  scanning_macro_expansion (void)
  {
    return macro_original_text != 0;
  }
  
-
-static void 
+static void
  finished_macro_expansion (void)
  {
    /* There'd better be something to pop back to.  */
  finished_macro_expansion (void)
  {
    /* There'd better be something to pop back to.  */
@@ -2315,7 +2427,6 @@ finished_macro_expansion (void)
    macro_original_text = 0;
  }
  
    macro_original_text = 0;
  }
  
-
  static void
  scan_macro_cleanup (void *dummy)
  {
  static void
  scan_macro_cleanup (void *dummy)
  {
@@ -2352,16 +2463,17 @@ static int last_was_structop;
  /* Read one token, getting characters through lexptr.  */
  
  static int
  /* Read one token, getting characters through lexptr.  */
  
  static int
-lex_one_token (void)
+lex_one_token (struct parser_state *par_state, int *is_quoted_name)
  {
    int c;
    int namelen;
    unsigned int i;
  {
    int c;
    int namelen;
    unsigned int i;
-  char *tokstart;
+  const char *tokstart;
    int saw_structop = last_was_structop;
    char *copy;
  
    last_was_structop = 0;
    int saw_structop = last_was_structop;
    char *copy;
  
    last_was_structop = 0;
+  *is_quoted_name = 0;
  
   retry:
  
  
   retry:
  
@@ -2381,10 +2493,10 @@ lex_one_token (void)
    tokstart = lexptr;
    /* See if it is a special token of length 3.  */
    for (i = 0; i < sizeof tokentab3 / sizeof tokentab3[0]; i++)
    tokstart = lexptr;
    /* See if it is a special token of length 3.  */
    for (i = 0; i < sizeof tokentab3 / sizeof tokentab3[0]; i++)
-    if (strncmp (tokstart, tokentab3[i].operator, 3) == 0)
+    if (strncmp (tokstart, tokentab3[i].oper, 3) == 0)
        {
         if ((tokentab3[i].flags & FLAG_CXX) != 0
        {
         if ((tokentab3[i].flags & FLAG_CXX) != 0
-           && parse_language->la_language != language_cplus)
+           && parse_language (par_state)->la_language != language_cplus)
           break;
  
         lexptr += 3;
           break;
  
         lexptr += 3;
@@ -2394,10 +2506,10 @@ lex_one_token (void)
  
    /* See if it is a special token of length 2.  */
    for (i = 0; i < sizeof tokentab2 / sizeof tokentab2[0]; i++)
  
    /* See if it is a special token of length 2.  */
    for (i = 0; i < sizeof tokentab2 / sizeof tokentab2[0]; i++)
-    if (strncmp (tokstart, tokentab2[i].operator, 2) == 0)
+    if (strncmp (tokstart, tokentab2[i].oper, 2) == 0)
        {
         if ((tokentab2[i].flags & FLAG_CXX) != 0
        {
         if ((tokentab2[i].flags & FLAG_CXX) != 0
-           && parse_language->la_language != language_cplus)
+           && parse_language (par_state)->la_language != language_cplus)
           break;
  
         lexptr += 2;
           break;
  
         lexptr += 2;
@@ -2441,7 +2553,8 @@ lex_one_token (void)
      case '(':
        paren_depth++;
        lexptr++;
      case '(':
        paren_depth++;
        lexptr++;
-      if (parse_language->la_language == language_objc && c == '[')
+      if (parse_language (par_state)->la_language == language_objc
+         && c == '[')
         return OBJC_LBRAC;
        return c;
  
         return OBJC_LBRAC;
        return c;
  
@@ -2484,7 +2597,7 @@ lex_one_token (void)
        {
         /* It's a number.  */
         int got_dot = 0, got_e = 0, toktype;
        {
         /* It's a number.  */
         int got_dot = 0, got_e = 0, toktype;
-       char *p = tokstart;
+       const char *p = tokstart;
         int hex = input_radix > 10;
  
         if (c == '0' && (p[1] == 'x' || p[1] == 'X'))
         int hex = input_radix > 10;
  
         if (c == '0' && (p[1] == 'x' || p[1] == 'X'))
@@ -2521,7 +2634,8 @@ lex_one_token (void)
                                   && (*p < 'A' || *p > 'Z')))
               break;
           }
                                   && (*p < 'A' || *p > 'Z')))
               break;
           }
-       toktype = parse_number (tokstart, p - tokstart, got_dot|got_e, &yylval);
+       toktype = parse_number (par_state, tokstart, p - tokstart,
+                               got_dot|got_e, &yylval);
          if (toktype == ERROR)
           {
             char *err_copy = (char *) alloca (p - tokstart + 1);
          if (toktype == ERROR)
           {
             char *err_copy = (char *) alloca (p - tokstart + 1);
@@ -2536,10 +2650,10 @@ lex_one_token (void)
  
      case '@':
        {
  
      case '@':
        {
-       char *p = &tokstart[1];
+       const char *p = &tokstart[1];
         size_t len = strlen ("entry");
  
         size_t len = strlen ("entry");
  
-       if (parse_language->la_language == language_objc)
+       if (parse_language (par_state)->la_language == language_objc)
           {
             size_t len = strlen ("selector");
  
           {
             size_t len = strlen ("selector");
  
@@ -2606,6 +2720,8 @@ lex_one_token (void)
               {
                 ++tokstart;
                 namelen = lexptr - tokstart - 1;
               {
                 ++tokstart;
                 namelen = lexptr - tokstart - 1;
+               *is_quoted_name = 1;
+
                 goto tryname;
               }
             else if (host_len > 1)
                 goto tryname;
               }
             else if (host_len > 1)
@@ -2637,8 +2753,8 @@ lex_one_token (void)
                  that we look ahead only when the '<' adjoins non-whitespace
                  characters; for comparison expressions, e.g. "a < b > c",
                  there must be spaces before the '<', etc. */
                  that we look ahead only when the '<' adjoins non-whitespace
                  characters; for comparison expressions, e.g. "a < b > c",
                  there must be spaces before the '<', etc. */
-               
-             char * p = find_template_name_end (tokstart + namelen);
+             const char *p = find_template_name_end (tokstart + namelen);
+
               if (p)
                 namelen = p - tokstart;
             }
               if (p)
                 namelen = p - tokstart;
             }
@@ -2669,7 +2785,8 @@ lex_one_token (void)
        && (tokstart[namelen] == ' ' || tokstart[namelen] == '\t')
        && ! scanning_macro_expansion ())
      {
        && (tokstart[namelen] == ' ' || tokstart[namelen] == '\t')
        && ! scanning_macro_expansion ())
      {
-      char *p = tokstart + namelen + 1;
+      const char *p = tokstart + namelen + 1;
+
        while (*p == ' ' || *p == '\t')
         p++;
        if (*p >= '0' && *p <= '9')
        while (*p == ' ' || *p == '\t')
         p++;
        if (*p >= '0' && *p <= '9')
@@ -2686,10 +2803,10 @@ lex_one_token (void)
    /* Catch specific keywords.  */
    copy = copy_name (yylval.sval);
    for (i = 0; i < sizeof ident_tokens / sizeof ident_tokens[0]; i++)
    /* Catch specific keywords.  */
    copy = copy_name (yylval.sval);
    for (i = 0; i < sizeof ident_tokens / sizeof ident_tokens[0]; i++)
-    if (strcmp (copy, ident_tokens[i].operator) == 0)
+    if (strcmp (copy, ident_tokens[i].oper) == 0)
        {
         if ((ident_tokens[i].flags & FLAG_CXX) != 0
        {
         if ((ident_tokens[i].flags & FLAG_CXX) != 0
-           && parse_language->la_language != language_cplus)
+           && parse_language (par_state)->la_language != language_cplus)
           break;
  
         if ((ident_tokens[i].flags & FLAG_SHADOW) != 0)
           break;
  
         if ((ident_tokens[i].flags & FLAG_SHADOW) != 0)
@@ -2698,8 +2815,8 @@ lex_one_token (void)
  
             if (lookup_symbol (copy, expression_context_block,
                                VAR_DOMAIN,
  
             if (lookup_symbol (copy, expression_context_block,
                                VAR_DOMAIN,
-                              (parse_language->la_language == language_cplus
-                               ? &is_a_field_of_this
+                              (parse_language (par_state)->la_language
+                               == language_cplus ? &is_a_field_of_this
                                 : NULL))
                 != NULL)
               {
                                 : NULL))
                 != NULL)
               {
@@ -2719,6 +2836,10 @@ lex_one_token (void)
  
    if (parse_completion && *lexptr == '\0')
      saw_name_at_eof = 1;
  
    if (parse_completion && *lexptr == '\0')
      saw_name_at_eof = 1;
+
+  yylval.ssym.stoken = yylval.sval;
+  yylval.ssym.sym = NULL;
+  yylval.ssym.is_a_field_of_this = 0;
    return NAME;
  }
  
    return NAME;
  }
  
@@ -2744,10 +2865,13 @@ static struct obstack name_obstack;
  
  /* Classify a NAME token.  The contents of the token are in `yylval'.
     Updates yylval and returns the new token type.  BLOCK is the block
  
  /* Classify a NAME token.  The contents of the token are in `yylval'.
     Updates yylval and returns the new token type.  BLOCK is the block
-   in which lookups start; this can be NULL to mean the global
-   scope.  */
+   in which lookups start; this can be NULL to mean the global scope.
+   IS_QUOTED_NAME is non-zero if the name token was originally quoted
+   in single quotes.  */
+
  static int
  static int
-classify_name (const struct block *block)
+classify_name (struct parser_state *par_state, const struct block *block,
+              int is_quoted_name)
  {
    struct symbol *sym;
    char *copy;
  {
    struct symbol *sym;
    char *copy;
@@ -2759,8 +2883,8 @@ classify_name (const struct block *block)
       we can refer to it unconditionally below.  */
    memset (&is_a_field_of_this, 0, sizeof (is_a_field_of_this));
  
       we can refer to it unconditionally below.  */
    memset (&is_a_field_of_this, 0, sizeof (is_a_field_of_this));
  
-  sym = lookup_symbol (copy, block, VAR_DOMAIN, 
-                      parse_language->la_name_of_this
+  sym = lookup_symbol (copy, block, VAR_DOMAIN,
+                      parse_language (par_state)->la_name_of_this
                        ? &is_a_field_of_this : NULL);
  
    if (sym && SYMBOL_CLASS (sym) == LOC_BLOCK)
                        ? &is_a_field_of_this : NULL);
  
    if (sym && SYMBOL_CLASS (sym) == LOC_BLOCK)
@@ -2771,16 +2895,6 @@ classify_name (const struct block *block)
      }
    else if (!sym)
      {
      }
    else if (!sym)
      {
-      /* See if it's a file name. */
-      struct symtab *symtab;
-
-      symtab = lookup_symtab (copy);
-      if (symtab)
-       {
-         yylval.bval = BLOCKVECTOR_BLOCK (BLOCKVECTOR (symtab), STATIC_BLOCK);
-         return FILENAME;
-       }
-
        /* If we found a field of 'this', we might have erroneously
          found a constructor where we wanted a type name.  Handle this
          case by noticing that we found a constructor and then look up
        /* If we found a field of 'this', we might have erroneously
          found a constructor where we wanted a type name.  Handle this
          case by noticing that we found a constructor and then look up
@@ -2800,6 +2914,24 @@ classify_name (const struct block *block)
               return TYPENAME;
             }
         }
               return TYPENAME;
             }
         }
+
+      /* If we found a field, then we want to prefer it over a
+        filename.  However, if the name was quoted, then it is better
+        to check for a filename or a block, since this is the only
+        way the user has of requiring the extension to be used.  */
+      if (is_a_field_of_this.type == NULL || is_quoted_name)
+       {
+         /* See if it's a file name. */
+         struct symtab *symtab;
+
+         symtab = lookup_symtab (copy);
+         if (symtab)
+           {
+             yylval.bval = BLOCKVECTOR_BLOCK (SYMTAB_BLOCKVECTOR (symtab),
+                                              STATIC_BLOCK);
+             return FILENAME;
+           }
+       }
      }
  
    if (sym && SYMBOL_CLASS (sym) == LOC_TYPEDEF)
      }
  
    if (sym && SYMBOL_CLASS (sym) == LOC_TYPEDEF)
@@ -2808,22 +2940,16 @@ classify_name (const struct block *block)
        return TYPENAME;
      }
  
        return TYPENAME;
      }
  
-  yylval.tsym.type
-    = language_lookup_primitive_type_by_name (parse_language,
-                                             parse_gdbarch, copy);
-  if (yylval.tsym.type != NULL)
-    return TYPENAME;
-
    /* See if it's an ObjC classname.  */
    /* See if it's an ObjC classname.  */
-  if (parse_language->la_language == language_objc && !sym)
+  if (parse_language (par_state)->la_language == language_objc && !sym)
      {
      {
-      CORE_ADDR Class = lookup_objc_class (parse_gdbarch, copy);
+      CORE_ADDR Class = lookup_objc_class (parse_gdbarch (par_state), copy);
        if (Class)
         {
        if (Class)
         {
-         yylval.class.class = Class;
+         yylval.theclass.theclass = Class;
           sym = lookup_struct_typedef (copy, expression_context_block, 1);
           if (sym)
           sym = lookup_struct_typedef (copy, expression_context_block, 1);
           if (sym)
-           yylval.class.type = SYMBOL_TYPE (sym);
+           yylval.theclass.type = SYMBOL_TYPE (sym);
           return CLASSNAME;
         }
      }
           return CLASSNAME;
         }
      }
@@ -2836,7 +2962,8 @@ classify_name (const struct block *block)
           || (copy[0] >= 'A' && copy[0] < 'A' + input_radix - 10)))
      {
        YYSTYPE newlval; /* Its value is ignored.  */
           || (copy[0] >= 'A' && copy[0] < 'A' + input_radix - 10)))
      {
        YYSTYPE newlval; /* Its value is ignored.  */
-      int hextype = parse_number (copy, yylval.sval.length, 0, &newlval);
+      int hextype = parse_number (par_state, copy, yylval.sval.length,
+                                 0, &newlval);
        if (hextype == INT)
         {
           yylval.ssym.sym = sym;
        if (hextype == INT)
         {
           yylval.ssym.sym = sym;
@@ -2850,50 +2977,75 @@ classify_name (const struct block *block)
    yylval.ssym.is_a_field_of_this = is_a_field_of_this.type != NULL;
  
    if (sym == NULL
    yylval.ssym.is_a_field_of_this = is_a_field_of_this.type != NULL;
  
    if (sym == NULL
-      && parse_language->la_language == language_cplus
+      && parse_language (par_state)->la_language == language_cplus
        && is_a_field_of_this.type == NULL
        && is_a_field_of_this.type == NULL
-      && !lookup_minimal_symbol (copy, NULL, NULL))
+      && lookup_minimal_symbol (copy, NULL, NULL).minsym == NULL)
      return UNKNOWN_CPP_NAME;
  
    return NAME;
  }
  
  /* Like classify_name, but used by the inner loop of the lexer, when a
      return UNKNOWN_CPP_NAME;
  
    return NAME;
  }
  
  /* Like classify_name, but used by the inner loop of the lexer, when a
-   name might have already been seen.  FIRST_NAME is true if the token
-   in `yylval' is the first component of a name, false otherwise.  */
+   name might have already been seen.  CONTEXT is the context type, or
+   NULL if this is the first component of a name.  */
  
  static int
  
  static int
-classify_inner_name (const struct block *block, int first_name)
+classify_inner_name (struct parser_state *par_state,
+                    const struct block *block, struct type *context)
  {
    struct type *type;
    char *copy;
  
  {
    struct type *type;
    char *copy;
  
-  if (first_name)
-    return classify_name (block);
+  if (context == NULL)
+    return classify_name (par_state, block, 0);
  
  
-  type = check_typedef (yylval.tsym.type);
-  if (TYPE_CODE (type) != TYPE_CODE_STRUCT
-      && TYPE_CODE (type) != TYPE_CODE_UNION
-      && TYPE_CODE (type) != TYPE_CODE_NAMESPACE)
+  type = check_typedef (context);
+  if (!type_aggregate_p (type))
      return ERROR;
  
      return ERROR;
  
-  copy = copy_name (yylval.tsym.stoken);
-  yylval.ssym.sym = cp_lookup_nested_symbol (yylval.tsym.type, copy, block);
+  copy = copy_name (yylval.ssym.stoken);
+  /* N.B. We assume the symbol can only be in VAR_DOMAIN.  */
+  yylval.ssym.sym = cp_lookup_nested_symbol (type, copy, block, VAR_DOMAIN);
+
+  /* If no symbol was found, search for a matching base class named
+     COPY.  This will allow users to enter qualified names of class members
+     relative to the `this' pointer.  */
    if (yylval.ssym.sym == NULL)
    if (yylval.ssym.sym == NULL)
-    return ERROR;
+    {
+      struct type *base_type = cp_find_type_baseclass_by_name (type, copy);
+
+      if (base_type != NULL)
+       {
+         yylval.tsym.type = base_type;
+         return TYPENAME;
+       }
+
+      return ERROR;
+    }
  
    switch (SYMBOL_CLASS (yylval.ssym.sym))
      {
      case LOC_BLOCK:
      case LOC_LABEL:
  
    switch (SYMBOL_CLASS (yylval.ssym.sym))
      {
      case LOC_BLOCK:
      case LOC_LABEL:
+      /* cp_lookup_nested_symbol might have accidentally found a constructor
+        named COPY when we really wanted a base class of the same name.
+        Double-check this case by looking for a base class.  */
+      {
+       struct type *base_type = cp_find_type_baseclass_by_name (type, copy);
+
+       if (base_type != NULL)
+         {
+           yylval.tsym.type = base_type;
+           return TYPENAME;
+         }
+      }
        return ERROR;
  
      case LOC_TYPEDEF:
        return ERROR;
  
      case LOC_TYPEDEF:
-      yylval.tsym.type = SYMBOL_TYPE (yylval.ssym.sym);;
+      yylval.tsym.type = SYMBOL_TYPE (yylval.ssym.sym);
        return TYPENAME;
  
      default:
        return TYPENAME;
  
      default:
-      yylval.ssym.is_a_field_of_this = 0;
        return NAME;
      }
    internal_error (__FILE__, __LINE__, _("not reached"));
        return NAME;
      }
    internal_error (__FILE__, __LINE__, _("not reached"));
@@ -2905,72 +3057,117 @@ classify_inner_name (const struct block *block, int first_name)
     problem in our parsing approach, where the parser could not
     distinguish between qualified names and qualified types at the
     right point.
     problem in our parsing approach, where the parser could not
     distinguish between qualified names and qualified types at the
     right point.
-   
+
     This approach is still not ideal, because it mishandles template
     types.  See the comment in lex_one_token for an example.  However,
     this is still an improvement over the earlier approach, and will
     suffice until we move to better parsing technology.  */
     This approach is still not ideal, because it mishandles template
     types.  See the comment in lex_one_token for an example.  However,
     this is still an improvement over the earlier approach, and will
     suffice until we move to better parsing technology.  */
+
  static int
  yylex (void)
  {
    token_and_value current;
  static int
  yylex (void)
  {
    token_and_value current;
-  int first_was_coloncolon, last_was_coloncolon, first_iter;
+  int first_was_coloncolon, last_was_coloncolon;
+  struct type *context_type = NULL;
+  int last_to_examine, next_to_examine, checkpoint;
+  const struct block *search_block;
+  int is_quoted_name;
  
    if (popping && !VEC_empty (token_and_value, token_fifo))
  
    if (popping && !VEC_empty (token_and_value, token_fifo))
-    {
-      token_and_value tv = *VEC_index (token_and_value, token_fifo, 0);
-      VEC_ordered_remove (token_and_value, token_fifo, 0);
-      yylval = tv.value;
-      return tv.token;
-    }
+    goto do_pop;
    popping = 0;
  
    popping = 0;
  
-  current.token = lex_one_token ();
+  /* Read the first token and decide what to do.  Most of the
+     subsequent code is C++-only; but also depends on seeing a "::" or
+     name-like token.  */
+  current.token = lex_one_token (pstate, &is_quoted_name);
    if (current.token == NAME)
    if (current.token == NAME)
-    current.token = classify_name (expression_context_block);
-  if (parse_language->la_language != language_cplus
-      || (current.token != TYPENAME && current.token != COLONCOLON))
+    current.token = classify_name (pstate, expression_context_block,
+                                  is_quoted_name);
+  if (parse_language (pstate)->la_language != language_cplus
+      || (current.token != TYPENAME && current.token != COLONCOLON
+         && current.token != FILENAME))
      return current.token;
  
      return current.token;
  
-  first_was_coloncolon = current.token == COLONCOLON;
-  last_was_coloncolon = first_was_coloncolon;
-  obstack_free (&name_obstack, obstack_base (&name_obstack));
-  if (!last_was_coloncolon)
-    obstack_grow (&name_obstack, yylval.sval.ptr, yylval.sval.length);
+  /* Read any sequence of alternating "::" and name-like tokens into
+     the token FIFO.  */
    current.value = yylval;
    current.value = yylval;
-  first_iter = 1;
+  VEC_safe_push (token_and_value, token_fifo, &current);
+  last_was_coloncolon = current.token == COLONCOLON;
    while (1)
      {
    while (1)
      {
-      token_and_value next;
+      int ignore;
  
  
-      next.token = lex_one_token ();
-      next.value = yylval;
+      /* We ignore quoted names other than the very first one.
+        Subsequent ones do not have any special meaning.  */
+      current.token = lex_one_token (pstate, &ignore);
+      current.value = yylval;
+      VEC_safe_push (token_and_value, token_fifo, &current);
+
+      if ((last_was_coloncolon && current.token != NAME)
+         || (!last_was_coloncolon && current.token != COLONCOLON))
+       break;
+      last_was_coloncolon = !last_was_coloncolon;
+    }
+  popping = 1;
  
  
-      if (next.token == NAME && last_was_coloncolon)
+  /* We always read one extra token, so compute the number of tokens
+     to examine accordingly.  */
+  last_to_examine = VEC_length (token_and_value, token_fifo) - 2;
+  next_to_examine = 0;
+
+  current = *VEC_index (token_and_value, token_fifo, next_to_examine);
+  ++next_to_examine;
+
+  obstack_free (&name_obstack, obstack_base (&name_obstack));
+  checkpoint = 0;
+  if (current.token == FILENAME)
+    search_block = current.value.bval;
+  else if (current.token == COLONCOLON)
+    search_block = NULL;
+  else
+    {
+      gdb_assert (current.token == TYPENAME);
+      search_block = expression_context_block;
+      obstack_grow (&name_obstack, current.value.sval.ptr,
+                   current.value.sval.length);
+      context_type = current.value.tsym.type;
+      checkpoint = 1;
+    }
+
+  first_was_coloncolon = current.token == COLONCOLON;
+  last_was_coloncolon = first_was_coloncolon;
+
+  while (next_to_examine <= last_to_examine)
+    {
+      token_and_value *next;
+
+      next = VEC_index (token_and_value, token_fifo, next_to_examine);
+      ++next_to_examine;
+
+      if (next->token == NAME && last_was_coloncolon)
         {
           int classification;
  
         {
           int classification;
  
-         classification = classify_inner_name (first_was_coloncolon
-                                               ? NULL
-                                               : expression_context_block,
-                                               first_iter);
+         yylval = next->value;
+         classification = classify_inner_name (pstate, search_block,
+                                               context_type);
           /* We keep going until we either run out of names, or until
              we have a qualified name which is not a type.  */
           if (classification != TYPENAME && classification != NAME)
           /* We keep going until we either run out of names, or until
              we have a qualified name which is not a type.  */
           if (classification != TYPENAME && classification != NAME)
-           {
-             /* Push the final component and leave the loop.  */
-             VEC_safe_push (token_and_value, token_fifo, &next);
-             break;
-           }
+           break;
+
+         /* Accept up to this token.  */
+         checkpoint = next_to_examine;
  
           /* Update the partial name we are constructing.  */
  
           /* Update the partial name we are constructing.  */
-         if (!first_iter)
+         if (context_type != NULL)
             {
               /* We don't want to put a leading "::" into the name.  */
               obstack_grow_str (&name_obstack, "::");
             }
             {
               /* We don't want to put a leading "::" into the name.  */
               obstack_grow_str (&name_obstack, "::");
             }
-         obstack_grow (&name_obstack, next.value.sval.ptr,
-                       next.value.sval.length);
+         obstack_grow (&name_obstack, next->value.sval.ptr,
+                       next->value.sval.length);
  
           yylval.sval.ptr = obstack_base (&name_obstack);
           yylval.sval.length = obstack_object_size (&name_obstack);
  
           yylval.sval.ptr = obstack_base (&name_obstack);
           yylval.sval.length = obstack_object_size (&name_obstack);
@@ -2978,48 +3175,53 @@ yylex (void)
           current.token = classification;
  
           last_was_coloncolon = 0;
           current.token = classification;
  
           last_was_coloncolon = 0;
+
+         if (classification == NAME)
+           break;
+
+         context_type = yylval.tsym.type;
         }
         }
-      else if (next.token == COLONCOLON && !last_was_coloncolon)
+      else if (next->token == COLONCOLON && !last_was_coloncolon)
         last_was_coloncolon = 1;
        else
         {
           /* We've reached the end of the name.  */
         last_was_coloncolon = 1;
        else
         {
           /* We've reached the end of the name.  */
-         VEC_safe_push (token_and_value, token_fifo, &next);
           break;
         }
           break;
         }
-
-      first_iter = 0;
      }
  
      }
  
-  popping = 1;
-
-  /* If we ended with a "::", insert it too.  */
-  if (last_was_coloncolon)
+  /* If we have a replacement token, install it as the first token in
+     the FIFO, and delete the other constituent tokens.  */
+  if (checkpoint > 0)
      {
      {
-      token_and_value cc;
-      memset (&cc, 0, sizeof (token_and_value));
-      if (first_was_coloncolon && first_iter)
-       {
-         yylval = cc.value;
-         return COLONCOLON;
-       }
-      cc.token = COLONCOLON;
-      VEC_safe_insert (token_and_value, token_fifo, 0, &cc);
+      current.value.sval.ptr = obstack_copy0 (&expansion_obstack,
+                                             current.value.sval.ptr,
+                                             current.value.sval.length);
+
+      VEC_replace (token_and_value, token_fifo, 0, &current);
+      if (checkpoint > 1)
+       VEC_block_remove (token_and_value, token_fifo, 1, checkpoint - 1);
      }
  
      }
  
+ do_pop:
+  current = *VEC_index (token_and_value, token_fifo, 0);
+  VEC_ordered_remove (token_and_value, token_fifo, 0);
    yylval = current.value;
    yylval = current.value;
-  yylval.sval.ptr = obstack_copy0 (&expansion_obstack,
-                                  yylval.sval.ptr,
-                                  yylval.sval.length);
    return current.token;
  }
  
  int
    return current.token;
  }
  
  int
-c_parse (void)
+c_parse (struct parser_state *par_state)
  {
    int result;
  {
    int result;
-  struct cleanup *back_to = make_cleanup (free_current_contents,
-                                         &expression_macro_scope);
+  struct cleanup *back_to;
+
+  /* Setting up the parser state.  */
+  gdb_assert (par_state != NULL);
+  pstate = par_state;
+
+  back_to = make_cleanup (free_current_contents, &expression_macro_scope);
+  make_cleanup_clear_parser_state (&pstate);
  
    /* Set up the scope for macro expansion.  */
    expression_macro_scope = NULL;
  
    /* Set up the scope for macro expansion.  */
    expression_macro_scope = NULL;
@@ -3051,9 +3253,67 @@ c_parse (void)
  
    result = yyparse ();
    do_cleanups (back_to);
  
    result = yyparse ();
    do_cleanups (back_to);
+
    return result;
  }
  
    return result;
  }
  
+#ifdef YYBISON
+
+/* This is called via the YYPRINT macro when parser debugging is
+   enabled.  It prints a token's value.  */
+
+static void
+c_print_token (FILE *file, int type, YYSTYPE value)
+{
+  switch (type)
+    {
+    case INT:
+      fprintf (file, "typed_val_int<%s, %s>",
+              TYPE_SAFE_NAME (value.typed_val_int.type),
+              pulongest (value.typed_val_int.val));
+      break;
+
+    case CHAR:
+    case STRING:
+      {
+       char *copy = alloca (value.tsval.length + 1);
+
+       memcpy (copy, value.tsval.ptr, value.tsval.length);
+       copy[value.tsval.length] = '\0';
+
+       fprintf (file, "tsval<type=%d, %s>", value.tsval.type, copy);
+      }
+      break;
+
+    case NSSTRING:
+    case VARIABLE:
+      fprintf (file, "sval<%s>", copy_name (value.sval));
+      break;
+
+    case TYPENAME:
+      fprintf (file, "tsym<type=%s, name=%s>",
+              TYPE_SAFE_NAME (value.tsym.type),
+              copy_name (value.tsym.stoken));
+      break;
+
+    case NAME:
+    case UNKNOWN_CPP_NAME:
+    case NAME_OR_INT:
+    case BLOCKNAME:
+      fprintf (file, "ssym<name=%s, sym=%s, field_of_this=%d>",
+              copy_name (value.ssym.stoken),
+              (value.ssym.sym == NULL
+               ? "(null)" : SYMBOL_PRINT_NAME (value.ssym.sym)),
+              value.ssym.is_a_field_of_this);
+      break;
+
+    case FILENAME:
+      fprintf (file, "bval<%s>", host_address_to_string (value.bval));
+      break;
+    }
+}
+
+#endif
  
  void
  yyerror (char *msg)
  
  void
  yyerror (char *msg)