🦄 refactor: Redesign ast 49

caoccao · Dec 12, 2024 · adb70b1 · adb70b1
1 parent c439656
commit adb70b1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/...main/java/com/caoccao/javet/buddy/ts2java/ast/expr/Ts2JavaAstBinExprLogicalCondition.java b/...main/java/com/caoccao/javet/buddy/ts2java/ast/expr/Ts2JavaAstBinExprLogicalCondition.java
@@ -53,18 +53,18 @@ public Size apply(MethodVisitor methodVisitor, Implementation.Context context) {
                 if (!isLeftLogical) {
                     methodVisitor.visitJumpInsn(opcodeCompareFalse, labelFalse);
                 }
-                if (!isTopBinExpr() && isRightLogical) {
+                if (labelSwitched && isRightLogical) {
                     right.as(Ts2JavaAstBinExprLogical.class).setLabelSwitched(true);
                 }
                 sizes.add(right.apply(methodVisitor, context));
                 if (!isRightLogical) {
-                    methodVisitor.visitJumpInsn(opcodeCompareFalse, labelFalse);
+                    methodVisitor.visitJumpInsn(opcodeCompareFalse, labelSwitched ? labelTrue : labelFalse);
+                }
+                if (labelSwitched && isLeftLogical) {
+                    Ts2JavaAstBinExprLogical leftLogical = left.as(Ts2JavaAstBinExprLogical.class);
+                    methodVisitor.visitLabel(leftLogical.getLabelFalse());
+                    methodVisitor.visitFrame(Opcodes.F_SAME, 0, null, 0, null);
                 }
-//                if (!isTopBinExpr() && isLeftLogical) {
-//                    Ts2JavaAstBinExprLogical leftLogical = left.as(Ts2JavaAstBinExprLogical.class);
-//                    methodVisitor.visitLabel(labelFalse);
-//                    methodVisitor.visitFrame(Opcodes.F_SAME, 0, null, 0, null);
-//                }
                 break;
             }
             case LogicalOr: {

diff --git a/.../java/com/caoccao/javet/buddy/ts2java/ast/expr/TestTs2JavaAstBinExprLogicalCondition.java b/.../java/com/caoccao/javet/buddy/ts2java/ast/expr/TestTs2JavaAstBinExprLogicalCondition.java
@@ -338,9 +338,8 @@ public boolean not_LogicalAnd_ZZ_Z(boolean a, boolean b) {
         return !(a || b);
     }
 
-//    @Test
+    @Test
     public void testLogicalAndOrAnd_II_Z() throws Exception {
-        enableLogging();
         assertTrue(logicalAndOrAnd_II_Z(2, 2));
         assertFalse(logicalAndOrAnd_II_Z(1, 1));
         assertTrue(logicalAndOrAnd_II_Z(1, 2));