From: Tom Tromey <tromey@redhat.com>
Date: Wed, 15 Dec 2010 19:28:31 +0000 (+0000)
Subject: 2010-12-15  Greg Watson  <g.watson@computer.org>
X-Git-Tag: cgen-snapshot-20110101~17
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=45ccdddcbfd0eea3165b732191613dc85f016b8c;p=thirdparty%2Fbinutils-gdb.git

2010-12-15  Greg Watson  <g.watson@computer.org>

	* f-exp.y (yylex): Check entire token against keywords.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 48a381f7722..013ff837c89 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2010-12-15  Greg Watson  <g.watson@computer.org>
+
+	* f-exp.y (yylex): Check entire token against keywords.
+
 2010-12-15  Doug Evans  <dje@google.com>
 
 	Rename "maint set python auto-load" to "set auto-load-scripts".
diff --git a/gdb/f-exp.y b/gdb/f-exp.y
index 415819a0fc8..feffe7999bc 100644
--- a/gdb/f-exp.y
+++ b/gdb/f-exp.y
@@ -1150,8 +1150,8 @@ yylex ()
   /* Catch specific keywords.  */
   
   for (i = 0; f77_keywords[i].operator != NULL; i++)
-    if (strncmp (tokstart, f77_keywords[i].operator,
-		 strlen(f77_keywords[i].operator)) == 0)
+    if (strlen (f77_keywords[i].operator) == namelen
+	&& strncmp (tokstart, f77_keywords[i].operator, namelen) == 0)
       {
 	/* 	lexptr += strlen(f77_keywords[i].operator); */ 
 	yylval.opcode = f77_keywords[i].opcode;