Allow ' OR ' and ' or '

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

diff --git a/parser/grammar b/parser/grammar
index 17d3098324c6117c5c509a4c27ece95030766876..694437875fcc62548065bef2d439eeb3a9f41f46 100644 (file)
--- a/parser/grammar
+++ b/parser/grammar
@@ -3,12 +3,15 @@
 # The grammar defines expressions in the following forms:
 #  TAG - search blog posts that contain the tag;
 #  !TAG - search blog posts that don't contain the tag;
-#  TAG && TAG, TAG & TAG - search blog posts that contain both tags;
+#  TAG & TAG - search blog posts that contain both tags;
 #  TAG | TAG - search blog posts that contain any of the tags;
-# Parentheses are allowed to group expressions:
+# Parentheses are allowed to group expressions; for example:
 #  TAG & (TAG | TAG)
 #  !(TAG | TAG)
-# and so on. This  is a simple version of the grammar and it allows
+# Allowed operators: conjunction - & && AND and
+#                    disjunction - | || OR or
+#                    negation    - !
+# This  is a simple version of the grammar and it allows
 # rather stupid expressions, like !!TAG or ((TAG)); in the future
 # it will be fixed by making the grammar more complex and stricter.
 
@@ -23,8 +26,33 @@ NOT_OP : '!'
 SP1 : '[ \t]+'
 
 expression : NAME
-           | expression AND_OP AND_OP expression
-           | expression AND_OP expression
-           | expression OR_OP expression
-           | NOT_OP expression
-           | '(' expression ')'
+           | expression SP0 AND_OP AND_OP SP0 expression
+           | expression SP0 AND_OP SP0 expression
+           | l_expression and_word r_expression
+           | NOT_OP SP0 expression
+           | expression SP0 OR_OP OR_OP SP0 expression
+           | expression SP0 OR_OP SP0 expression
+           | l_expression or_word r_expression
+           | expression_parens
+
+l_expression : expression_parens
+             | expression_sp
+
+r_expression : expression_parens
+             | sp_expression
+
+expression_parens : '(' SP0 expression SP0 ')'
+
+sp_expression : SP1 expression
+
+expression_sp : expression SP1
+
+and_word : 'A' 'N' 'D'
+         | 'a' 'n' 'd'
+
+or_word : 'O' 'R'
+        | 'o' 'r'
+
+SP0 : SP1 | empty
+
+empty :