(add_sym): Compare namespace names instead of namespace objects. This

prevents the parser from incorrectly treating classes whose superclass
is in another namespace.

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 76e56e77e16dd457283a76afaa23460cfec83849..7d22972794f59097acbe025f326919cec7c48ca8 100644 (file)
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,9 @@
+2005-09-20  Chong Yidong  <cyd@stupidchicken.com>
+
+       * ebrowse.c (add_sym): Compare namespace names instead of
+       namespace objects.  This prevents the parser from incorrectly
+       treating classes whose superclass is in another namespace.
+
 2005-09-15  Richard M. Stallman  <rms@gnu.org>
 
        * Makefile.in (update-game-score.o): New target.

diff --git a/lib-src/ebrowse.c b/lib-src/ebrowse.c
index 49e353cf536b82229cca3a31f6083d7c8776cf47..a9a3eb78442abfd2d78188f9dbbecadf9b4729e7 100644 (file)
--- a/lib-src/ebrowse.c
+++ b/lib-src/ebrowse.c
@@ -648,7 +648,10 @@ add_sym (name, nested_in_class)
   h %= TABLE_SIZE;
 
   for (sym = class_table[h]; sym; sym = sym->next)
-    if (streq (name, sym->name) && sym->namesp == scope)
+    if (streq (name, sym->name)
+       && ((!sym->namesp && !scope)
+           || (sym->namesp && scope
+               && streq (sym->namesp->name, scope->name))))
       break;
 
   if (sym == NULL)