X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=parser%2Fgrammar.ebnf;h=8e0a4030128870b8261bb5bd2a72a777be981878;hb=68e275cbafcc371903793d58e409dfe5494c4e92;hp=ccfe6eb0de71e334572ccce758e7254a33e5dfca;hpb=060dd73b017ac73fd731adfb7bf286c24fb036f4;p=phdru.name%2Fcgi-bin%2Fblog-ru%2Fsearch-tags.git

diff --git a/parser/grammar.ebnf b/parser/grammar.ebnf
index ccfe6eb..8e0a403 100644
--- a/parser/grammar.ebnf
+++ b/parser/grammar.ebnf
@@ -36,7 +36,7 @@ not_expression: not and_sub_expression
 
 expression_parens : "(" expression ")"
 
-name : /[A-Za-zá-ñÁ-Ñ][A-Za-zá-ñÁ-Ñ0-9_]+/
+name : /[A-Za-zá-ñÁ-Ñ][A-Za-zá-ñÁ-Ñ0-9_]*[A-Za-zá-ñÁ-Ñ0-9]/
 
 ?and : and_op
      | and_op and_op
@@ -57,12 +57,18 @@ name : /[A-Za-z
 
 ?and_word : "AND"
           | "and"
+          | "é"
+          | "É"
 
 ?or_word : "OR"
          | "or"
+         | "éìé"
+         | "ÉÌÉ"
 
 ?not_word : "NOT"
           | "not"
+          | "îå"
+          | "ÎÅ"
 
 %import common.WS
 %ignore WS