* c-exp.y (yylex): Don't try to deal with nested types.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 47bcd76dd9f590b46723513295a717c8e9e71a8b..a04c463dc53f8b7b1d75f560d5e227ed5c6ae198 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,7 @@
 Mon Dec 27 11:07:05 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
 
+       * c-exp.y (yylex): Don't try to deal with nested types.
+
        * cp-valprint.c (cplus_print_value): Call check_stub_type on
        TYPE_BASECLASS (type, i) before we look at its name.
 

diff --git a/gdb/c-exp.y b/gdb/c-exp.y
index ddff35f6f9a11732e686939f661f6e017533d386..ebc1ca66c7142a7fa14d93a9b23612fdf74b964d 100644 (file)
--- a/gdb/c-exp.y
+++ b/gdb/c-exp.y
@@ -1474,6 +1474,12 @@ yylex ()
       }
     if (sym && SYMBOL_CLASS (sym) == LOC_TYPEDEF)
         {
+#if 0
+         /* In "A::x", if x is a member function of A and there happens
+            to be a type (nested or not, since the stabs don't make that
+            distinction) named x, then this code incorrectly thinks we
+            are dealing with nested types rather than a member function.  */
+
          char *p;
          char *namestart;
          struct symbol *best_sym;
@@ -1541,6 +1547,9 @@ yylex ()
            }
 
          yylval.tsym.type = SYMBOL_TYPE (best_sym);
+#else /* not 0 */
+         yylval.tsym.type = SYMBOL_TYPE (sym);
+#endif /* not 0 */
          return TYPENAME;
         }
     if ((yylval.tsym.type = lookup_primitive_typename (tmp)) != 0)