fixed more bugs

Author: mug1wara26

server/src/rules/binaryExpression.ts

@@ -20,7 +20,7 @@ export const binaryExpressionRule = new class extends Rule<BinaryExpression> {
         '>=',
         '&&',
         '||'
-      ]
+    ]
 
     public process(child: BinaryExpression, parent: Node, context: Context, ast: AST): void {
         ast.checkIncompleteLeftRightStatement(child.left, child.right, child.loc!, "Incomplete binary expression");
@@ -39,19 +39,30 @@ export const binaryExpressionRule = new class extends Rule<BinaryExpression> {
             // undefined is an identifier so we have to check this first
             if (child.left.type === NODES.IDENTIFIER && child.left.name === "undefined")
                 ast.addDiagnostic(`Expected string or number on left hand side of operation, got undefined`, DiagnosticSeverity.Error, child.left.loc!);
-            else if (child.left.type === NODES.LITERAL) {
+
+
+            let left_type_correct = false;
+            if (child.left.type === NODES.LITERAL) {
                 const left_type = typeof child.left.value;
-                if (!(left_type === "string" || left_type === "number"))
+                left_type_correct = true;
+                if (!(left_type === "string" || left_type === "number")) {
                     ast.addDiagnostic(`Expected string or number on left hand side of operation, got ${child.left.value === null ? "null" : left_type}`, DiagnosticSeverity.Error, child.left.loc!);
+                    left_type_correct = false;
+                }
 
-                else if (child.right.type === NODES.IDENTIFIER && child.right.name === "undefined")
+                if (child.right.type === NODES.IDENTIFIER && child.right.name === "undefined" && left_type_correct)
                     ast.addDiagnostic(`Expected ${left_type} on left hand side of operation, got undefined`, DiagnosticSeverity.Error, child.right.loc!);
-                else if (child.right.type === NODES.LITERAL) {
+                if (child.right.type === NODES.LITERAL) {
                     const right_type = typeof child.right.value;
-                    if (left_type !== right_type)
+                    if (left_type !== right_type && left_type_correct)
                         ast.addDiagnostic(`Expected ${left_type} on right hand side of operation, got ${child.right.value === null ? "null" : right_type}`, DiagnosticSeverity.Error, child.right.loc!);
                 }
             }
+            if (!left_type_correct && (child.right.type === NODES.LITERAL || (child.right.type === NODES.IDENTIFIER && child.right.name === "undefined"))) {
+                const right_type = child.right.type === NODES.LITERAL ?  typeof child.right.value : "undefined";
+                if (!(right_type === "string" || right_type === "number"))
+                    ast.addDiagnostic(`Expected string or number on right hand side of operation, got ${right_type === "object" ? "null" : right_type}`, DiagnosticSeverity.Error, child.right.loc!);
+            }
         }
     }
 };