2002-12-09 David Carlton <carlton@math.stanford.edu>

	* p-exp.y: Rename TRUE and FALSE to TRUEKEYWORD and FALSEKEYWORD.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 738405c31b7638ec7d828d71ab737bf62d766fd6..17c94281708ad4573b457ccc412567a5abc332ee 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2002-12-09  David Carlton  <carlton@math.stanford.edu>
+
+       * p-exp.y: Rename TRUE and FALSE to TRUEKEYWORD and FALSEKEYWORD.
+
 2002-12-09  David Carlton  <carlton@math.stanford.edu>
 
        * linespec.c (symtab_from_filename): New function.

diff --git a/gdb/p-exp.y b/gdb/p-exp.y
index 4e924b8e752d0a9d932efcef2c9deac222c00dcc..b4d4739d69c9b280fe31d16dc1a5c957a3a981eb 100644 (file)
--- a/gdb/p-exp.y
+++ b/gdb/p-exp.y
@@ -205,7 +205,7 @@ static int search_field;
 
 /* Object pascal */
 %token THIS
-%token <lval> TRUE FALSE
+%token <lval> TRUEKEYWORD FALSEKEYWORD
 
 %left ','
 %left ABOVE_COMMA
@@ -434,13 +434,13 @@ exp       :       exp ASSIGN exp
                        { write_exp_elt_opcode (BINOP_ASSIGN); }
        ;
 
-exp    :       TRUE
+exp    :       TRUEKEYWORD
                        { write_exp_elt_opcode (OP_BOOL);
                          write_exp_elt_longcst ((LONGEST) $1);
                          write_exp_elt_opcode (OP_BOOL); }
        ;
 
-exp    :       FALSE
+exp    :       FALSEKEYWORD
                        { write_exp_elt_opcode (OP_BOOL);
                          write_exp_elt_longcst ((LONGEST) $1);
                          write_exp_elt_opcode (OP_BOOL); }
@@ -1379,14 +1379,14 @@ yylex ()
       if (STREQ (uptokstart, "FALSE"))
        {
           yylval.lval = 0;
-          return FALSE;
+          return FALSEKEYWORD;
         }
       break;
     case 4:
       if (STREQ (uptokstart, "TRUE"))
        {
           yylval.lval = 1;
-         return TRUE;
+         return TRUEKEYWORD;
         }
       if (STREQ (uptokstart, "SELF"))
         {