From e34f7caeb09a9f0eb54ea5b00944301cb058308b Mon Sep 17 00:00:00 2001 From: Bill Currie Date: Thu, 6 Jan 2011 21:55:07 +0900 Subject: [PATCH] Use op instead of integer_val for ADDOP etc. --- tools/qfcc/source/qp-lex.l | 2 +- tools/qfcc/source/qp-parse.y | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/qfcc/source/qp-lex.l b/tools/qfcc/source/qp-lex.l index c63d05817..3c174ede2 100644 --- a/tools/qfcc/source/qp-lex.l +++ b/tools/qfcc/source/qp-lex.l @@ -237,7 +237,7 @@ keyword_or_id (const char *token) keyword = Hash_Find (keyword_tab, token); if (keyword) { if (keyword->value == ADDOP || keyword->value == MULOP) { - yylval.integer_val = yytext[0]; + yylval.op = yytext[0]; } else { yylval.type = keyword->type; } diff --git a/tools/qfcc/source/qp-parse.y b/tools/qfcc/source/qp-parse.y index 897ce33f8..c9f99bc91 100644 --- a/tools/qfcc/source/qp-parse.y +++ b/tools/qfcc/source/qp-parse.y @@ -105,8 +105,8 @@ int yylex (void); %nonassoc ELSE %left RELOP -%left ADDOP -%left MULOP +%left ADDOP +%left MULOP %right UNARY %token TYPE