Added logical || and && operator to binary expression AST.

nthnn · Apr 27, 2024 · 2ce60c5 · 2ce60c5
1 parent 6b14334
commit 2ce60c5
Showing 1 changed file with 62 additions and 6 deletions.
diff --git a/core/ast/expr/expr_binary.ts b/core/ast/expr/expr_binary.ts
@@ -444,6 +444,44 @@ export default class ExprASTBinary implements ExpressionAST {
             leftType.toString() + '<<' + rightType.toString() + ']');
     }
 
+    private visitOr(
+        builder: IRBuilder,
+        module: Module
+    ): Value {
+        const leftType: DataType =
+            this.left.type();
+        const rightType: DataType =
+            this.right.type();
+
+        if(leftType == DataType.BOOL && rightType == DataType.BOOL)
+            return builder.CreateOr(
+                this.left.visit(builder, module),
+                this.right.visit(builder, module)
+            );
+
+        throw new ASTError('Invalid binary operation [' +
+            leftType.toString() + '||' + rightType.toString() + ']');
+    }
+
+    private visitAnd(
+        builder: IRBuilder,
+        module: Module
+    ): Value {
+        const leftType: DataType =
+            this.left.type();
+        const rightType: DataType =
+            this.right.type();
+
+        if(leftType == DataType.BOOL && rightType == DataType.BOOL)
+            return builder.CreateAnd(
+                this.left.visit(builder, module),
+                this.right.visit(builder, module)
+            );
+
+        throw new ASTError('Invalid binary operation [' +
+            leftType.toString() + '&&' + rightType.toString() + ']');
+    }
+
     public visit(
         builder: IRBuilder,
         module: Module
@@ -488,6 +526,16 @@ export default class ExprASTBinary implements ExpressionAST {
                 builder,
                 module
             );
+        else if(this.operator == '||')
+            return this.visitOr(
+                builder,
+                module
+            );
+        else if(this.operator == '&&')
+            return this.visitAnd(
+                builder,
+                module
+            );
 
         throw new ASTError('Invalid operation.');
     }
@@ -543,6 +591,10 @@ export default class ExprASTBinary implements ExpressionAST {
             else if(DataType.isOfUIntType(a) && DataType.isOfUIntType(b))
                 return DataType.greaterUIntegerType(a, b);
         }
+        else if((this.operator == '||' ||
+            this.operator == '&&') &&
+            a == DataType.BOOL && b == DataType.BOOL)
+            return DataType.BOOL;
 
         throw new ASTError("Incompatible types for binary operation.");
     }
@@ -728,12 +780,16 @@ export default class ExprASTBinary implements ExpressionAST {
                 ') operation with ' + leftType.toString() +
                 ' and ' + rightType.toString()
             );
-
-        this.resolveExpressions(
-            results,
-            returnType,
-            unsafe
-        );
+        else if((this.operator == '||' ||
+            this.operator == '&&') &&
+            !(leftType == DataType.BOOL &&
+            rightType == DataType.BOOL))
+            results.errors.set(
+                this.marker(),
+                'Invalid logic operator (' + this.operator +
+                ') operation with ' + leftType.toString() +
+                ' and ' + rightType.toString()
+            );
     }
 
     public marker(): Token {