* go-exp.y (classify_name): Add missing assignment of fields of

	yylval.ssym.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 17039cb..6af8780 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2012-05-08  Doug Evans  <dje@google.com>
+
+       * go-exp.y (classify_name): Add missing assignment of fields of
+       yylval.ssym.
+
 2012-05-08  Eli Zaretskii  <eliz@gnu.org>
 
        Display the ">" prompt in interactive mode while reading canned

diff --git a/gdb/go-exp.y b/gdb/go-exp.y
index f720629..e73b561 100644 (file)
--- a/gdb/go-exp.y
+++ b/gdb/go-exp.y
@@ -1482,7 +1482,7 @@ classify_name (struct block *block)
                             &is_a_field_of_this);
        if (sym)
          {
-           yylval.sval = sval;
+           yylval.ssym.stoken = sval;
            yylval.ssym.sym = sym;
            yylval.ssym.is_a_field_of_this = is_a_field_of_this;
            return NAME;
@@ -1499,9 +1499,15 @@ classify_name (struct block *block)
       YYSTYPE newlval; /* Its value is ignored.  */
       int hextype = parse_number (copy, yylval.sval.length, 0, &newlval);
       if (hextype == INT)
-       return NAME_OR_INT;
+       {
+         yylval.ssym.sym = NULL;
+         yylval.ssym.is_a_field_of_this = 0;
+         return NAME_OR_INT;
+       }
     }
 
+  yylval.ssym.sym = NULL;
+  yylval.ssym.is_a_field_of_this = 0;
   return NAME;
 }