From d5560434c022a8aa064c4bbeec6f49e3248bc378 Mon Sep 17 00:00:00 2001 From: Bill Currie Date: Wed, 11 Mar 2020 11:06:09 +0900 Subject: [PATCH] [qfcc] Rename label to bool_label for clarity And also so I can use `label' for source labels. --- tools/qfcc/source/qc-parse.y | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/qfcc/source/qc-parse.y b/tools/qfcc/source/qc-parse.y index ba266c512..9752a4c48 100644 --- a/tools/qfcc/source/qc-parse.y +++ b/tools/qfcc/source/qc-parse.y @@ -184,7 +184,7 @@ int yylex (void); %type opt_init opt_expr cexpr expr element_list element %type optional_state_expr texpr vector_expr %type statement statements compound_statement -%type else label break_label continue_label +%type else bool_label break_label continue_label %type unary_expr ident_expr cast_expr opt_arg_list arg_list %type init_var_decl_list init_var_decl %type switch_block @@ -1358,7 +1358,7 @@ else } ; -label +bool_label : /* empty */ { $$ = new_label_expr (); @@ -1489,8 +1489,8 @@ expr | expr '=' expr { $$ = assign_expr ($1, $3); } | expr ASX expr { $$ = asx_expr ($2, $1, $3); } | expr '?' expr ':' expr { $$ = conditional_expr ($1, $3, $5); } - | expr AND label expr { $$ = bool_expr (AND, $3, $1, $4); } - | expr OR label expr { $$ = bool_expr (OR, $3, $1, $4); } + | expr AND bool_label expr { $$ = bool_expr (AND, $3, $1, $4); } + | expr OR bool_label expr { $$ = bool_expr (OR, $3, $1, $4); } | expr EQ expr { $$ = binary_expr (EQ, $1, $3); } | expr NE expr { $$ = binary_expr (NE, $1, $3); } | expr LE expr { $$ = binary_expr (LE, $1, $3); }