Merge pull request #23 from PetrPytelka/case-insensitive-operators

Case insensitive operators (Operators Not, And, Or are case insensitive)

Author: verhas

src/main/java/com/scriptbasic/syntax/expression/AbstractExpressionAnalyzer.java

@@ -39,12 +39,12 @@ private void consumeTheOperatorLexeme() throws AnalysisException {
     private boolean isOperatorWithPriority(final LexicalElement le,
                                            final Integer priority) {
         return le != null && le.isSymbol()
-                && getOperatorMap(priority).containsKey(le.getLexeme());
+                && getOperatorMap(priority).containsKey(le.getLexeme().toLowerCase());
     }
 
     private Class<? extends AbstractBinaryOperator> getOperatorClass(
             final LexicalElement le, final Integer priority) {
-        return getOperatorMap(priority).get(le.getLexeme());
+        return getOperatorMap(priority).get(le.getLexeme().toLowerCase());
     }
 
     private AbstractBinaryOperator getOperator(final LexicalElement le, final Integer priority)

src/main/java/com/scriptbasic/syntax/expression/BasicTagAnalyzer.java

@@ -104,7 +104,7 @@ private static boolean isOpeningParenthese(
 
     private static boolean isUnaryOperator(final LexicalElement lexicalElement) {
         return lexicalElement.isSymbol()
-                && unaryOperatorMap.containsKey(lexicalElement.getLexeme());
+                && unaryOperatorMap.containsKey(lexicalElement.getLexeme().toLowerCase());
     }
 
     @Override
@@ -192,7 +192,7 @@ private AbstractUnaryOperator newUnaryOperator(
         final var lexicalElement = LexUtility.get(lexicalAnalyzer);
         final AbstractUnaryOperator operator;
         try {
-            operator = unaryOperatorMap.get(lexicalElement.getLexeme())
+            operator = unaryOperatorMap.get(lexicalElement.getLexeme().toLowerCase())
                     .getDeclaredConstructor().newInstance();
         } catch (final Exception e) {
             throw new BasicSyntaxException(e);

src/test/java/com/scriptbasic/executors/operators/TestOperators.java

@@ -70,7 +70,10 @@ public void testOperators() throws AnalysisException,
         a("a=+3-3", 0);
         a("a=+3.2+-2", 1.2);
         a("a=-3.4", -3.4);
+        a("a= False", false);
+        a("a= True", true);
         a("a= not a", true);
+        a("a= Not a", true);
         a("a= not false", true);
         a("a= not true", false);
         a("a= 3 < 2", false);
@@ -142,7 +145,9 @@ public void testOperators() throws AnalysisException,
         a("a= \"apple\" > \"apale\"", true);
 
         a("a= \"x\" and \"\"", false);
+        a("a= \"x\" And \"\"", false);
         a("a= \"x\" or \"\"", true);
+        a("a= \"x\" Or \"\"", true);
         a("a= \"x\" and \"z\"", true);
         a("a= \"x\" or \"z\"", true);
         a("a= 13.2 or false", true);