diff options
| author | John Gilmore <gnu@cygnus> | 1992-02-20 19:23:42 +0000 |
|---|---|---|
| committer | John Gilmore <gnu@cygnus> | 1992-02-20 19:23:42 +0000 |
| commit | 088c3a0b74c7431d31ec5d095f4e68bdd2d90c0b (patch) | |
| tree | 0ce19e10e2ec6ba41392bf245df0841bfde317bc /gdb/m2-exp.y | |
| parent | 8b87cbae28c26fd9b5bed99eb134f6c66ee946ac (diff) | |
| download | binutils-gdb-088c3a0b74c7431d31ec5d095f4e68bdd2d90c0b.tar.gz | |
* defs.h: Include ansidecl.h and PARAMS macro. Use PARAMS
to make prototypes for all functions declared here.
* cplus-dem.c: Avoid declaring xmalloc and xrealloc.
* c-exp.y: Rename SIGNED, OR, and AND to avoid conflict.
* environ.c: Include <stdio.h> before defs.h. Minor cleanup.
* ieee-float.h: Use PARAMS for prototypes; make some params const.
* ieee-float.c, valarith.c: Include <stdio.h>. Lint. b*=>mem*.
* m2-exp.y: Remove unused CONST; Rename OR and AND.
* utils.c: Avoid declaring malloc and realloc. Lint.
(request_quit): Accept signal-number parameter.
Diffstat (limited to 'gdb/m2-exp.y')
| -rw-r--r-- | gdb/m2-exp.y | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gdb/m2-exp.y b/gdb/m2-exp.y index 3829758ca44..9d9c8d26544 100644 --- a/gdb/m2-exp.y +++ b/gdb/m2-exp.y @@ -128,7 +128,7 @@ char *make_qualname(); nonterminal "name", which matches either NAME or TYPENAME. */ %token <sval> STRING -%token <sval> NAME BLOCKNAME IDENT CONST VARNAME +%token <sval> NAME BLOCKNAME IDENT VARNAME %token <sval> TYPENAME %token SIZE CAP ORD HIGH ABS MIN_FUNC MAX_FUNC FLOAT_FUNC VAL CHR ODD TRUNC @@ -146,8 +146,8 @@ char *make_qualname(); %left ABOVE_COMMA %nonassoc ASSIGN %left '<' '>' LEQ GEQ '=' NOTEQUAL '#' IN -%left OR -%left AND '&' +%left OROR +%left ANDAND '&' %left '@' %left '+' '-' %left '*' '/' DIV MOD @@ -415,7 +415,7 @@ exp : exp '>' exp { write_exp_elt_opcode (BINOP_GTR); } ; -exp : exp AND exp +exp : exp ANDAND exp { write_exp_elt_opcode (BINOP_AND); } ; @@ -423,7 +423,7 @@ exp : exp '&' exp { write_exp_elt_opcode (BINOP_AND); } ; -exp : exp OR exp +exp : exp OROR exp { write_exp_elt_opcode (BINOP_OR); } ; @@ -790,9 +790,9 @@ struct keyword { static struct keyword keytab[] = { - {"OR" , OR }, + {"OR" , OROR }, {"IN", IN },/* Note space after IN */ - {"AND", AND }, + {"AND", ANDAND }, {"ABS", ABS }, {"CHR", CHR }, {"DEC", DEC }, |