X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=parser%2Fgrammar.ebnf;h=2877e8f63edfa85e07a5d7b202891fea1a648c17;hb=a4b4cf32ed4f7a1037acab2f22da6e14010e5d0a;hp=3be4d166e0ed7eac1643b7e0176d35e2e75f7d8a;hpb=2e7b7f0cd4c51eb465780317446a81401eb71faa;p=phdru.name%2Fcgi-bin%2Fblog-ru%2Fsearch-tags.git

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