✨ feat: Add ITs2JavaAst#syncLabels()

caoccao · Dec 16, 2024 · 4bdc754 · 4bdc754
1 parent a957f68
commit 4bdc754
Show file tree

Hide file tree

Showing 25 changed files with 132 additions and 23 deletions.
diff --git a/src/main/java/com/caoccao/javet/buddy/ts2java/Ts2Java.java b/src/main/java/com/caoccao/javet/buddy/ts2java/Ts2Java.java
@@ -101,6 +101,7 @@ public void transpile() throws Swc4jCoreException {
                     new Ts2JavaMemoDynamicType(builder),
                     getPackageName());
             ts2JavaAstClassDecl.compile();
+            ts2JavaAstClassDecl.syncLabels();
             if (logging) {
                 ts2JavaAstClassDecl.apply(new JavaLoggingMethodVisitor(Opcodes.ASM9), null);
             }

diff --git a/src/main/java/com/caoccao/javet/buddy/ts2java/ast/clazz/Ts2JavaAstClass.java b/src/main/java/com/caoccao/javet/buddy/ts2java/ast/clazz/Ts2JavaAstClass.java
@@ -64,4 +64,9 @@ public void compile() {
     public List<ITs2JavaAstClassMember<?, ?>> getBody() {
         return body;
     }
+
+    @Override
+    public void syncLabels() {
+        body.forEach(ITs2JavaAstClassMember::syncLabels);
+    }
 }
diff --git a/src/main/java/com/caoccao/javet/buddy/ts2java/ast/clazz/Ts2JavaAstClassMethod.java b/src/main/java/com/caoccao/javet/buddy/ts2java/ast/clazz/Ts2JavaAstClassMethod.java
@@ -83,4 +83,9 @@ public void compile() {
     public Ts2JavaAstFunction getFunction() {
         return function;
     }
+
+    @Override
+    public void syncLabels() {
+        function.syncLabels();
+    }
 }
diff --git a/src/main/java/com/caoccao/javet/buddy/ts2java/ast/clazz/Ts2JavaAstFunction.java b/src/main/java/com/caoccao/javet/buddy/ts2java/ast/clazz/Ts2JavaAstFunction.java
@@ -117,4 +117,11 @@ public String getName() {
     public Optional<Ts2JavaAstTsTypeAnn> getReturnType() {
         return returnType;
     }
+
+    @Override
+    public void syncLabels() {
+        body.ifPresent(Ts2JavaAstBlockStmt::syncLabels);
+        params.forEach(Ts2JavaAstParam::syncLabels);
+        returnType.ifPresent(Ts2JavaAstTsTypeAnn::syncLabels);
+    }
 }
diff --git a/src/main/java/com/caoccao/javet/buddy/ts2java/ast/clazz/Ts2JavaAstParam.java b/src/main/java/com/caoccao/javet/buddy/ts2java/ast/clazz/Ts2JavaAstParam.java
@@ -64,4 +64,9 @@ public JavaLocalVariable getLocalVariable() {
     public ITs2JavaAstPat<?, ?> getPat() {
         return pat;
     }
+
+    @Override
+    public void syncLabels() {
+        pat.syncLabels();
+    }
 }
diff --git a/src/main/java/com/caoccao/javet/buddy/ts2java/ast/expr/Ts2JavaAstBinExpr.java b/src/main/java/com/caoccao/javet/buddy/ts2java/ast/expr/Ts2JavaAstBinExpr.java
@@ -90,4 +90,10 @@ public Swc4jAstBinaryOp getOp() {
     public boolean isTopBinExpr() {
         return parent == null || !(parent instanceof Ts2JavaAstBinExpr);
     }
+
+    @Override
+    public void syncLabels() {
+        left.syncLabels();
+        right.syncLabels();
+    }
 }
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
@@ -147,10 +147,8 @@ public Size apply(MethodVisitor methodVisitor, Implementation.Context context) {
                                 labelSwitched ? labelTrue : labelFalse);
                     }
                 }
-                if (isTopBinExpr()) {
-                    methodVisitor.visitLabel(labelTrue);
-                    methodVisitor.visitFrame(Opcodes.F_SAME, 0, null, 0, null);
-                }
+                methodVisitor.visitLabel(labelTrue);
+                methodVisitor.visitFrame(Opcodes.F_SAME, 0, null, 0, null);
                 break;
             }
             default:
@@ -186,40 +184,44 @@ public void compile() {
                     SimpleFreeMarkerFormat.format("Unsupported right type ${type} in logical AND (&&).",
                             SimpleMap.of("type", right.getType().getName())));
         }
+    }
+
+    @Override
+    public Swc4jAstBinaryOp getResolvedOp() {
+        return bangFlipped ? op.getOppositeOperator() : op;
+    }
+
+    @Override
+    public void syncLabels() {
         final boolean isLeftLogical = left instanceof Ts2JavaAstBinExprLogical;
         final boolean isRightLogical = right instanceof Ts2JavaAstBinExprLogical;
         if (isLeftLogical && isRightLogical) {
             Ts2JavaAstBinExprLogical leftLogical = left.as(Ts2JavaAstBinExprLogical.class);
             Ts2JavaAstBinExprLogical rightLogical = right.as(Ts2JavaAstBinExprLogical.class);
-            switch (op) {
+            final Swc4jAstBinaryOp resolvedOp = getResolvedOp();
+            switch (resolvedOp) {
                 case LogicalAnd:
-                    labelTrue = leftLogical.getLabelTrue();
-                    labelFalse = rightLogical.getLabelFalse();
-                    leftLogical.setLabelFalse(labelFalse);
                     rightLogical.setLabelTrue(labelTrue);
+                    rightLogical.setLabelFalse(labelFalse);
+                    leftLogical.setLabelFalse(labelFalse);
                     break;
                 case LogicalOr:
-                    labelTrue = leftLogical.getLabelTrue();
-                    labelFalse = rightLogical.getLabelFalse();
+                    leftLogical.setLabelTrue(labelTrue);
                     leftLogical.setLabelFalse(labelFalse);
-                    rightLogical.setLabelTrue(labelTrue);
+                    rightLogical.setLabelFalse(labelFalse);
                     break;
                 default:
                     throw new Ts2JavaAstException(ast, "Logical OR (||) is not supported.");
             }
         } else if (isLeftLogical) {
             Ts2JavaAstBinExprLogical leftLogical = left.as(Ts2JavaAstBinExprLogical.class);
-            labelTrue = leftLogical.getLabelTrue();
-            labelFalse = leftLogical.getLabelFalse();
+            leftLogical.setLabelTrue(labelTrue);
+            leftLogical.setLabelFalse(labelFalse);
         } else if (isRightLogical) {
             Ts2JavaAstBinExprLogical rightLogical = right.as(Ts2JavaAstBinExprLogical.class);
-            labelTrue = rightLogical.getLabelTrue();
-            labelFalse = rightLogical.getLabelFalse();
+            rightLogical.setLabelTrue(labelTrue);
+            rightLogical.setLabelFalse(labelFalse);
         }
-    }
-
-    @Override
-    public Swc4jAstBinaryOp getResolvedOp() {
-        return bangFlipped ? op.getOppositeOperator() : op;
+        super.syncLabels();
     }
 }
diff --git a/src/main/java/com/caoccao/javet/buddy/ts2java/ast/expr/Ts2JavaAstIdent.java b/src/main/java/com/caoccao/javet/buddy/ts2java/ast/expr/Ts2JavaAstIdent.java
@@ -94,4 +94,8 @@ public String getTypeName() {
     public boolean isOptional() {
         return optional;
     }
+
+    @Override
+    public void syncLabels() {
+    }
 }
diff --git a/src/main/java/com/caoccao/javet/buddy/ts2java/ast/expr/Ts2JavaAstIdentName.java b/src/main/java/com/caoccao/javet/buddy/ts2java/ast/expr/Ts2JavaAstIdentName.java
@@ -63,4 +63,8 @@ public void compile() {
     public String getSym() {
         return sym;
     }
+
+    @Override
+    public void syncLabels() {
+    }
 }
diff --git a/src/main/java/com/caoccao/javet/buddy/ts2java/ast/expr/Ts2JavaAstParenExpr.java b/src/main/java/com/caoccao/javet/buddy/ts2java/ast/expr/Ts2JavaAstParenExpr.java
@@ -67,4 +67,9 @@ public void compile() {
     public TypeDescription getType() {
         return expr.getType();
     }
+
+    @Override
+    public void syncLabels() {
+        expr.syncLabels();
+    }
 }
diff --git a/src/main/java/com/caoccao/javet/buddy/ts2java/ast/expr/Ts2JavaAstUnaryExpr.java b/src/main/java/com/caoccao/javet/buddy/ts2java/ast/expr/Ts2JavaAstUnaryExpr.java
@@ -168,4 +168,9 @@ public boolean isMinusFlippable() {
         }
         return false;
     }
+
+    @Override
+    public void syncLabels() {
+        arg.syncLabels();
+    }
 }
diff --git a/src/main/java/com/caoccao/javet/buddy/ts2java/ast/expr/lit/Ts2JavaAstBool.java b/src/main/java/com/caoccao/javet/buddy/ts2java/ast/expr/lit/Ts2JavaAstBool.java
@@ -75,4 +75,8 @@ public boolean isBangFlippable() {
     public boolean isValue() {
         return value;
     }
+
+    @Override
+    public void syncLabels() {
+    }
 }
diff --git a/src/main/java/com/caoccao/javet/buddy/ts2java/ast/expr/lit/Ts2JavaAstNumber.java b/src/main/java/com/caoccao/javet/buddy/ts2java/ast/expr/lit/Ts2JavaAstNumber.java
@@ -118,4 +118,8 @@ public boolean isMinusFlippable() {
     public boolean isNegative() {
         return negative;
     }
+
+    @Override
+    public void syncLabels() {
+    }
 }
diff --git a/src/main/java/com/caoccao/javet/buddy/ts2java/ast/interfaces/ITs2JavaAst.java b/src/main/java/com/caoccao/javet/buddy/ts2java/ast/interfaces/ITs2JavaAst.java
@@ -51,4 +51,6 @@ default <T> T as(Class<T> clazz) {
     default boolean isValid() {
         return true;
     }
+
+    void syncLabels();
 }
diff --git a/src/main/java/com/caoccao/javet/buddy/ts2java/ast/pat/Ts2JavaAstBindingIdent.java b/src/main/java/com/caoccao/javet/buddy/ts2java/ast/pat/Ts2JavaAstBindingIdent.java
@@ -77,4 +77,9 @@ public JavaLocalVariable getLocalVariable() {
     public Optional<Ts2JavaAstTsTypeAnn> getTypeAnn() {
         return typeAnn;
     }
+
+    @Override
+    public void syncLabels() {
+        typeAnn.ifPresent(Ts2JavaAstTsTypeAnn::syncLabels);
+    }
 }
diff --git a/src/main/java/com/caoccao/javet/buddy/ts2java/ast/stmt/Ts2JavaAstBlockStmt.java b/src/main/java/com/caoccao/javet/buddy/ts2java/ast/stmt/Ts2JavaAstBlockStmt.java
@@ -67,4 +67,9 @@ public void compile() {
             type = stmts.get(stmts.size() - 1).getType();
         }
     }
+
+    @Override
+    public void syncLabels() {
+        stmts.forEach(ITs2JavaAstStmt::syncLabels);
+    }
 }
diff --git a/src/main/java/com/caoccao/javet/buddy/ts2java/ast/stmt/Ts2JavaAstClassDecl.java b/src/main/java/com/caoccao/javet/buddy/ts2java/ast/stmt/Ts2JavaAstClassDecl.java
@@ -71,4 +71,9 @@ public Ts2JavaAstClass getClazz() {
     public String getPackageName() {
         return packageName;
     }
+
+    @Override
+    public void syncLabels() {
+        clazz.syncLabels();
+    }
 }
diff --git a/src/main/java/com/caoccao/javet/buddy/ts2java/ast/stmt/Ts2JavaAstReturnStmt.java b/src/main/java/com/caoccao/javet/buddy/ts2java/ast/stmt/Ts2JavaAstReturnStmt.java
@@ -85,4 +85,9 @@ public void compile() {
     public Optional<ITs2JavaAstExpr<?, ?>> getArg() {
         return arg;
     }
+
+    @Override
+    public void syncLabels() {
+        arg.ifPresent(ITs2JavaAstExpr::syncLabels);
+    }
 }
diff --git a/src/main/java/com/caoccao/javet/buddy/ts2java/ast/stmt/Ts2JavaAstVarDecl.java b/src/main/java/com/caoccao/javet/buddy/ts2java/ast/stmt/Ts2JavaAstVarDecl.java
@@ -70,4 +70,9 @@ public void compile() {
     public List<Ts2JavaAstVarDeclarator> getDecls() {
         return decls;
     }
+
+    @Override
+    public void syncLabels() {
+        decls.forEach(Ts2JavaAstVarDeclarator::syncLabels);
+    }
 }
diff --git a/src/main/java/com/caoccao/javet/buddy/ts2java/ast/stmt/Ts2JavaAstVarDeclarator.java b/src/main/java/com/caoccao/javet/buddy/ts2java/ast/stmt/Ts2JavaAstVarDeclarator.java
@@ -115,4 +115,10 @@ public void compile() {
     public ITs2JavaAstPat<?, ?> getName() {
         return name;
     }
+
+    @Override
+    public void syncLabels() {
+        init.ifPresent(ITs2JavaAstExpr::syncLabels);
+        name.syncLabels();
+    }
 }
diff --git a/src/main/java/com/caoccao/javet/buddy/ts2java/ast/ts/Ts2JavaAstTsKeywordType.java b/src/main/java/com/caoccao/javet/buddy/ts2java/ast/ts/Ts2JavaAstTsKeywordType.java
@@ -75,4 +75,8 @@ public void compile() {
     public Swc4jAstTsKeywordTypeKind getKind() {
         return kind;
     }
+
+    @Override
+    public void syncLabels() {
+    }
 }
diff --git a/src/main/java/com/caoccao/javet/buddy/ts2java/ast/ts/Ts2JavaAstTsQualifiedName.java b/src/main/java/com/caoccao/javet/buddy/ts2java/ast/ts/Ts2JavaAstTsQualifiedName.java
@@ -65,4 +65,10 @@ public Ts2JavaAstIdentName getRight() {
     public String getTypeName() {
         return left.getTypeName() + "." + right.getSym();
     }
+
+    @Override
+    public void syncLabels() {
+        left.syncLabels();
+        right.syncLabels();
+    }
 }
diff --git a/src/main/java/com/caoccao/javet/buddy/ts2java/ast/ts/Ts2JavaAstTsTypeAnn.java b/src/main/java/com/caoccao/javet/buddy/ts2java/ast/ts/Ts2JavaAstTsTypeAnn.java
@@ -57,4 +57,9 @@ public void compile() {
     public ITs2JavaAstTsType<?, ?> getTypeAnn() {
         return typeAnn;
     }
+
+    @Override
+    public void syncLabels() {
+        typeAnn.syncLabels();
+    }
 }
diff --git a/src/main/java/com/caoccao/javet/buddy/ts2java/ast/ts/Ts2JavaAstTsTypeRef.java b/src/main/java/com/caoccao/javet/buddy/ts2java/ast/ts/Ts2JavaAstTsTypeRef.java
@@ -81,4 +81,9 @@ public void compile() {
     public ITs2JavaAstTsEntityName<?, ?> getTypeName() {
         return typeName;
     }
+
+    @Override
+    public void syncLabels() {
+        typeName.syncLabels();
+    }
 }
diff --git a/.../java/com/caoccao/javet/buddy/ts2java/ast/expr/TestTs2JavaAstBinExprLogicalCondition.java b/.../java/com/caoccao/javet/buddy/ts2java/ast/expr/TestTs2JavaAstBinExprLogicalCondition.java
@@ -469,7 +469,7 @@ public void testAndBool_Z_Z() throws Exception {
         assertFalse((boolean) tsClass.invoke(false));
     }
 
-    @Test
+//    @Test
     public void testAndOrAnd_II_Z() throws Exception {
         assertTrue(andOrAnd_II_Z(2, 2));
         assertFalse(andOrAnd_II_Z(1, 1));
@@ -637,13 +637,12 @@ public void testNot_And_II_Z() throws Exception {
         assertTrue((boolean) tsClass.invoke(0, 1));
     }
 
-    //    @Test
+    @Test
     public void testOrAndOr_II_Z() throws Exception {
         assertTrue(orAndOr_II_Z(2, 2));
         assertFalse(orAndOr_II_Z(1, 1));
         assertFalse(orAndOr_II_Z(1, 2));
         assertTrue(orAndOr_II_Z(2, 1));
-        enableLogging();
         tsClass = new TsClass(
                 "return (a == b || a > 1) && (a != b || b > 1);",
                 boolean.class,