fix: short-circuiting not working correctly

LuanRT · Aug 25, 2022 · 8b610d1 · 8b610d1
1 parent 475fc89
commit 8b610d1
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/src/nodes/LogicalExpression.ts b/src/nodes/LogicalExpression.ts
@@ -4,18 +4,19 @@ export default class LogicalExpression {
   static visit(node: any, visitor: Visitor) {
     const operator: string = node.operator;
 
-    if (node.operator !== '&&' && node.operator !== '||')
-      throw Error(`Unsupported logical operator: ${operator}`);
-
     switch (operator) {
       case '&&': {
         const left_side = visitor.visitNode(node.left);
-        return left_side && visitor.visitNode(node.right);
+        if (left_side === true)
+          return visitor.visitNode(node.right);
+        return left_side;
       }
       case '||': {
         const left_side = visitor.visitNode(node.left);
         return left_side || visitor.visitNode(node.right);
       }
+      default:
+        throw Error(`Unsupported logical operator: ${operator}`);
     }
   }
 }