Merge pull request kaitai-io#9 from Mingun/in-memory-compiler

Replace source code of InMemoryJavaCompiler with dependency
Mingun · Jan 26, 2020 · 59d4ae4 · 59d4ae4
2 parents 528242a + 6dcec1d
commit 59d4ae4
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 232 deletions.
diff --git a/pom.xml b/pom.xml
@@ -49,6 +49,11 @@
       <artifactId>maven-jdk-tools-wrapper</artifactId>
       <version>0.1</version>
     </dependency>
+    <dependency>
+      <groupId>org.mdkt.compiler</groupId>
+      <artifactId>InMemoryJavaCompiler</artifactId>
+      <version>1.3.0</version>
+    </dependency>
   </dependencies>
 
   <build>

diff --git a/src/main/java/io/kaitai/struct/visualizer/VisualizerPanel.java b/src/main/java/io/kaitai/struct/visualizer/VisualizerPanel.java
@@ -135,7 +135,7 @@ private void parseFileWithKSY(String ksyFileName, String binaryFileName) throws
             paramNames.add(p.group(1));
         }
 
-        final Class<?> ksyClass = InMemoryJavaCompiler.compile(DEST_PACKAGE + "." + m.group(1), javaSrc);
+        final Class<?> ksyClass = InMemoryJavaCompiler.newInstance().compile(DEST_PACKAGE + "." + m.group(1), javaSrc);
         struct = construct(ksyClass, paramNames, binaryFileName);
 
         // Find and run "_read" that does actual parsing

diff --git a/src/main/java/org/mdkt/compiler/CompiledCode.java b/src/main/java/org/mdkt/compiler/CompiledCode.java
diff --git a/src/main/java/org/mdkt/compiler/DynamicClassLoader.java b/src/main/java/org/mdkt/compiler/DynamicClassLoader.java
diff --git a/src/main/java/org/mdkt/compiler/ExtendedStandardJavaFileManager.java b/src/main/java/org/mdkt/compiler/ExtendedStandardJavaFileManager.java
diff --git a/src/main/java/org/mdkt/compiler/InMemoryJavaCompiler.java b/src/main/java/org/mdkt/compiler/InMemoryJavaCompiler.java
diff --git a/src/main/java/org/mdkt/compiler/SourceCode.java b/src/main/java/org/mdkt/compiler/SourceCode.java