aboutsummaryrefslogtreecommitdiff
path: root/gdb/ch-exp.y
diff options
context:
space:
mode:
authorJohn Gilmore <gnu@cygnus>1993-05-11 02:49:40 +0000
committerJohn Gilmore <gnu@cygnus>1993-05-11 02:49:40 +0000
commit57ffffe3fe09fb8ffbee62a4ef2c7cb9634c3a6f (patch)
tree06898c2993793091c4af5650d2481fa22dcd44f8 /gdb/ch-exp.y
parent1269d4411542413ae473113fa9befc1b0f3c7c65 (diff)
downloadgdb-57ffffe3fe09fb8ffbee62a4ef2c7cb9634c3a6f.zip
gdb-57ffffe3fe09fb8ffbee62a4ef2c7cb9634c3a6f.tar.gz
gdb-57ffffe3fe09fb8ffbee62a4ef2c7cb9634c3a6f.tar.bz2
* ch-exp.y (MAX, MIN): Rename to MAX_TOKEN, MIN_TOKEN.
* target.c (MIN): #undef before defining.
Diffstat (limited to 'gdb/ch-exp.y')
-rw-r--r--gdb/ch-exp.y14
1 files changed, 7 insertions, 7 deletions
diff --git a/gdb/ch-exp.y b/gdb/ch-exp.y
index a618283..b35fe87 100644
--- a/gdb/ch-exp.y
+++ b/gdb/ch-exp.y
@@ -1,5 +1,5 @@
/* YACC grammar for Chill expressions, for GDB.
- Copyright (C) 1992 Free Software Foundation, Inc.
+ Copyright 1992, 1993 Free Software Foundation, Inc.
This file is part of GDB.
@@ -227,8 +227,8 @@ yyerror PARAMS ((char *));
%token <voidval> SUCC
%token <voidval> ABS
%token <voidval> CARD
-%token <voidval> MAX
-%token <voidval> MIN
+%token <voidval> MAX_TOKEN
+%token <voidval> MIN_TOKEN
%token <voidval> SIZE
%token <voidval> UPPER
%token <voidval> LOWER
@@ -889,11 +889,11 @@ chill_value_built_in_routine_call :
{
$$ = 0; /* FIXME */
}
- | MAX '(' expression ')'
+ | MAX_TOKEN '(' expression ')'
{
$$ = 0; /* FIXME */
}
- | MIN '(' expression ')'
+ | MIN_TOKEN '(' expression ')'
{
$$ = 0; /* FIXME */
}
@@ -1739,8 +1739,8 @@ static const struct token idtokentab[] =
{ "orif", ORIF },
{ "num", NUM },
{ "abs", ABS },
- { "max", MAX },
- { "min", MIN },
+ { "max", MAX_TOKEN },
+ { "min", MIN_TOKEN },
{ "mod", MOD },
{ "rem", REM },
{ "not", NOT },