[Движок] Добавлена поддержка операции неравенства ("<>") в выражениях.

#ifml2-382639 Fix, Fix version 2016.3

Author: realsonic

docs/notes.txt

@@ -21,6 +21,7 @@
     +   [Движок] Добавлены системные переменные "секунды" и "минуты", возвращающие кол-во время
         с начала игры. При перезапуске игры время обнуляется.
     +   [Движок] Добавлена поддержка операций сравнения (">" и "<") в выражениях.
+    +   [Движок] Добавлена поддержка операции неравенства ("<>") в выражениях.
 
 -----------------------------------------------------------------------------------------------
 Выпуск 2016/2.1

src/ifml2/vm/ExpressionCalculator.java

@@ -23,6 +23,7 @@ public class ExpressionCalculator
     private static final String AND_OPERATOR = "и";
     private static final String OR_OPERATOR = "или";
     private static final String IN_OPERATOR = "в";
+    private static final String NOT_EQUAL_OPERATOR = "<>";
 
     private static final char QUOTE_CHAR = '"';
     private static final char SINGLE_QUOTE_CHAR = '\'';
@@ -166,8 +167,26 @@ else if (IN_OPERATOR.equalsIgnoreCase(tokenizer.sval))
                         break;
 
                     case LESSER_OPERATOR:
-                        calculationStack.pushOperator(ExpressionOperator.COMPARE_LESSER);
-                        context = OPERATOR;
+                        // check it's not not equal <>
+                        int nextToken = tokenizer.nextToken();
+                        if (nextToken == GREATER_OPERATOR) // is't <> !
+                        {
+                            switch (context)
+                            {
+                                case OPERAND:
+                                    calculationStack.pushOperator(ExpressionOperator.COMPARE_NOT_EQUALITY);
+                                    context = OPERATOR;
+                                    break;
+                                default:
+                                    throw new IFML2ExpressionException("Ошибка в выражении: {0} может следовать только за операндом",
+                                            NOT_EQUAL_OPERATOR);
+                            }
+                        }
+                        else {
+                            tokenizer.pushBack(); // it's not <> so process next
+                            calculationStack.pushOperator(ExpressionOperator.COMPARE_LESSER);
+                            context = OPERATOR;
+                        }
                         break;
 
                     case ADD_OPERATOR:
@@ -229,10 +248,12 @@ private enum ExpressionOperator
         NOT(NOT_OPERATOR, OperatorType.UNARY_RIGHT, 40),
         ADD(ADD_OPERATOR, 30),
         COMPARE_EQUALITY(EQUALITY_OPERATOR, 20),
+        COMPARE_NOT_EQUALITY(NOT_EQUAL_OPERATOR, OperatorType.BINARY, 20),
         COMPARE_GREATER(GREATER_OPERATOR, 20),
         COMPARE_LESSER(LESSER_OPERATOR, 20),
         AND(AND_OPERATOR, OperatorType.BINARY, 10),
         OR(OR_OPERATOR, OperatorType.BINARY, 5);
+
         public final char operatorCharacter;
         public final int priority;
         public String operatorString;
@@ -380,6 +401,34 @@ private Value doOperation(ExpressionOperator operator) throws IFML2Exception
                     break;
                 }
 
+                case COMPARE_NOT_EQUALITY:
+                {
+                    Value resolvedLeftValue = ensureValueResolved(leftValue);
+                    Value resolvedRightValue = ensureValueResolved(rightValue);
+
+                    assert resolvedLeftValue != null;
+
+                    Value.CompareResult compareResult = resolvedLeftValue.compareTo(resolvedRightValue);
+                    switch (compareResult)
+                    {
+                        case EQUAL:
+                            result = new BooleanValue(false);
+                            break;
+                        case UNEQUAL:
+                        case LEFT_BIGGER:
+                        case RIGHT_BIGGER:
+                            result = new BooleanValue(true);
+                            break;
+                        case NOT_APPLICABLE:
+                            throw new IFML2ExpressionException("Сравниваемые величины разного типа ({0} и {1})", leftValue, rightValue);
+
+                        default:
+                            throw new IFML2VMException("Неизвестный результат сравнения величин ({0})", compareResult);
+                    }
+
+                    break;
+                }
+
                 case COMPARE_GREATER:
                 {
                     Value resolvedLeftValue = ensureValueResolved(leftValue);