Skip to content

Commit af89454

Browse files
committed
Fix confusing yacc rule names
1 parent b299ca4 commit af89454

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
@@ -75,8 +75,8 @@ func reduceFilter(left Filter, op string, right Filter) Filter {
7575
}
7676

7777
%type <expr> filter_rule
78+
%type <expr> filter_chain_list
7879
%type <expr> filter_chain
79-
%type <expr> conditions_expr
8080
%type <expr> maybe_negated_condition_expr
8181
%type <expr> condition_expr
8282
%type <expr> exists_expr
@@ -100,7 +100,7 @@ func reduceFilter(left Filter, op string, right Filter) Filter {
100100
%type <text> "!"
101101

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

106106
%nonassoc T_EQUAL T_UNEQUAL T_LIKE T_UNLIKE
@@ -113,30 +113,30 @@ func reduceFilter(left Filter, op string, right Filter) Filter {
113113

114114
%%
115115

116-
filter_rule: filter_chain logical_op filter_chain
116+
filter_rule: filter_chain_list logical_op filter_chain_list
117117
{
118118
$$ = reduceFilter($1, $2, $3)
119119
yylex.(*Lexer).rule = $$
120120
}
121-
| filter_chain %prec PREFER_SHIFTING_LOGICAL_OP
121+
| filter_chain_list %prec PREFER_SHIFTING_LOGICAL_OP
122122
{
123123
yylex.(*Lexer).rule = $$
124124
}
125-
| filter_rule logical_op filter_chain
125+
| filter_rule logical_op filter_chain_list
126126
{
127127
$$ = reduceFilter($1, $2, $3)
128128
yylex.(*Lexer).rule = $$
129129
}
130130
;
131131

132-
filter_chain: conditions_expr logical_op maybe_negated_condition_expr
132+
filter_chain_list: filter_chain logical_op maybe_negated_condition_expr
133133
{
134134
$$ = reduceFilter($1, $2, $3)
135135
}
136-
| conditions_expr %prec PREFER_SHIFTING_LOGICAL_OP
136+
| filter_chain %prec PREFER_SHIFTING_LOGICAL_OP
137137
;
138138

139-
conditions_expr: maybe_negated_condition_expr logical_op maybe_negated_condition_expr
139+
filter_chain: maybe_negated_condition_expr logical_op maybe_negated_condition_expr
140140
{
141141
$$ = reduceFilter($1, $2, $3)
142142
}

0 commit comments

Comments
 (0)