aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Carlton <carlton@bactrian.org>2002-12-09 20:48:07 +0000
committerDavid Carlton <carlton@bactrian.org>2002-12-09 20:48:07 +0000
commit2692ddb35822995be2652cb528418ac14c716799 (patch)
treeda09e76d045bfbb9b74b0599b4bfdcfaac785b66
parentf3c39e76bb03adfb895691c973ec9a67f1d2e6a8 (diff)
downloadgdb-2692ddb35822995be2652cb528418ac14c716799.zip
gdb-2692ddb35822995be2652cb528418ac14c716799.tar.gz
gdb-2692ddb35822995be2652cb528418ac14c716799.tar.bz2
2002-12-09 David Carlton <carlton@math.stanford.edu>
* p-exp.y: Rename TRUE and FALSE to TRUEKEYWORD and FALSEKEYWORD.
-rw-r--r--gdb/ChangeLog4
-rw-r--r--gdb/p-exp.y10
2 files changed, 9 insertions, 5 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 738405c..17c9428 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,9 @@
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.
(decode_line_1): Move code into symtab_from_filename.
diff --git a/gdb/p-exp.y b/gdb/p-exp.y
index 4e924b8..b4d4739 100644
--- 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"))
{