Minor changes to make these work with bison again.

This commit is contained in:
Michael Tiemann 1992-07-09 11:47:50 +00:00
parent 866ecded64
commit 368c8614bc
2 changed files with 10 additions and 13 deletions

View File

@ -193,9 +193,6 @@ parse_number PARAMS ((char *, int, int, YYSTYPE *));
%type <bval> block %type <bval> block
%left COLONCOLON %left COLONCOLON
%%
%{ %{
/* Ensure that if the generated parser contains any calls to malloc/realloc, /* Ensure that if the generated parser contains any calls to malloc/realloc,
that they get mapped to xmalloc/xrealloc. We have to do this here that they get mapped to xmalloc/xrealloc. We have to do this here
@ -208,6 +205,9 @@ parse_number PARAMS ((char *, int, int, YYSTYPE *));
#define realloc xrealloc #define realloc xrealloc
%} %}
%%
start : exp1 start : exp1
| type_exp | type_exp
; ;

View File

@ -103,10 +103,6 @@ int number_sign = 1;
struct block *modblock=0; struct block *modblock=0;
/* #define YYDEBUG 1 */ /* #define YYDEBUG 1 */
/* !@&%ing AIX defines these! Prevent cpp complaints by undeffing them */
#undef TRUE
#undef FALSE
%} %}
/* Although the yacc "value" of an expression is not used, /* Although the yacc "value" of an expression is not used,
@ -137,7 +133,7 @@ struct block *modblock=0;
%type <sym> fblock %type <sym> fblock
%token <lval> INT HEX ERROR %token <lval> INT HEX ERROR
%token <ulval> UINT TRUE FALSE CHAR %token <ulval> UINT M2_TRUE M2_FALSE CHAR
%token <dval> FLOAT %token <dval> FLOAT
/* Both NAME and TYPENAME tokens represent symbols in the input, /* Both NAME and TYPENAME tokens represent symbols in the input,
@ -180,7 +176,6 @@ struct block *modblock=0;
/* This is not an actual token ; it is used for precedence. /* This is not an actual token ; it is used for precedence.
%right QID %right QID
*/ */
%%
%{ %{
/* Ensure that if the generated parser contains any calls to malloc/realloc, /* Ensure that if the generated parser contains any calls to malloc/realloc,
@ -194,6 +189,8 @@ struct block *modblock=0;
#define realloc xrealloc #define realloc xrealloc
%} %}
%%
start : exp start : exp
| type_exp | type_exp
; ;
@ -468,13 +465,13 @@ exp : exp ASSIGN exp
/* Constants */ /* Constants */
exp : TRUE exp : M2_TRUE
{ write_exp_elt_opcode (OP_BOOL); { write_exp_elt_opcode (OP_BOOL);
write_exp_elt_longcst ((LONGEST) $1); write_exp_elt_longcst ((LONGEST) $1);
write_exp_elt_opcode (OP_BOOL); } write_exp_elt_opcode (OP_BOOL); }
; ;
exp : FALSE exp : M2_FALSE
{ write_exp_elt_opcode (OP_BOOL); { write_exp_elt_opcode (OP_BOOL);
write_exp_elt_longcst ((LONGEST) $1); write_exp_elt_longcst ((LONGEST) $1);
write_exp_elt_opcode (OP_BOOL); } write_exp_elt_opcode (OP_BOOL); }
@ -1143,12 +1140,12 @@ yylex ()
if(!strncmp(tokstart,"TRUE",4)) if(!strncmp(tokstart,"TRUE",4))
{ {
yylval.ulval = 1; yylval.ulval = 1;
return TRUE; return M2_TRUE;
} }
else if(!strncmp(tokstart,"FALSE",5)) else if(!strncmp(tokstart,"FALSE",5))
{ {
yylval.ulval = 0; yylval.ulval = 0;
return FALSE; return M2_FALSE;
} }
} }