Merge pull request #770 from kohlschutter/ck/standalonecompiler

Use embedded standalone compiler from Java 11
cincheo · Oct 12, 2023 · c520e8b · c520e8b
2 parents 8e1bd4d + ad3ff46
commit c520e8b
Show file tree

Hide file tree

Showing 50 changed files with 310 additions and 332 deletions.
diff --git a/transpiler/pom.xml b/transpiler/pom.xml
@@ -210,6 +210,11 @@
     </profiles>
 
 	<dependencies>
+		<dependency>
+			<groupId>com.kohlschutter.jdk.compiler</groupId>
+			<artifactId>standalone-jdk11</artifactId>
+			<version>1.0.0</version>
+		</dependency>
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-lang3</artifactId>

diff --git a/transpiler/src/main/java/org/jsweet/transpiler/AsyncAwaitPropagationScanner.java b/transpiler/src/main/java/org/jsweet/transpiler/AsyncAwaitPropagationScanner.java
@@ -31,11 +31,11 @@
 import org.jsweet.transpiler.util.AbstractTreeScanner;
 import org.jsweet.transpiler.util.Util;
 
-import com.sun.source.tree.CompilationUnitTree;
-import com.sun.source.tree.MethodInvocationTree;
-import com.sun.source.tree.MethodTree;
-import com.sun.source.tree.Tree;
-import com.sun.source.util.Trees;
+import standalone.com.sun.source.tree.CompilationUnitTree;
+import standalone.com.sun.source.tree.MethodInvocationTree;
+import standalone.com.sun.source.tree.MethodTree;
+import standalone.com.sun.source.tree.Tree;
+import standalone.com.sun.source.util.Trees;
 
 /**
  * This AST scanner performs propagates async methods automatically.

diff --git a/transpiler/src/main/java/org/jsweet/transpiler/ConstAnalyzer.java b/transpiler/src/main/java/org/jsweet/transpiler/ConstAnalyzer.java
@@ -28,14 +28,14 @@
 
 import org.jsweet.transpiler.util.Util;
 
-import com.sun.source.tree.ArrayAccessTree;
-import com.sun.source.tree.AssignmentTree;
-import com.sun.source.tree.CompilationUnitTree;
-import com.sun.source.tree.CompoundAssignmentTree;
-import com.sun.source.tree.Tree;
-import com.sun.source.tree.UnaryTree;
-import com.sun.source.util.TreeScanner;
-import com.sun.source.util.Trees;
+import standalone.com.sun.source.tree.ArrayAccessTree;
+import standalone.com.sun.source.tree.AssignmentTree;
+import standalone.com.sun.source.tree.CompilationUnitTree;
+import standalone.com.sun.source.tree.CompoundAssignmentTree;
+import standalone.com.sun.source.tree.Tree;
+import standalone.com.sun.source.tree.UnaryTree;
+import standalone.com.sun.source.util.TreeScanner;
+import standalone.com.sun.source.util.Trees;
 
 /**
  * This AST scanner analyzes local variables to determine if they are locally

diff --git a/transpiler/src/main/java/org/jsweet/transpiler/GlobalBeforeTranslationScanner.java b/transpiler/src/main/java/org/jsweet/transpiler/GlobalBeforeTranslationScanner.java
@@ -38,15 +38,15 @@
 import org.jsweet.transpiler.util.AbstractTreeScanner;
 import org.jsweet.transpiler.util.Util;
 
-import com.sun.source.tree.BlockTree;
-import com.sun.source.tree.ClassTree;
-import com.sun.source.tree.CompilationUnitTree;
-import com.sun.source.tree.LiteralTree;
-import com.sun.source.tree.MethodTree;
-import com.sun.source.tree.Tree;
-import com.sun.source.tree.VariableTree;
-import com.sun.source.tree.WildcardTree;
-import com.sun.source.util.Trees;
+import standalone.com.sun.source.tree.BlockTree;
+import standalone.com.sun.source.tree.ClassTree;
+import standalone.com.sun.source.tree.CompilationUnitTree;
+import standalone.com.sun.source.tree.LiteralTree;
+import standalone.com.sun.source.tree.MethodTree;
+import standalone.com.sun.source.tree.Tree;
+import standalone.com.sun.source.tree.VariableTree;
+import standalone.com.sun.source.tree.WildcardTree;
+import standalone.com.sun.source.util.Trees;
 
 /**
  * This AST scanner performs global analysis and fills up the context with

diff --git a/transpiler/src/main/java/org/jsweet/transpiler/JSweetContext.java b/transpiler/src/main/java/org/jsweet/transpiler/JSweetContext.java
@@ -69,20 +69,20 @@
 import org.jsweet.transpiler.util.DirectedGraph;
 import org.jsweet.transpiler.util.Util;
 
-import com.sun.source.tree.AssignmentTree;
-import com.sun.source.tree.BlockTree;
-import com.sun.source.tree.ClassTree;
-import com.sun.source.tree.CompilationUnitTree;
-import com.sun.source.tree.ExpressionStatementTree;
-import com.sun.source.tree.MemberSelectTree;
-import com.sun.source.tree.MethodInvocationTree;
-import com.sun.source.tree.MethodTree;
-import com.sun.source.tree.NewClassTree;
-import com.sun.source.tree.StatementTree;
-import com.sun.source.tree.Tree;
-import com.sun.source.tree.VariableTree;
-import com.sun.source.tree.WildcardTree;
-import com.sun.source.util.Trees;
+import standalone.com.sun.source.tree.AssignmentTree;
+import standalone.com.sun.source.tree.BlockTree;
+import standalone.com.sun.source.tree.ClassTree;
+import standalone.com.sun.source.tree.CompilationUnitTree;
+import standalone.com.sun.source.tree.ExpressionStatementTree;
+import standalone.com.sun.source.tree.MemberSelectTree;
+import standalone.com.sun.source.tree.MethodInvocationTree;
+import standalone.com.sun.source.tree.MethodTree;
+import standalone.com.sun.source.tree.NewClassTree;
+import standalone.com.sun.source.tree.StatementTree;
+import standalone.com.sun.source.tree.Tree;
+import standalone.com.sun.source.tree.VariableTree;
+import standalone.com.sun.source.tree.WildcardTree;
+import standalone.com.sun.source.util.Trees;
 
 /**
  * The transpiler context, which is an extension of the Java compiler context.

diff --git a/transpiler/src/main/java/org/jsweet/transpiler/JSweetFactory.java b/transpiler/src/main/java/org/jsweet/transpiler/JSweetFactory.java
@@ -9,7 +9,7 @@
 import org.jsweet.transpiler.extension.PrinterAdapter;
 import org.jsweet.transpiler.extension.RemoveJavaDependenciesAdapter;
 
-import com.sun.source.tree.CompilationUnitTree;
+import standalone.com.sun.source.tree.CompilationUnitTree;
 
 /**
  * The factory object is the one creating instances for key JSweet transpilation

diff --git a/transpiler/src/main/java/org/jsweet/transpiler/JSweetTranspiler.java b/transpiler/src/main/java/org/jsweet/transpiler/JSweetTranspiler.java
@@ -86,8 +86,8 @@
 import com.google.debugging.sourcemap.SourceMapGeneratorV3;
 import com.google.debugging.sourcemap.SourceMapping;
 import com.google.gson.Gson;
-import com.sun.source.tree.CompilationUnitTree;
-import com.sun.source.tree.Tree;
+import standalone.com.sun.source.tree.CompilationUnitTree;
+import standalone.com.sun.source.tree.Tree;
 
 /**
  * The actual JSweet transpiler.

diff --git a/transpiler/src/main/java/org/jsweet/transpiler/Java2TypeScriptTranslator.java b/transpiler/src/main/java/org/jsweet/transpiler/Java2TypeScriptTranslator.java
@@ -88,60 +88,60 @@
 import org.jsweet.transpiler.util.JSDoc;
 import org.jsweet.transpiler.util.Util;
 
-import com.sun.source.tree.AnnotationTree;
-import com.sun.source.tree.ArrayAccessTree;
-import com.sun.source.tree.ArrayTypeTree;
-import com.sun.source.tree.AssertTree;
-import com.sun.source.tree.AssignmentTree;
-import com.sun.source.tree.BinaryTree;
-import com.sun.source.tree.BlockTree;
-import com.sun.source.tree.BreakTree;
-import com.sun.source.tree.CaseTree;
-import com.sun.source.tree.CatchTree;
-import com.sun.source.tree.ClassTree;
-import com.sun.source.tree.CompilationUnitTree;
-import com.sun.source.tree.CompoundAssignmentTree;
-import com.sun.source.tree.ConditionalExpressionTree;
-import com.sun.source.tree.ContinueTree;
-import com.sun.source.tree.DoWhileLoopTree;
-import com.sun.source.tree.EnhancedForLoopTree;
-import com.sun.source.tree.ExpressionStatementTree;
-import com.sun.source.tree.ExpressionTree;
-import com.sun.source.tree.ForLoopTree;
-import com.sun.source.tree.IdentifierTree;
-import com.sun.source.tree.IfTree;
-import com.sun.source.tree.ImportTree;
-import com.sun.source.tree.InstanceOfTree;
-import com.sun.source.tree.IntersectionTypeTree;
-import com.sun.source.tree.LabeledStatementTree;
-import com.sun.source.tree.LambdaExpressionTree;
-import com.sun.source.tree.LiteralTree;
-import com.sun.source.tree.MemberReferenceTree;
-import com.sun.source.tree.MemberSelectTree;
-import com.sun.source.tree.MethodInvocationTree;
-import com.sun.source.tree.MethodTree;
-import com.sun.source.tree.NewArrayTree;
-import com.sun.source.tree.NewClassTree;
-import com.sun.source.tree.ParameterizedTypeTree;
-import com.sun.source.tree.ParenthesizedTree;
-import com.sun.source.tree.PrimitiveTypeTree;
-import com.sun.source.tree.ReturnTree;
-import com.sun.source.tree.StatementTree;
-import com.sun.source.tree.SwitchTree;
-import com.sun.source.tree.SynchronizedTree;
-import com.sun.source.tree.ThrowTree;
-import com.sun.source.tree.Tree;
-import com.sun.source.tree.Tree.Kind;
-import com.sun.source.tree.TryTree;
-import com.sun.source.tree.TypeCastTree;
-import com.sun.source.tree.TypeParameterTree;
-import com.sun.source.tree.UnaryTree;
-import com.sun.source.tree.VariableTree;
-import com.sun.source.tree.WhileLoopTree;
-import com.sun.source.tree.WildcardTree;
-import com.sun.source.util.TreePath;
-import com.sun.source.util.TreeScanner;
-import com.sun.source.util.Trees;
+import standalone.com.sun.source.tree.AnnotationTree;
+import standalone.com.sun.source.tree.ArrayAccessTree;
+import standalone.com.sun.source.tree.ArrayTypeTree;
+import standalone.com.sun.source.tree.AssertTree;
+import standalone.com.sun.source.tree.AssignmentTree;
+import standalone.com.sun.source.tree.BinaryTree;
+import standalone.com.sun.source.tree.BlockTree;
+import standalone.com.sun.source.tree.BreakTree;
+import standalone.com.sun.source.tree.CaseTree;
+import standalone.com.sun.source.tree.CatchTree;
+import standalone.com.sun.source.tree.ClassTree;
+import standalone.com.sun.source.tree.CompilationUnitTree;
+import standalone.com.sun.source.tree.CompoundAssignmentTree;
+import standalone.com.sun.source.tree.ConditionalExpressionTree;
+import standalone.com.sun.source.tree.ContinueTree;
+import standalone.com.sun.source.tree.DoWhileLoopTree;
+import standalone.com.sun.source.tree.EnhancedForLoopTree;
+import standalone.com.sun.source.tree.ExpressionStatementTree;
+import standalone.com.sun.source.tree.ExpressionTree;
+import standalone.com.sun.source.tree.ForLoopTree;
+import standalone.com.sun.source.tree.IdentifierTree;
+import standalone.com.sun.source.tree.IfTree;
+import standalone.com.sun.source.tree.ImportTree;
+import standalone.com.sun.source.tree.InstanceOfTree;
+import standalone.com.sun.source.tree.IntersectionTypeTree;
+import standalone.com.sun.source.tree.LabeledStatementTree;
+import standalone.com.sun.source.tree.LambdaExpressionTree;
+import standalone.com.sun.source.tree.LiteralTree;
+import standalone.com.sun.source.tree.MemberReferenceTree;
+import standalone.com.sun.source.tree.MemberSelectTree;
+import standalone.com.sun.source.tree.MethodInvocationTree;
+import standalone.com.sun.source.tree.MethodTree;
+import standalone.com.sun.source.tree.NewArrayTree;
+import standalone.com.sun.source.tree.NewClassTree;
+import standalone.com.sun.source.tree.ParameterizedTypeTree;
+import standalone.com.sun.source.tree.ParenthesizedTree;
+import standalone.com.sun.source.tree.PrimitiveTypeTree;
+import standalone.com.sun.source.tree.ReturnTree;
+import standalone.com.sun.source.tree.StatementTree;
+import standalone.com.sun.source.tree.SwitchTree;
+import standalone.com.sun.source.tree.SynchronizedTree;
+import standalone.com.sun.source.tree.ThrowTree;
+import standalone.com.sun.source.tree.Tree;
+import standalone.com.sun.source.tree.Tree.Kind;
+import standalone.com.sun.source.tree.TryTree;
+import standalone.com.sun.source.tree.TypeCastTree;
+import standalone.com.sun.source.tree.TypeParameterTree;
+import standalone.com.sun.source.tree.UnaryTree;
+import standalone.com.sun.source.tree.VariableTree;
+import standalone.com.sun.source.tree.WhileLoopTree;
+import standalone.com.sun.source.tree.WildcardTree;
+import standalone.com.sun.source.util.TreePath;
+import standalone.com.sun.source.util.TreeScanner;
+import standalone.com.sun.source.util.Trees;
 
 /**
  * This is a TypeScript printer for translating the Java AST to a TypeScript

diff --git a/transpiler/src/main/java/org/jsweet/transpiler/JavaCompilationComponents.java b/transpiler/src/main/java/org/jsweet/transpiler/JavaCompilationComponents.java
@@ -14,15 +14,16 @@
 import javax.tools.JavaCompiler;
 import javax.tools.JavaFileObject;
 import javax.tools.StandardJavaFileManager;
-import javax.tools.ToolProvider;
 
 import org.apache.log4j.Logger;
 import org.jsweet.JSweetConfig;
 import org.jsweet.transpiler.util.ConsoleTranspilationHandler;
 import org.jsweet.transpiler.util.Util;
 
-import com.sun.source.util.JavacTask;
-import com.sun.source.util.Trees;
+import com.kohlschutter.jdk.standaloneutil.ToolProvider;
+
+import standalone.com.sun.source.util.JavacTask;
+import standalone.com.sun.source.util.Trees;
 
 public class JavaCompilationComponents implements AutoCloseable {
 

diff --git a/transpiler/src/main/java/org/jsweet/transpiler/OverloadScanner.java b/transpiler/src/main/java/org/jsweet/transpiler/OverloadScanner.java
@@ -39,17 +39,17 @@
 import org.jsweet.transpiler.util.AbstractTreeScanner;
 import org.jsweet.transpiler.util.Util;
 
-import com.sun.source.tree.ClassTree;
-import com.sun.source.tree.CompilationUnitTree;
-import com.sun.source.tree.ExpressionStatementTree;
-import com.sun.source.tree.ExpressionTree;
-import com.sun.source.tree.IdentifierTree;
-import com.sun.source.tree.MethodInvocationTree;
-import com.sun.source.tree.MethodTree;
-import com.sun.source.tree.ReturnTree;
-import com.sun.source.tree.StatementTree;
-import com.sun.source.tree.Tree;
-import com.sun.source.util.Trees;
+import standalone.com.sun.source.tree.ClassTree;
+import standalone.com.sun.source.tree.CompilationUnitTree;
+import standalone.com.sun.source.tree.ExpressionStatementTree;
+import standalone.com.sun.source.tree.ExpressionTree;
+import standalone.com.sun.source.tree.IdentifierTree;
+import standalone.com.sun.source.tree.MethodInvocationTree;
+import standalone.com.sun.source.tree.MethodTree;
+import standalone.com.sun.source.tree.ReturnTree;
+import standalone.com.sun.source.tree.StatementTree;
+import standalone.com.sun.source.tree.Tree;
+import standalone.com.sun.source.util.Trees;
 
 /**
  * This AST scanner detects method overloads and gather them into

diff --git a/transpiler/src/main/java/org/jsweet/transpiler/SourcePosition.java b/transpiler/src/main/java/org/jsweet/transpiler/SourcePosition.java
@@ -22,7 +22,7 @@
 
 import org.jsweet.transpiler.util.Position;
 
-import com.sun.source.tree.Tree;
+import standalone.com.sun.source.tree.Tree;
 
 /**
  * A non-mutable position in a source file.

diff --git a/transpiler/src/main/java/org/jsweet/transpiler/StaticInitilializerAnalyzer.java b/transpiler/src/main/java/org/jsweet/transpiler/StaticInitilializerAnalyzer.java
@@ -36,15 +36,15 @@
 import org.jsweet.transpiler.util.ReferenceGrabber;
 import org.jsweet.transpiler.util.Util;
 
-import com.sun.source.tree.BlockTree;
-import com.sun.source.tree.ClassTree;
-import com.sun.source.tree.CompilationUnitTree;
-import com.sun.source.tree.ImportTree;
-import com.sun.source.tree.PackageTree;
-import com.sun.source.tree.Tree;
-import com.sun.source.tree.VariableTree;
-import com.sun.source.util.TreePathScanner;
-import com.sun.source.util.Trees;
+import standalone.com.sun.source.tree.BlockTree;
+import standalone.com.sun.source.tree.ClassTree;
+import standalone.com.sun.source.tree.CompilationUnitTree;
+import standalone.com.sun.source.tree.ImportTree;
+import standalone.com.sun.source.tree.PackageTree;
+import standalone.com.sun.source.tree.Tree;
+import standalone.com.sun.source.tree.VariableTree;
+import standalone.com.sun.source.util.TreePathScanner;
+import standalone.com.sun.source.util.Trees;
 
 /**
  * This AST scanner creates a class dependency graph for each package, based on

diff --git a/transpiler/src/main/java/org/jsweet/transpiler/TypeChecker.java b/transpiler/src/main/java/org/jsweet/transpiler/TypeChecker.java
@@ -33,13 +33,13 @@
 import org.jsweet.transpiler.util.AbstractTreePrinter;
 import org.jsweet.transpiler.util.Util;
 
-import com.sun.source.tree.ArrayTypeTree;
-import com.sun.source.tree.AssignmentTree;
-import com.sun.source.tree.CompilationUnitTree;
-import com.sun.source.tree.MemberSelectTree;
-import com.sun.source.tree.MethodInvocationTree;
-import com.sun.source.tree.Tree;
-import com.sun.source.tree.VariableTree;
+import standalone.com.sun.source.tree.ArrayTypeTree;
+import standalone.com.sun.source.tree.AssignmentTree;
+import standalone.com.sun.source.tree.CompilationUnitTree;
+import standalone.com.sun.source.tree.MemberSelectTree;
+import standalone.com.sun.source.tree.MethodInvocationTree;
+import standalone.com.sun.source.tree.Tree;
+import standalone.com.sun.source.tree.VariableTree;
 
 /**
  * This helper class performs extra type checking for the JSweet transpiler

diff --git a/transpiler/src/main/java/org/jsweet/transpiler/eval/JavaEval.java b/transpiler/src/main/java/org/jsweet/transpiler/eval/JavaEval.java
@@ -16,7 +16,7 @@
 import org.jsweet.transpiler.util.MainMethodFinder;
 import org.jsweet.transpiler.util.MainMethodFinder.MainMethodFoundSignal;
 
-import com.sun.source.tree.CompilationUnitTree;
+import standalone.com.sun.source.tree.CompilationUnitTree;
 
 public class JavaEval extends RuntimeEval {
 

diff --git a/transpiler/src/main/java/org/jsweet/transpiler/extension/Java2TypeScriptAdapter.java b/transpiler/src/main/java/org/jsweet/transpiler/extension/Java2TypeScriptAdapter.java
@@ -103,17 +103,17 @@
 import org.jsweet.transpiler.model.support.MethodInvocationElementSupport;
 import org.jsweet.transpiler.util.Util;
 
-import com.sun.source.tree.ClassTree;
-import com.sun.source.tree.EnhancedForLoopTree;
-import com.sun.source.tree.ExpressionTree;
-import com.sun.source.tree.IdentifierTree;
-import com.sun.source.tree.ImportTree;
-import com.sun.source.tree.MemberSelectTree;
-import com.sun.source.tree.MethodInvocationTree;
-import com.sun.source.tree.NewClassTree;
-import com.sun.source.tree.ParameterizedTypeTree;
-import com.sun.source.tree.Tree;
-import com.sun.source.tree.TypeCastTree;
+import standalone.com.sun.source.tree.ClassTree;
+import standalone.com.sun.source.tree.EnhancedForLoopTree;
+import standalone.com.sun.source.tree.ExpressionTree;
+import standalone.com.sun.source.tree.IdentifierTree;
+import standalone.com.sun.source.tree.ImportTree;
+import standalone.com.sun.source.tree.MemberSelectTree;
+import standalone.com.sun.source.tree.MethodInvocationTree;
+import standalone.com.sun.source.tree.NewClassTree;
+import standalone.com.sun.source.tree.ParameterizedTypeTree;
+import standalone.com.sun.source.tree.Tree;
+import standalone.com.sun.source.tree.TypeCastTree;
 
 /**
  * This is an adapter for the TypeScript code generator. It overrides the