Skip to content

Commit

Permalink
Update patches for new GItPatcher (#81)
Browse files Browse the repository at this point in the history
Significantly cleans up redundant and continually changing data inside the patches.
Also fixes a few cases where commits had really long names.
  • Loading branch information
covers1624 authored Jun 19, 2020
1 parent b595383 commit 3dbc52a
Show file tree
Hide file tree
Showing 38 changed files with 380 additions and 501 deletions.
17 changes: 7 additions & 10 deletions FernFlower-Patches/0001-Git-filter-and-setup.patch
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
From 054d91c0c439eb93af1cf54b9bdc6bca05cda0e3 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: LexManos <LexManos@gmail.com>
Date: Tue, 11 Apr 2017 20:44:39 -0700
Subject: [PATCH] Git filter and setup


diff --git a/.gitattributes b/.gitattributes
index f1df734..972529a 100644
index f1df734f9f0bc7080a99140482eedf28bfe6b166..972529aebd1f5daa057f1fe9606c79be1dc4f64f 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1,42 @@
Expand Down Expand Up @@ -54,7 +54,7 @@ index f1df734..972529a 100644
+
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 3537b26..c52eb2e 100644
index 3537b26a5b9d0579ae764825988f08a14d29517b..c52eb2e815432be8d1f1e6b61cffdcce68af85bb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,231 @@
Expand Down Expand Up @@ -295,7 +295,7 @@ index 3537b26..c52eb2e 100644
+!testData/classes/**
diff --git a/build.gradle b/build.gradle
deleted file mode 100644
index 9694117..0000000
index 9694117119040d9a0c060dab67d1d5a36973d040..0000000000000000000000000000000000000000
--- a/build.gradle
+++ /dev/null
@@ -1,25 +0,0 @@
Expand Down Expand Up @@ -2302,7 +2302,7 @@ z#GlBA?SDu9eedGme!&YL*H4~~&cE@zoOb?cmheA5<1hU#KWSpS|8Gk7-@GvYsq=q)
oE`N5K{P4N_EZYFE|K@>tBMk;v2mOd$WCD5z@VD^x{P^qt0dz#mIsgCw

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 657de85..a4b4429 100644
index 657de8507468e0ce75005e8870f2a95ae849b5ce..a4b4429748d92848a3d820c7b099fbeb941066ae 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
Expand All @@ -2314,7 +2314,7 @@ index 657de85..a4b4429 100644
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-all.zip
diff --git a/gradlew b/gradlew
index cccdd3d..2fe81a7 100755
index cccdd3d517fc5249beaefa600691cf150f2fa3e6..2fe81a7d95e4f9ad2c9b2a046707d36ceb3980b3 100755
--- a/gradlew
+++ b/gradlew
@@ -1,5 +1,21 @@
Expand Down Expand Up @@ -2407,7 +2407,7 @@ index cccdd3d..2fe81a7 100755
-
exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
index f955316..62bd9b9 100644
index f9553162f122c71b34635112e717c3e733b5b212..62bd9b9ccefea2b65ae41e5d9a545e2021b90a1d 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -1,3 +1,19 @@
Expand Down Expand Up @@ -2443,6 +2443,3 @@ index f955316..62bd9b9 100644

@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome
--
2.27.0.windows.1

15 changes: 6 additions & 9 deletions FernFlower-Patches/0002-Test-Framework-upgrades.patch
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
From 8501ffc3202fcefbf1aee705eff430d4cf34b1d8 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: LexManos <LexManos@gmail.com>
Date: Tue, 11 Apr 2017 23:18:58 -0700
Subject: [PATCH] Test Framework upgrades


diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java
index bb303e8..cc1f537 100644
index bb303e84f33161a4b4fd40a73aa48d29981d9ef2..cc1f537e71af0748b7b97d7d8489198e2a677cc9 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java
@@ -110,6 +110,10 @@ public class Exprent implements IMatchable {
Expand All @@ -20,7 +20,7 @@ index bb303e8..cc1f537 100644
throw new RuntimeException("not implemented");
}
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java
index b5e8213..b905da5 100644
index b5e82131dd20ea45a02ff62e085695417111adfe..b905da55c9b3bd7dc48123559809a1d7ed9eaf9c 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java
@@ -469,6 +469,10 @@ public class Statement implements IMatchable {
Expand All @@ -35,7 +35,7 @@ index b5e8213..b905da5 100644
throw new RuntimeException("not implemented");
}
diff --git a/test/org/jetbrains/java/decompiler/DecompilerTestFixture.java b/test/org/jetbrains/java/decompiler/DecompilerTestFixture.java
index 4c5641f..7d29c19 100644
index 4c5641fec76837a51094d4a54800d5b7475446ca..7d29c198014cbfee8092fd31461208ce58e7f775 100644
--- a/test/org/jetbrains/java/decompiler/DecompilerTestFixture.java
+++ b/test/org/jetbrains/java/decompiler/DecompilerTestFixture.java
@@ -23,6 +23,7 @@ public class DecompilerTestFixture {
Expand Down Expand Up @@ -71,7 +71,7 @@ index 4c5641f..7d29c19 100644
private static boolean isTestDataDir(File dir) {
return dir.isDirectory() && new File(dir, "classes").isDirectory() && new File(dir, "results").isDirectory();
diff --git a/test/org/jetbrains/java/decompiler/SingleClassesTest.java b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
index 1d0dc62..2b60ca1 100644
index 1d0dc62d75e0ece79fd0af5757c202360fa800e0..2b60ca149c39b5dbe8a6191be44d1d607b9cbe18 100644
--- a/test/org/jetbrains/java/decompiler/SingleClassesTest.java
+++ b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
@@ -1,37 +1,20 @@
Expand Down Expand Up @@ -172,7 +172,7 @@ index 1d0dc62..2b60ca1 100644
\ No newline at end of file
diff --git a/test/org/jetbrains/java/decompiler/SingleClassesTestBase.java b/test/org/jetbrains/java/decompiler/SingleClassesTestBase.java
new file mode 100644
index 0000000..9f073c2
index 0000000000000000000000000000000000000000..9f073c2625764dd865f162420264e27ac923318d
--- /dev/null
+++ b/test/org/jetbrains/java/decompiler/SingleClassesTestBase.java
@@ -0,0 +1,89 @@
Expand Down Expand Up @@ -266,6 +266,3 @@ index 0000000..9f073c2
+ }
+}
\ No newline at end of file
--
2.27.0.windows.1

Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
From 9bd94d6cee203cbe024f1040b84d4969897a907d Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: LexManos <LexManos@gmail.com>
Date: Wed, 12 Apr 2017 13:21:00 -0700
Subject: [PATCH] Fix initializers for anon and synthetic classes


diff --git a/src/org/jetbrains/java/decompiler/main/ClassWriter.java b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
index 72fefe4..1182bd1 100644
index 72fefe4c1c0aa322154541d54b1ccb35cc2154d1..1182bd193cb0aef1ebacbcd8d6427dd79af9715f 100644
--- a/src/org/jetbrains/java/decompiler/main/ClassWriter.java
+++ b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
@@ -41,6 +41,7 @@ public class ClassWriter {
Expand All @@ -17,7 +17,7 @@ index 72fefe4..1182bd1 100644
if (node.type == ClassNode.CLASS_ROOT &&
!cl.isVersionGE_1_5() &&
diff --git a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
index 1ee22f2..0041f13 100644
index 1ee22f210c1828c5ce7adc09a468e5bd649cc637..0041f13df8b5336da5b9891df0e399cbc2de4e3c 100644
--- a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
+++ b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
@@ -87,6 +87,31 @@ public class ClassesProcessor implements CodeConstants {
Expand Down Expand Up @@ -53,7 +53,7 @@ index 1ee22f2..0041f13 100644
String enclClassName = entry.outerNameIdx != 0 ? entry.enclosingName : cl.qualifiedName;
if (enclClassName == null || innerName.equals(enclClassName)) {
diff --git a/src/org/jetbrains/java/decompiler/main/InitializerProcessor.java b/src/org/jetbrains/java/decompiler/main/InitializerProcessor.java
index b929d0d..ba039e6 100644
index b929d0d142711abdcd3f67cb429c91b7260d6e2b..ba039e6c83007aca9bce0a33229b28c7b82dc398 100644
--- a/src/org/jetbrains/java/decompiler/main/InitializerProcessor.java
+++ b/src/org/jetbrains/java/decompiler/main/InitializerProcessor.java
@@ -13,6 +13,9 @@ import org.jetbrains.java.decompiler.modules.decompiler.stats.Statements;
Expand Down Expand Up @@ -128,6 +128,3 @@ index b929d0d..ba039e6 100644
-}
\ No newline at end of file
+}
--
2.27.0.windows.1

15 changes: 6 additions & 9 deletions FernFlower-Patches/0004-Fix-field-initalizers.patch
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
From 89cd2b7f01d21647b587708c76fb3a20cc98587c Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: LexManos <LexManos@gmail.com>
Date: Wed, 12 Apr 2017 10:51:55 -0700
Subject: [PATCH] Fix field initalizers


diff --git a/src/org/jetbrains/java/decompiler/main/InitializerProcessor.java b/src/org/jetbrains/java/decompiler/main/InitializerProcessor.java
index ba039e6..0bfe8ad 100644
index ba039e6c83007aca9bce0a33229b28c7b82dc398..0bfe8adc334822dc880d69164106bad814c4ffc5 100644
--- a/src/org/jetbrains/java/decompiler/main/InitializerProcessor.java
+++ b/src/org/jetbrains/java/decompiler/main/InitializerProcessor.java
@@ -3,6 +3,7 @@ package org.jetbrains.java.decompiler.main;
Expand Down Expand Up @@ -248,7 +248,7 @@ index ba039e6..0bfe8ad 100644
+ }
}
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java
index 642a86b..c79f1a6 100644
index 642a86be9a791759e04cc74ad12ffca4436dfbf6..c79f1a6fc6d13c3e61d877624c18b117a5567ce6 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java
@@ -31,18 +31,24 @@ public class FieldExprent extends Exprent {
Expand Down Expand Up @@ -327,7 +327,7 @@ z<BWBrM`IJ2QGxr6yLz()p0~umT@n;j{=*u$vbHW9HKC}}7M?_C9O+7)J(-o9N<PN2
GhW!C-@ghk8

diff --git a/testData/results/TestClashName.dec b/testData/results/TestClashName.dec
index 2a9a731..43348ea 100644
index 2a9a731549e4bee8fe6ff812211e5a7930252017..43348ea674adf840021a807e16fd231a51939c1d 100644
--- a/testData/results/TestClashName.dec
+++ b/testData/results/TestClashName.dec
@@ -7,25 +7,14 @@ public class TestClashName extends ext.TestClashNameParent implements TestClashN
Expand Down Expand Up @@ -454,7 +454,7 @@ index 2a9a731..43348ea 100644
+78 <-> 26
+82 <-> 30
diff --git a/testData/results/TestClassFields.dec b/testData/results/TestClassFields.dec
index ea272ea..852ae47 100644
index ea272ead5c52deca629cb12876748960044559e0..852ae473bdfa591e28aa9b132f9f358ee1fc6eeb 100644
--- a/testData/results/TestClassFields.dec
+++ b/testData/results/TestClassFields.dec
@@ -3,16 +3,14 @@ package pkg;
Expand Down Expand Up @@ -501,7 +501,7 @@ index ea272ea..852ae47 100644
+9
+16
diff --git a/testData/src/pkg/TestClassFields.java b/testData/src/pkg/TestClassFields.java
index 8a77fe0..6e31d5c 100644
index 8a77fe0038a8aad333b5004ca17c5d5d6edfa62d..6e31d5c7515e942c26821ad3320a2eb4dfead920 100644
--- a/testData/src/pkg/TestClassFields.java
+++ b/testData/src/pkg/TestClassFields.java
@@ -2,19 +2,17 @@ package pkg;
Expand All @@ -527,6 +527,3 @@ index 8a77fe0..6e31d5c 100644
}
}
\ No newline at end of file
--
2.27.0.windows.1

Loading

0 comments on commit 3dbc52a

Please sign in to comment.