Fix(parser): Буква `Ё`

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

diff --git a/parser/grammar.ebnf b/parser/grammar.ebnf
index 3be4d166e0ed7eac1643b7e0176d35e2e75f7d8a..8ccdd76b4f04c87b175e43df2bdccc7f242ead06 100644 (file)
--- 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_]*[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