diff options
| -rw-r--r-- | gdb/ChangeLog | 4 | ||||
| -rw-r--r-- | gdb/ch-exp.c | 10 |
2 files changed, 9 insertions, 5 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 9c0c114..81070fa 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,7 @@ +Tue Oct 21 14:15:26 1997 Per Bothner <bothner@cygnus.com> + + * ch-exp.c: Rename FIELD_NAME to DOT_FIELD_NAME (to avoid conflict). + Fri Oct 17 13:22:02 1997 Stan Shebs <shebs@andros.cygnus.com> * infcmd.c: Improve grammar of "set args" help. diff --git a/gdb/ch-exp.c b/gdb/ch-exp.c index cc7d7f7..45436a3 100644 --- a/gdb/ch-exp.c +++ b/gdb/ch-exp.c @@ -91,7 +91,7 @@ enum ch_terminal { CHARACTER_STRING_LITERAL, BIT_STRING_LITERAL, TYPENAME, - FIELD_NAME, + DOT_FIELD_NAME, /* '.' followed by <field name> */ CASE, OF, ESAC, @@ -537,7 +537,7 @@ parse_named_record_element () label = PEEK_LVAL ().sval; sprintf (buf, "expected a field name here `%s'", lexptr); - expect (FIELD_NAME, buf); + expect (DOT_FIELD_NAME, buf); if (check_token (',')) parse_named_record_element (); else if (check_token (':')) @@ -555,7 +555,7 @@ static void parse_tuple_element (type) struct type *type; { - if (PEEK_TOKEN () == FIELD_NAME) + if (PEEK_TOKEN () == DOT_FIELD_NAME) { /* Parse a labelled structure tuple. */ parse_named_record_element (); @@ -845,7 +845,7 @@ parse_primval () { switch (PEEK_TOKEN ()) { - case FIELD_NAME: + case DOT_FIELD_NAME: write_exp_elt_opcode (STRUCTOP_STRUCT); write_exp_string (PEEK_LVAL ().sval); write_exp_elt_opcode (STRUCTOP_STRUCT); @@ -2137,7 +2137,7 @@ ch_lex () inputname = match_simple_name_string (); if (!inputname) return '.'; - return FIELD_NAME; + return DOT_FIELD_NAME; } return (ILLEGAL_TOKEN); |