Change handling of spaces

[phdru.name/cgi-bin/blog-ru/search-tags.git] / parser / grammar

diff --git a/parser/grammar b/parser/grammar
index 5a0c3d53a1a9c8d5f5d270804ed7f3150e0637bc..7c34096e3bdb10aaee6557185dcca6c60fb6d893 100644 (file)
--- a/parser/grammar
+++ b/parser/grammar
@@ -26,9 +26,13 @@ NOT_OP : '!'
 SP1 : '[ \t]+'
 
 expression : NAME
-           | expression AND_OP AND_OP expression
-           | expression AND_OP expression
-           | expression OR_OP OR_OP expression
-           | expression OR_OP expression
-           | NOT_OP expression
-           | '(' expression ')'
+           | expression SP0 AND_OP AND_OP SP0 expression
+           | expression SP0 AND_OP SP0 expression
+           | NOT_OP SP0 expression
+           | expression SP0 OR_OP OR_OP SP0 expression
+           | expression SP0 OR_OP SP0 expression
+           | '(' SP0 expression SP0 ')'
+
+SP0 : SP1 | empty
+
+empty :