fix: removed და and ან keywords; და is matched before დააბრუნე and it…

… causes the syntax errors for დააბრუნე

ena/compiler.lua

@@ -22,8 +22,6 @@ local toName = {
     [lop.not_] = "not",
     [lop.and_] = "and",
     [lop.or_] = "or",
-    [lop.and_geo] = "and",
-    [lop.or_geo] = "or"
 }
 
 local unaryToName = {
@@ -166,12 +164,12 @@ function Compiler:codeExpression(ast)
         self:codeExpression(ast.size)
         self:addCode("newArray")
     elseif ast.tag == "binaryOp" then
-        if ast.op == lop.and_ or ast.op == lop.and_geo then
+        if ast.op == lop.and_ then
             self:codeExpression(ast.firstChild)
             local fixupSSAnd = self:addJump("jumpIfFalseJumpNoPop")
             self:codeExpression(ast.secondChild)
             self:fixupJump(fixupSSAnd)
-        elseif ast.op == lop.or_ or ast.op == lop.or_geo then
+        elseif ast.op == lop.or_ then
             self:codeExpression(ast.firstChild)
             local fixupSSOr = self:addJump("jumpIfTrueJumpNoPop")
             self:codeExpression(ast.secondChild)

ena/lang/literals.lua

@@ -24,8 +24,6 @@ module.op.equal = "=="
 module.op.notEqual = "!="
 module.op.and_ = "&&"
 module.op.or_ = "||"
-module.op.and_geo = "და"
-module.op.or_geo = "ან"
 
 -- unary operators --
 module.op.not_ = "!"

ena/parser.lua

@@ -139,7 +139,7 @@ tokens.op.unarySign = T(C(P(l.op.positive) + l.op.negate))
 tokens.op.not_ = T(C(l.op.not_))
 tokens.op.print = T(l.op.print)
 tokens.op.exec = T(l.op.exec)
-tokens.op.logical = T(C(l.op.and_) + C(l.op.or_) + C(l.op.and_geo) + C(l.op.or_geo))
+tokens.op.logical = T(C(l.op.and_) + C(l.op.or_))
 
 local op = tokens.op
 local sep = tokens.sep