more revisions

Author: zml2008

FernFlower-Patches/0050-Make-classpath-loading-lazy.patch

@@ -204,10 +204,18 @@ index 464e41a3cd428e1883230bda55fa64172697d1c2..ac3997dc7910f7844b583699c532edfa
      }
    }
 diff --git a/src/org/jetbrains/java/decompiler/main/decompiler/BaseDecompiler.java b/src/org/jetbrains/java/decompiler/main/decompiler/BaseDecompiler.java
-index 7837939efab2b1caf023dc2f5b0a52659ce032bd..eb837996028dd156e8e79435118aa9dd018d644b 100644
+index 7837939efab2b1caf023dc2f5b0a52659ce032bd..879d6aa53be80974d6b432a6bdbb58526388362d 100644
 --- a/src/org/jetbrains/java/decompiler/main/decompiler/BaseDecompiler.java
 +++ b/src/org/jetbrains/java/decompiler/main/decompiler/BaseDecompiler.java
-@@ -13,10 +13,15 @@ import java.util.Map;
+@@ -3,6 +3,7 @@ package org.jetbrains.java.decompiler.main.decompiler;
+ 
+ import org.jetbrains.java.decompiler.main.Fernflower;
+ import org.jetbrains.java.decompiler.main.extern.IBytecodeProvider;
++import org.jetbrains.java.decompiler.main.extern.IContextSource;
+ import org.jetbrains.java.decompiler.main.extern.IFernflowerLogger;
+ import org.jetbrains.java.decompiler.main.extern.IResultSaver;
+ 
+@@ -13,14 +14,27 @@ import java.util.Map;
  public class BaseDecompiler {
    private final Fernflower engine;
 
@@ -219,10 +227,22 @@ index 7837939efab2b1caf023dc2f5b0a52659ce032bd..eb837996028dd156e8e79435118aa9dd
 +  public BaseDecompiler(IResultSaver saver, Map<String, Object> options, IFernflowerLogger logger) {
 +    engine = new Fernflower(saver, options, logger);
 +  }
++
++  public void addSource(IContextSource source) {
++    engine.addSource(source);
++  }
 +
    public void addSource(File source) {
      engine.addSource(source);
    }
+ 
++  public void addLibrary(IContextSource library) {
++    engine.addLibrary(library);
++  }
++
+   public void addLibrary(File library) {
+     engine.addLibrary(library);
+   }
 diff --git a/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java b/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java
 index 3e939e4e5a39fce84d694a02e2e53ec486e50ba5..056ca56d6e598c97c07e19ea5a4038738328f284 100644
 --- a/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java
@@ -637,7 +657,7 @@ index ba09aa17789940419bb4bf45bd1aaddda9189ca5..b72485100b9b25b1fe27966cc7b8b553
                stack.add(clParent);
                stackSubNodes.add(node);
 diff --git a/src/org/jetbrains/java/decompiler/struct/ContextUnit.java b/src/org/jetbrains/java/decompiler/struct/ContextUnit.java
-index 5e119e5030efab2bccc1bd96601075c081056339..1c6cf593d737a37c498a0ee40920a8c7e287a800 100644
+index 5e119e5030efab2bccc1bd96601075c081056339..0816efb081b72dc7ce704ea92a2503b83012854a 100644
 --- a/src/org/jetbrains/java/decompiler/struct/ContextUnit.java
 +++ b/src/org/jetbrains/java/decompiler/struct/ContextUnit.java
 @@ -2,15 +2,13 @@
@@ -659,7 +679,7 @@ index 5e119e5030efab2bccc1bd96601075c081056339..1c6cf593d737a37c498a0ee40920a8c7
  import java.nio.charset.StandardCharsets;
  import java.util.ArrayList;
  import java.util.List;
-@@ -18,221 +16,187 @@ import java.util.concurrent.ExecutionException;
+@@ -18,220 +16,186 @@ import java.util.concurrent.ExecutionException;
  import java.util.concurrent.ExecutorService;
  import java.util.concurrent.Executors;
  import java.util.concurrent.Future;
@@ -1016,13 +1036,11 @@ index 5e119e5030efab2bccc1bd96601075c081056339..1c6cf593d737a37c498a0ee40920a8c7
 -        resultSaver.closeArchive(archivePath, filename);
 +      }
      }
--  }
 +
 +    sink.close();
-+}
+   }
 
    private static void waitForAll(List<Future<?>> futures) {
-     for (Future<?> future : futures) {
 @@ -244,16 +208,19 @@ public class ContextUnit {
      }
    }

FernFlower-Patches/0051-Add-jrt-option-to-load-classes-from-a-specific-JVM.patch

@@ -69,10 +69,10 @@ index 23ed017fc66747daf2f7b603df7d123835145570..a72ad0aba0523cd803b4832b9e95d7f6
      defaults.put(EXPLICIT_GENERIC_ARGUMENTS, "0");
      defaults.put(INLINE_SIMPLE_LAMBDAS, "1");
 diff --git a/src/org/jetbrains/java/decompiler/struct/attr/StructModuleAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructModuleAttribute.java
-index 9fd6f89ddb90e1b348078a0615f3808007cc5aa4..efcb793b82388f3730f130ed0f02e0571fdb3da0 100644
+index 9fd6f89ddb90e1b348078a0615f3808007cc5aa4..fd1cf8a82a419524143e95d147c33e5f9773dca7 100644
 --- a/src/org/jetbrains/java/decompiler/struct/attr/StructModuleAttribute.java
 +++ b/src/org/jetbrains/java/decompiler/struct/attr/StructModuleAttribute.java
-@@ -1,13 +1,18 @@
+@@ -1,13 +1,17 @@
  // Copyright 2000-2021 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  package org.jetbrains.java.decompiler.struct.attr;
 
@@ -82,7 +82,6 @@ index 9fd6f89ddb90e1b348078a0615f3808007cc5aa4..efcb793b82388f3730f130ed0f02e057
 
  import java.io.IOException;
 +import java.lang.module.ModuleDescriptor;
-+import java.lang.module.ModuleDescriptor.Version;
  import java.util.ArrayList;
  import java.util.Collections;
 +import java.util.EnumSet;
@@ -91,7 +90,7 @@ index 9fd6f89ddb90e1b348078a0615f3808007cc5aa4..efcb793b82388f3730f130ed0f02e057
 
  public class StructModuleAttribute extends StructGeneralAttribute {
    public String moduleName;
-@@ -38,6 +43,65 @@ public class StructModuleAttribute extends StructGeneralAttribute {
+@@ -38,6 +42,65 @@ public class StructModuleAttribute extends StructGeneralAttribute {
      this.provides = readProvides(data, pool);
    }
 
@@ -111,7 +110,7 @@ index 9fd6f89ddb90e1b348078a0615f3808007cc5aa4..efcb793b82388f3730f130ed0f02e057
 +      if ((requires.flags & CodeConstants.ACC_SYNTHETIC) != 0) rMods.add(ModuleDescriptor.Requires.Modifier.SYNTHETIC);
 +      if ((requires.flags & CodeConstants.ACC_MANDATED) != 0) rMods.add(ModuleDescriptor.Requires.Modifier.MANDATED);
 +      if (requires.moduleVersion != null) {
-+        builder.requires(rMods, requires.moduleName, Version.parse(requires.moduleVersion));
++        builder.requires(rMods, requires.moduleName, ModuleDescriptor.Version.parse(requires.moduleVersion));
 +      } else {
 +        builder.requires(rMods, requires.moduleName);
 +      }