From: Pierre Muller <muller@sourceware.org>
Date: Mon, 15 Apr 2002 07:51:34 +0000 (+0000)
Subject: 22002-04-15  Pierre Muller  <muller@ics.u-strasbg.fr>
X-Git-Tag: gdb_5_2-2002-04-29-release~27
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b7904af1caa35b20a33afbfa166b9ff554152dad;p=thirdparty%2Fbinutils-gdb.git

22002-04-15  Pierre Muller  <muller@ics.u-strasbg.fr>

	Merge from trunk:

	2002-04-09  Pierre Muller  <muller@ics.u-strasbg.fr>


	* p-exp.y (yylex): Handle also the fact that is_a_field_of_this
	is non zero as a found symbol.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 8b4cd90c54e..5069438be8e 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,12 @@
+2002-04-15  Pierre Muller  <muller@ics.u-strasbg.fr>
+
+	Merge from trunk:
+
+	2002-04-09  Pierre Muller  <muller@ics.u-strasbg.fr>
+
+	* p-exp.y (yylex): Handle also the fact that is_a_field_of_this
+	is non zero as a found symbol.
+
 2002-04-15  Andrew Cagney  <ac131313@redhat.com>
  
 	* bcache.c: Include <stddef.h> and <stdlib.h> after "defs.h".
diff --git a/gdb/p-exp.y b/gdb/p-exp.y
index d1fcb1b000f..b0e4daa4040 100644
--- a/gdb/p-exp.y
+++ b/gdb/p-exp.y
@@ -1300,7 +1300,7 @@ yylex ()
 			 &is_a_field_of_this,
 			 (struct symtab **) NULL);
     /* second chance uppercased (as Free Pascal does).  */
-    if (!sym)
+    if (!sym && !is_a_field_of_this)
       {
        for (i = 0; i <= namelen; i++)
          {
@@ -1311,7 +1311,7 @@ yylex ()
                         VAR_NAMESPACE,
                         &is_a_field_of_this,
                         (struct symtab **) NULL);
-       if (sym)
+       if (sym || is_a_field_of_this)
          for (i = 0; i <= namelen; i++)
            {
              if ((tokstart[i] >= 'a' && tokstart[i] <= 'z'))
@@ -1319,7 +1319,7 @@ yylex ()
            }
       }
     /* Third chance Capitalized (as GPC does).  */
-    if (!sym)
+    if (!sym && !is_a_field_of_this)
       {
        for (i = 0; i <= namelen; i++)
          {
@@ -1336,7 +1336,7 @@ yylex ()
                          VAR_NAMESPACE,
                          &is_a_field_of_this,
                          (struct symtab **) NULL);
-        if (sym)
+        if (sym || is_a_field_of_this)
           for (i = 0; i <= namelen; i++)
             {
               if (i == 0)