* stabsread.c (read_struct_fields): Accept either '$' or '.' as

	the character which introduces a cpp_abbrev or anonymous type.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 029db4f1ddea4b8dcb8d2b20e341739a7dce011a..a429a56816c341afee95f4304a22517933b720b9 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,8 @@
 Thu Nov  4 08:27:24 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
 
+       * stabsread.c (read_struct_fields): Accept either '$' or '.' as
+       the character which introduces a cpp_abbrev or anonymous type.
+
        * c-lang.c (c_printstr): Print "" to stream (like all the other
        output from this function), not gdb_stdout.
 

diff --git a/gdb/stabsread.c b/gdb/stabsread.c
index befb564479e1acc23849bff804a4d1f1448b5a75..ddb18c963a0de7364fc5b8193ae7e1712891753f 100644 (file)
--- a/gdb/stabsread.c
+++ b/gdb/stabsread.c
@@ -2322,11 +2322,16 @@ read_struct_fields (fip, pp, type, objfile)
 
       /* Get the field name.  */
       p = *pp;
-      /* If is starts with CPLUS_MARKER it is a special abbreviation, unless
-        the CPLUS_MARKER is followed by an underscore, in which case it is
-        just the name of an anonymous type, which we should handle like any
-        other type name.  */
-      if (*p == CPLUS_MARKER && p[1] != '_')
+
+      /* If is starts with CPLUS_MARKER it is a special abbreviation,
+        unless the CPLUS_MARKER is followed by an underscore, in
+        which case it is just the name of an anonymous type, which we
+        should handle like any other type name.  We accept either '$'
+        or '.', because a field name can never contain one of these
+        characters except as a CPLUS_MARKER (we probably should be
+        doing that in most parts of GDB).  */
+
+      if ((*p == '$' || *p == '.') && p[1] != '_')
        {
          if (!read_cpp_abbrev (fip, pp, type, objfile))
            return 0;