+2003-05-07 David Carlton <carlton@bactrian.org>
+
+ * valops.c (value_aggregate_elt): Add 'noside' argument.
+ (value_struct_elt_for_reference): Add 'block', 'noside'
+ arguments. Call value_maybe_namespace_elt.
+ (value_namespace_elt): Add 'noside' argument. Break out code into
+ value_maybe_namespace_elt.
+ (value_maybe_namespace_elt): New. Handle types.
+ * value.h: Update declaration for value_aggregate_elt.
+ * eval.c (evaluate_subexp_standard): Pass 'noside' to
+ value_aggregate_elt.
+ * c-exp.y: Added 'qualified_type'.
+ (yylex): Comment out nested type stuff.
+
2003-05-02 David Carlton <carlton@bactrian.org>
* minsyms.c: Delete declarations for lookup_minimal_symbol_linkage
%type <voidval> exp exp1 type_exp start variable qualified_name lcurly
%type <lval> rcurly
-%type <tval> type typebase
+%type <tval> type typebase qualified_type
%type <tvec> nonempty_typelist
/* %type <bval> block */
{ $$ = follow_types ($2); }
| typebase const_or_volatile_or_space_identifier_noopt
{ $$ = follow_types ($1); }
+ | qualified_type
+ ;
+
+qualified_type: typebase COLONCOLON name
+ {
+ struct type *type = $1;
+ struct type *new_type;
+ char *ncopy = alloca ($3.length + 1);
+
+ memcpy (ncopy, $3.ptr, $3.length);
+ ncopy[$3.length] = '\0';
+
+ if (TYPE_CODE (type) != TYPE_CODE_STRUCT
+ && TYPE_CODE (type) != TYPE_CODE_UNION
+ && TYPE_CODE (type) != TYPE_CODE_NAMESPACE)
+ error ("`%s' is not defined as an aggregate type.",
+ TYPE_NAME (type));
+
+ new_type = lookup_nested_type (type, ncopy,
+ expression_context_block);
+ if (new_type == NULL)
+ error ("No type \"%s\" within class or namespace \"%s\".",
+ ncopy, TYPE_NAME (type));
+
+ $$ = new_type;
+ }
;
typename: TYPENAME
if (sym && SYMBOL_CLASS (sym) == LOC_TYPEDEF)
{
-#if 1
+#if 0
char *p;
char *namestart;
struct type *best_type;
gdb_test "ptype ::C::CClass::NestedClass" "type = class C::CClass::NestedClass \{\r\n public:\r\n int y;\r\n\}"
gdb_test "ptype ::C::NestedClass" "No symbol \"NestedClass\" in namespace \"C\"."
gdb_test "ptype C::CClass" "No symbol \"CClass\" in namespace \"C::C\"."
-gdb_test "ptype C::CClass::NestedClass" "No symbol \"CClass\" in namespace \"C::C\"."
+gdb_test "ptype C::CClass::NestedClass" "No type \"CClass\" within class or namespace \"C::C\"."
gdb_test "ptype C::NestedClass" "No symbol \"NestedClass\" in namespace \"C::C\"."
# Tests involving multiple files
gdb_test "ptype OtherFileClass" "type = class C::OtherFileClass \{\r\n public:\r\n int z;\r\n\}"
gdb_test "ptype ::C::OtherFileClass" "type = class C::OtherFileClass \{\r\n public:\r\n int z;\r\n\}"
-gdb_test "ptype C::OtherFileClass" "No symbol \"Class\" in namespace \"C::C\"."
+gdb_test "ptype C::OtherFileClass" "No symbol \"OtherFileClass\" in namespace \"C::C\"."
# Some anonymous namespace tests.
int offset,
struct type *curtype,
const char *name,
- struct type *intype);
+ struct type *intype,
+ const struct block *
+ block,
+ enum noside noside);
static struct value *value_namespace_elt (const struct type *curtype,
const struct block *block,
- const char *name);
+ const char *name,
+ enum noside noside);
+
+static struct value *value_maybe_namespace_elt (const struct type *curtype,
+ const struct block *block,
+ const char *name,
+ enum noside noside);
static CORE_ADDR allocate_space_in_inferior (int);
struct value *
value_aggregate_elt (struct type *curtype,
const struct block *block,
- const char *name)
+ const char *name,
+ enum noside noside)
{
switch (TYPE_CODE (curtype))
{
case TYPE_CODE_STRUCT:
case TYPE_CODE_UNION:
- return value_struct_elt_for_reference (curtype, 0, curtype, name, NULL);
+ return value_struct_elt_for_reference (curtype, 0, curtype, name, NULL,
+ block, noside);
case TYPE_CODE_NAMESPACE:
- return value_namespace_elt (curtype, block, name);
+ return value_namespace_elt (curtype, block, name, noside);
default:
error ("Internal error: non-aggregate type to value_aggregate_elt");
}
static struct value *
value_struct_elt_for_reference (struct type *domain, int offset,
struct type *curtype, const char *name,
- struct type *intype)
+ struct type *intype,
+ const struct block *block,
+ enum noside noside)
{
register struct type *t = curtype;
register int i;
offset + base_offset,
TYPE_BASECLASS (t, i),
name,
- intype);
+ intype,
+ block,
+ noside);
if (v)
return v;
}
- return 0;
+
+ /* As a last chance, look it up using lookup_symbol_namespace: this
+ works for types. */
+
+ return value_maybe_namespace_elt (curtype, block, name, noside);
}
/* C++: Return the member NAME of the namespace given by the type
static struct value *
value_namespace_elt (const struct type *curtype,
const struct block *block,
- const char *name)
+ const char *name,
+ enum noside noside)
+{
+ struct value *retval = value_maybe_namespace_elt (curtype, block, name,
+ noside);
+
+ if (retval == NULL)
+ error ("No symbol \"%s\" in namespace \"%s\".", name,
+ TYPE_TAG_NAME (curtype));
+
+ return retval;
+}
+
+/* A helper function used by value_namespace_elt and
+ value_struct_elt_for_reference. */
+
+static struct value *
+value_maybe_namespace_elt (const struct type *curtype,
+ const struct block *block,
+ const char *name,
+ enum noside noside)
{
const char *namespace_name = TYPE_TAG_NAME (curtype);
const struct symbol *sym;
sym = lookup_symbol_namespace (namespace_name, name, NULL,
block, VAR_NAMESPACE, NULL);
- /* FIXME: carlton/2002-11-24: Should this really be here, or should
- it be in c-exp.y like the other similar messages? Hmm... */
-
if (sym == NULL)
- error ("No symbol \"%s\" in namespace \"%s\".", name, namespace_name);
-
- return value_of_variable (sym, block);
+ return NULL;
+ else if ((noside == EVAL_AVOID_SIDE_EFFECTS)
+ && (SYMBOL_CLASS (sym) == LOC_TYPEDEF))
+ return allocate_value (SYMBOL_TYPE (sym));
+ else
+ return value_of_variable (sym, block);
}
/* Given a pointer value V, find the real (RTTI) type
projects / thirdparty / binutils-gdb.git / commitdiff
