literals = '()'
-tokens = ('NAME', 'AND_OP', 'OR_OP', 'NOT_OP', 'SP1')
+tokens = ('OP_WORD', 'NAME', 'AND_OP', 'OR_OP', 'NOT_OP', 'SP1')
-t_NAME = '([a-z][a-z0-9_]*)|AND|OR|NOT'
+t_OP_WORD = '(AND|and|OR|or|NOT|not)'
+
+t_NAME = '([a-z][a-z0-9_]*)'
t_AND_OP = '&'
p[0] = ('AND', p[1], p[3])
elif p[2] in ('OR', 'or'):
p[0] = ('OR', p[1], p[3])
+ else:
+ raise ValueError(p)
def p_expression_or_or(p):
"""expression : expression SP0 OR_OP OR_OP SP0 expression"""
"""expression : NOT_OP SP0 expression"""
p[0] = ('NOT', p[3])
+def p_expression_not_word(p):
+ """expression : op_word r_expression"""
+ if p[1] in ('NOT', 'not'):
+ p[0] = ('NOT', p[2])
+ else:
+ raise ValueError(p)
+
def p_expression_in_parens(p):
"""expression : expression_parens"""
p[0] = p[1]
p[0] = ('PARENS', p[3])
def p_op_word(p):
- """op_word : NAME"""
- if p[1] in ('AND', 'and', 'OR', 'or'):
+ """op_word : OP_WORD"""
+ if p[1] in ('AND', 'and', 'OR', 'or', 'NOT', 'not'):
p[0] = p[1]
else:
raise SyntaxError