Skip to content

Commit 755b6ae

Browse files
committed
Fix confusing yacc rule names
1 parent 82d3141 commit 755b6ae

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

internal/filter/parser.y

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ func reduceFilter(left Filter, op string, right Filter) Filter {
7777
}
7878

7979
%type <expr> filter_rule
80+
%type <expr> filter_chain_list
8081
%type <expr> filter_chain
81-
%type <expr> conditions_expr
8282
%type <expr> maybe_negated_condition_expr
8383
%type <expr> condition_expr
8484
%type <expr> exists_expr
@@ -102,7 +102,7 @@ func reduceFilter(left Filter, op string, right Filter) Filter {
102102
%type <text> "!"
103103

104104
// This is just used for declaring explicit precedence and resolves shift/reduce conflicts
105-
// in `filter_chain` and `conditions_expr` rules.
105+
// in `filter_chain_list` and `filter_chain` rules.
106106
%nonassoc PREFER_SHIFTING_LOGICAL_OP
107107

108108
%nonassoc T_EQUAL T_UNEQUAL T_LIKE T_UNLIKE
@@ -115,30 +115,30 @@ func reduceFilter(left Filter, op string, right Filter) Filter {
115115

116116
%%
117117

118-
filter_rule: filter_chain logical_op filter_chain
118+
filter_rule: filter_chain_list logical_op filter_chain_list
119119
{
120120
$$ = reduceFilter($1, $2, $3)
121121
yylex.(*Lexer).rule = $$
122122
}
123-
| filter_chain %prec PREFER_SHIFTING_LOGICAL_OP
123+
| filter_chain_list %prec PREFER_SHIFTING_LOGICAL_OP
124124
{
125125
yylex.(*Lexer).rule = $$
126126
}
127-
| filter_rule logical_op filter_chain
127+
| filter_rule logical_op filter_chain_list
128128
{
129129
$$ = reduceFilter($1, $2, $3)
130130
yylex.(*Lexer).rule = $$
131131
}
132132
;
133133

134-
filter_chain: conditions_expr logical_op maybe_negated_condition_expr
134+
filter_chain_list: filter_chain logical_op maybe_negated_condition_expr
135135
{
136136
$$ = reduceFilter($1, $2, $3)
137137
}
138-
| conditions_expr %prec PREFER_SHIFTING_LOGICAL_OP
138+
| filter_chain %prec PREFER_SHIFTING_LOGICAL_OP
139139
;
140140

141-
conditions_expr: maybe_negated_condition_expr logical_op maybe_negated_condition_expr
141+
filter_chain: maybe_negated_condition_expr logical_op maybe_negated_condition_expr
142142
{
143143
$$ = reduceFilter($1, $2, $3)
144144
}

0 commit comments

Comments
 (0)