-def p_expression_and_word(p):
- """expression : l_expression and_word r_expression"""
- p[0] = ('AND', p[1], p[3])
-
-def p_expression_not(p):
- """expression : NOT_OP SP0 expression"""
- p[0] = ('NOT', p[3])
+def p_expression_op_word(p):
+ """expression : l_expression op_word r_expression"""
+ if p[2] in ('AND', 'and'):
+ p[0] = ('AND', p[1], p[3])
+ elif p[2] in ('OR', 'or'):
+ p[0] = ('OR', p[1], p[3])