hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MXS-1346: Minor cleanup of grammar rules

Browse Source 
Cleaned up the grammar rules by splitting long lines at roughly 80
characters and removed the redundant code for the columnlist type.
This commit is contained in:
Markus Mäkelä
2017-08-30 09:21:22 +03:00
parent a1d4f25392
commit b9302f11cc
1 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
server/modules/filter/dbfwfilter/ruleparser.y
View File

@ -34,15 +34,19 @@
%lex-param {void* scanner} %lex-param {void* scanner}
/** Terminal symbols */ /** Terminal symbols */
%token FWTOK_RULE <strval>FWTOK_RULENAME FWTOK_USERS <strval>FWTOK_USER FWTOK_RULES FWTOK_MATCH FWTOK_ANY FWTOK_ALL FWTOK_STRICT_ALL FWTOK_DENY %token FWTOK_RULE FWTOK_USERS FWTOK_RULES FWTOK_MATCH FWTOK_ANY FWTOK_ALL
%token FWTOK_WILDCARD FWTOK_COLUMNS FWTOK_REGEX FWTOK_LIMIT_QUERIES FWTOK_WHERE_CLAUSE FWTOK_AT_TIMES FWTOK_ON_QUERIES %token FWTOK_STRICT_ALL FWTOK_DENY FWTOK_WILDCARD FWTOK_COLUMNS FWTOK_REGEX
%token <strval>FWTOK_SQLOP FWTOK_COMMENT <intval>FWTOK_INT <floatval>FWTOK_FLOAT FWTOK_PIPE <strval>FWTOK_TIME %token FWTOK_LIMIT_QUERIES FWTOK_WHERE_CLAUSE FWTOK_AT_TIMES FWTOK_ON_QUERIES
%token <strval>FWTOK_BTSTR <strval>FWTOK_QUOTEDSTR <strval>FWTOK_STR FWTOK_FUNCTION FWTOK_USES_FUNCTION <strval>FWTOK_CMP %token FWTOK_FUNCTION FWTOK_USES_FUNCTION FWTOK_COMMENT FWTOK_PIPE
/** Terminal typed symbols */
%token <floatval>FWTOK_FLOAT <strval>FWTOK_TIME <strval>FWTOK_BTSTR
%token <strval>FWTOK_QUOTEDSTR <strval>FWTOK_STR <strval>FWTOK_USER
%token <strval>FWTOK_CMP <strval>FWTOK_SQLOP <intval>FWTOK_INT <strval>FWTOK_RULENAME
/** Non-terminal symbols */ /** Non-terminal symbols */
%type <strval>rulename %type <strval>rulename
%type <strval>cond %type <strval>cond
%type <strval>columnlist
%type <strval>orlist %type <strval>orlist
%% %%
@ -118,16 +122,14 @@ mandatory:
| FWTOK_USES_FUNCTION functionusagelist | FWTOK_USES_FUNCTION functionusagelist
; ;
columnlist: columnvalue:
FWTOK_BTSTR {if (!define_columns_rule(scanner, $1)){YYERROR;}} FWTOK_BTSTR {if (!define_columns_rule(scanner, $1)){YYERROR;}}
| FWTOK_STR {if (!define_columns_rule(scanner, $1)){YYERROR;}} | FWTOK_STR {if (!define_columns_rule(scanner, $1)){YYERROR;}}
| columnlist FWTOK_BTSTR {if (!define_columns_rule(scanner, $2)){YYERROR;}}
| columnlist FWTOK_STR {if (!define_columns_rule(scanner, $2)){YYERROR;}}
; ;
functionlist: columnlist:
functionvalue columnvalue
| functionlist functionvalue | columnlist columnvalue
; ;
functionvalue: functionvalue:
@ -136,6 +138,11 @@ functionvalue:
| FWTOK_BTSTR {if (!define_function_rule(scanner, $1)){YYERROR;}} | FWTOK_BTSTR {if (!define_function_rule(scanner, $1)){YYERROR;}}
; ;
functionlist:
functionvalue
| functionlist functionvalue
;
functionusagevalue: functionusagevalue:
FWTOK_BTSTR {if (!define_function_usage_rule(scanner, $1)){YYERROR;}} FWTOK_BTSTR {if (!define_function_usage_rule(scanner, $1)){YYERROR;}}
| FWTOK_STR {if (!define_function_usage_rule(scanner, $1)){YYERROR;}} | FWTOK_STR {if (!define_function_usage_rule(scanner, $1)){YYERROR;}}
@ -145,7 +152,7 @@ functionusagelist:
| functionusagelist functionusagevalue | functionusagelist functionusagevalue
; ;
/** Optional parts of a rule */
optional: optional:
FWTOK_AT_TIMES timelist FWTOK_AT_TIMES timelist
| FWTOK_ON_QUERIES orlist | FWTOK_ON_QUERIES orlist