diff --git a/restore-java8-compatibility.patch b/restore-java8-compatibility.patch index 9c51c18..cd239e8 100644 --- a/restore-java8-compatibility.patch +++ b/restore-java8-compatibility.patch @@ -1,5 +1,4 @@ -diff -urEbwBN parboiled-1.4.1.orig/parboiled-java/src/main/java/org/parboiled/transform/AsmUtils.java parboiled-1.4.1/parboiled-java/src/main/java/org/parboiled/transform/AsmUtils.java ---- parboiled-1.4.1.orig/parboiled-java/src/main/java/org/parboiled/transform/AsmUtils.java 2023-10-11 09:54:38.742121727 +0200 +--- parboiled-1.4.1/parboiled-java/src/main/java/org/parboiled/transform/AsmUtils.java 2023-10-11 09:54:38.742121727 +0200 +++ parboiled-1.4.1/parboiled-java/src/main/java/org/parboiled/transform/AsmUtils.java 2023-10-11 09:54:51.432202375 +0200 @@ -35,7 +35,6 @@ @@ -92,8 +91,7 @@ diff -urEbwBN parboiled-1.4.1.orig/parboiled-java/src/main/java/org/parboiled/tr } finally { defineClassMethod.setAccessible(false); } -diff -urEbwBN parboiled-1.4.1.orig/parboiled-java/src/main/java/org/parboiled/transform/GroupClassGenerator.java parboiled-1.4.1/parboiled-java/src/main/java/org/parboiled/transform/GroupClassGenerator.java ---- parboiled-1.4.1.orig/parboiled-java/src/main/java/org/parboiled/transform/GroupClassGenerator.java 2023-10-11 09:54:38.758788500 +0200 +--- parboiled-1.4.1/parboiled-java/src/main/java/org/parboiled/transform/GroupClassGenerator.java 2023-10-11 09:54:38.758788500 +0200 +++ parboiled-1.4.1/parboiled-java/src/main/java/org/parboiled/transform/GroupClassGenerator.java 2023-10-11 09:58:14.413389233 +0200 @@ -23,7 +23,8 @@ import org.objectweb.asm.tree.*; @@ -133,29 +131,7 @@ diff -urEbwBN parboiled-1.4.1.orig/parboiled-java/src/main/java/org/parboiled/tr group.setGroupClassType(Type.getObjectType(groupClassInternalName)); } -diff -urEbwBN parboiled-1.4.1.orig/parboiled-java/src/main/java/org/parboiled/transform/InstructionGraphCreator.java parboiled-1.4.1/parboiled-java/src/main/java/org/parboiled/transform/InstructionGraphCreator.java ---- parboiled-1.4.1.orig/parboiled-java/src/main/java/org/parboiled/transform/InstructionGraphCreator.java 2023-10-11 09:54:38.758788500 +0200 -+++ parboiled-1.4.1/parboiled-java/src/main/java/org/parboiled/transform/InstructionGraphCreator.java 2023-10-11 09:54:51.432202375 +0200 -@@ -23,8 +23,6 @@ - package org.parboiled.transform; - - import static org.parboiled.common.Preconditions.*; -- --import org.objectweb.asm.Type; - import org.objectweb.asm.tree.analysis.Analyzer; - - /** -@@ -53,7 +51,7 @@ - interpreter.newControlFlowEdge(insn, successor); - return true; - } -- }.analyze(Type.getInternalName(classNode.getParentClass()), method); -+ }.analyze(classNode.name, method); - - interpreter.finish(); - } -diff -urEbwBN parboiled-1.4.1.orig/parboiled-java/src/main/java/org/parboiled/transform/LookupFactory.java parboiled-1.4.1/parboiled-java/src/main/java/org/parboiled/transform/LookupFactory.java ---- parboiled-1.4.1.orig/parboiled-java/src/main/java/org/parboiled/transform/LookupFactory.java 2023-10-11 09:54:38.758788500 +0200 +--- parboiled-1.4.1/parboiled-java/src/main/java/org/parboiled/transform/LookupFactory.java 2023-10-11 09:54:38.758788500 +0200 +++ parboiled-1.4.1/parboiled-java/src/main/java/org/parboiled/transform/LookupFactory.java 1970-01-01 01:00:00.000000000 +0100 @@ -1,105 +0,0 @@ -/* @@ -264,8 +240,7 @@ diff -urEbwBN parboiled-1.4.1.orig/parboiled-java/src/main/java/org/parboiled/tr - } -} \ No newline at end of file -diff -urEbwBN parboiled-1.4.1.orig/parboiled-java/src/main/java/org/parboiled/transform/ParserTransformer.java parboiled-1.4.1/parboiled-java/src/main/java/org/parboiled/transform/ParserTransformer.java ---- parboiled-1.4.1.orig/parboiled-java/src/main/java/org/parboiled/transform/ParserTransformer.java 2023-10-11 09:54:38.758788500 +0200 +--- parboiled-1.4.1/parboiled-java/src/main/java/org/parboiled/transform/ParserTransformer.java 2023-10-11 09:54:38.758788500 +0200 +++ parboiled-1.4.1/parboiled-java/src/main/java/org/parboiled/transform/ParserTransformer.java 2023-10-11 09:55:09.205648662 +0200 @@ -32,8 +32,8 @@ public static synchronized Class transformParser(Class parserClass) throws Exception { @@ -291,291 +266,3 @@ diff -urEbwBN parboiled-1.4.1.orig/parboiled-java/src/main/java/org/parboiled/tr )); } -diff -urEbwBN parboiled-1.4.1.orig/parboiled-java/src/test/java/org/parboiled/ActionTest.java parboiled-1.4.1/parboiled-java/src/test/java/org/parboiled/ActionTest.java ---- parboiled-1.4.1.orig/parboiled-java/src/test/java/org/parboiled/ActionTest.java 2023-10-11 09:54:38.758788500 +0200 -+++ parboiled-1.4.1/parboiled-java/src/test/java/org/parboiled/ActionTest.java 2023-10-11 09:55:09.205648662 +0200 -@@ -135,13 +135,13 @@ - - assertEquals(stats.printActionClassInstances(), "" + - "Action classes and their instances for rule 'A':\n" + -- " Action$KT5vcoYNBwlSxCxf : B_Action1\n" + -- " Action$PAqU0LvxzUVoURCx : A_Action1\n" + -- " Action$fKILGTA7SHvK2Wv0 : A_Action2\n" + -- " Action$m85l2h2jwKmRq8Y3 : B_Action2, C_Action1\n" + -- " Action$n449VU3wlEEz4TDj : D_Action3\n" + -- " Action$phKm3I8AzhaefYYv : D_Action1\n" + -- " Action$uNJUVN3EfXLXlH8Y : D_Action2\n" + -+ " Action$0QAUd2XJhkFkwVyB : D_Action2\n" + -+ " Action$BYXjsBCgkaYmhXqh : D_Action3\n" + -+ " Action$M1hejMpBJ5SjCHvC : B_Action1\n" + -+ " Action$Qy8BzTl3RpzAzrXV : A_Action1\n" + -+ " Action$Syt5vvsOCzKOZ8Az : D_Action1\n" + -+ " Action$esdKf3Sj9cYL9I1s : B_Action2, C_Action1\n" + -+ " Action$xipkqpZJpsrvOANU : A_Action2\n" + - " and 1 anonymous instance(s)\n"); - } - -diff -urEbwBN parboiled-1.4.1.orig/parboiled-java/src/test/java/org/parboiled/PrevCallsTest.java parboiled-1.4.1/parboiled-java/src/test/java/org/parboiled/PrevCallsTest.java ---- parboiled-1.4.1.orig/parboiled-java/src/test/java/org/parboiled/PrevCallsTest.java 2023-10-11 09:54:38.762121854 +0200 -+++ parboiled-1.4.1/parboiled-java/src/test/java/org/parboiled/PrevCallsTest.java 2023-10-11 09:55:09.205648662 +0200 -@@ -22,8 +22,6 @@ - import org.parboiled.test.TestNgParboiledTest; - import org.testng.annotations.Test; - --import java.lang.invoke.MethodHandles; -- - public class PrevCallsTest extends TestNgParboiledTest { - - @BuildParseTree -diff -urEbwBN parboiled-1.4.1.orig/parboiled-java/src/test/java/org/parboiled/transform/ActionClassGeneratorTest.java parboiled-1.4.1/parboiled-java/src/test/java/org/parboiled/transform/ActionClassGeneratorTest.java ---- parboiled-1.4.1.orig/parboiled-java/src/test/java/org/parboiled/transform/ActionClassGeneratorTest.java 2023-10-11 09:54:38.812122172 +0200 -+++ parboiled-1.4.1/parboiled-java/src/test/java/org/parboiled/transform/ActionClassGeneratorTest.java 2023-10-11 09:55:09.208982017 +0200 -@@ -126,11 +126,11 @@ - assertEquals(getClassDump(group.getGroupClassCode()), "" + - "// class version 51.0 (51)\n" + - "// access flags 0x1011\n" + -- "public final synthetic class org/parboiled/transform/Action$xPqljUb88dWGGhyd extends org/parboiled/transform/BaseAction {\n" + -+ "public final synthetic class org/parboiled/transform/Action$OrG2zjbz0MYoT8sO extends org/parboiled/transform/BaseAction {\n" + - "\n" + - "\n" + - " // access flags 0x1001\n" + -- " public synthetic Lorg/parboiled/transform/TestParser; field$0\n" + -+ " public synthetic Lorg/parboiled/transform/TestParser$$parboiled; field$0\n" + - "\n" + - " // access flags 0x1001\n" + - " public synthetic I field$1\n" + -@@ -156,21 +156,21 @@ - " // access flags 0x1\n" + - " public run(Lorg/parboiled/Context;)Z\n" + - " ALOAD 0\n" + -- " GETFIELD org/parboiled/transform/Action$xPqljUb88dWGGhyd.field$0 : Lorg/parboiled/transform/TestParser;\n" + -+ " GETFIELD org/parboiled/transform/Action$OrG2zjbz0MYoT8sO.field$0 : Lorg/parboiled/transform/TestParser$$parboiled;\n" + - " GETFIELD org/parboiled/transform/TestParser.integer : I\n" + - " ALOAD 0\n" + -- " GETFIELD org/parboiled/transform/Action$xPqljUb88dWGGhyd.field$1 : I\n" + -+ " GETFIELD org/parboiled/transform/Action$OrG2zjbz0MYoT8sO.field$1 : I\n" + - " IADD\n" + - " ALOAD 0\n" + -- " GETFIELD org/parboiled/transform/Action$xPqljUb88dWGGhyd.field$2 : Lorg/parboiled/support/Var;\n" + -+ " GETFIELD org/parboiled/transform/Action$OrG2zjbz0MYoT8sO.field$2 : Lorg/parboiled/support/Var;\n" + - " INVOKEVIRTUAL org/parboiled/support/Var.get ()Ljava/lang/Object;\n" + - " CHECKCAST java/lang/String\n" + - " INVOKEVIRTUAL java/lang/String.length ()I\n" + - " ALOAD 0\n" + -- " GETFIELD org/parboiled/transform/Action$xPqljUb88dWGGhyd.field$3 : I\n" + -+ " GETFIELD org/parboiled/transform/Action$OrG2zjbz0MYoT8sO.field$3 : I\n" + - " ISUB\n" + - " ALOAD 0\n" + -- " GETFIELD org/parboiled/transform/Action$xPqljUb88dWGGhyd.field$4 : I\n" + -+ " GETFIELD org/parboiled/transform/Action$OrG2zjbz0MYoT8sO.field$4 : I\n" + - " ISUB\n" + - " IF_ICMPGE L0\n" + - " ICONST_1\n" + -diff -urEbwBN parboiled-1.4.1.orig/parboiled-java/src/test/java/org/parboiled/transform/InstructionGroupPreparerTest.java parboiled-1.4.1/parboiled-java/src/test/java/org/parboiled/transform/InstructionGroupPreparerTest.java ---- parboiled-1.4.1.orig/parboiled-java/src/test/java/org/parboiled/transform/InstructionGroupPreparerTest.java 2023-10-11 09:54:38.812122172 +0200 -+++ parboiled-1.4.1/parboiled-java/src/test/java/org/parboiled/transform/InstructionGroupPreparerTest.java 2023-10-11 09:55:09.208982017 +0200 -@@ -56,9 +56,9 @@ - assertEquals(group.getFields().get(2).desc, "I"); - - group = method.getGroups().get(2); -- assertEquals(group.getName(), "Action$xPqljUb88dWGGhyd"); -+ assertEquals(group.getName(), "Action$OrG2zjbz0MYoT8sO"); - assertEquals(group.getFields().size(), 5); -- assertEquals(group.getFields().get(0).desc, "Lorg/parboiled/transform/TestParser;"); -+ assertEquals(group.getFields().get(0).desc, "Lorg/parboiled/transform/TestParser$$parboiled;"); - assertEquals(group.getFields().get(1).desc, "I"); - assertEquals(group.getFields().get(2).desc, "Lorg/parboiled/support/Var;"); - assertEquals(group.getFields().get(3).desc, "I"); -diff -urEbwBN parboiled-1.4.1.orig/parboiled-java/src/test/java/org/parboiled/transform/LookupMethodTest.java parboiled-1.4.1/parboiled-java/src/test/java/org/parboiled/transform/LookupMethodTest.java ---- parboiled-1.4.1.orig/parboiled-java/src/test/java/org/parboiled/transform/LookupMethodTest.java 2023-10-11 09:54:38.812122172 +0200 -+++ parboiled-1.4.1/parboiled-java/src/test/java/org/parboiled/transform/LookupMethodTest.java 1970-01-01 01:00:00.000000000 +0100 -@@ -1,48 +0,0 @@ --/* -- * Copyright (C) 2022 parboiled contributors -- * -- * Licensed under the Apache License, Version 2.0 (the "License"); -- * you may not use this file except in compliance with the License. -- * You may obtain a copy of the License at -- * -- * http://www.apache.org/licenses/LICENSE-2.0 -- * -- * Unless required by applicable law or agreed to in writing, software -- * distributed under the License is distributed on an "AS IS" BASIS, -- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -- * See the License for the specific language governing permissions and -- * limitations under the License. -- */ -- --package org.parboiled.transform; -- --import org.parboiled.BaseParser; --import org.parboiled.Parboiled; --import org.parboiled.Rule; --import org.parboiled.test.TestNgParboiledTest; --import org.testng.Assert; --import org.testng.annotations.Test; -- --import java.lang.invoke.MethodHandles; -- --public class LookupMethodTest extends TestNgParboiledTest { -- static boolean lookupMethodInvoked = false; -- -- public static class Parser extends BaseParser { -- -- public Rule A() { -- return Sequence('a', push(42)); -- } -- -- public static MethodHandles.Lookup lookup() { -- lookupMethodInvoked = true; -- return MethodHandles.lookup(); -- } -- } -- -- @Test -- public void testLookupMethodUsed() { -- Parser parser = Parboiled.createParser(Parser.class); -- Assert.assertTrue(lookupMethodInvoked, "The lookup() method must be used if available."); -- } --} -diff -urEbwBN parboiled-1.4.1.orig/parboiled-java/src/test/java/org/parboiled/transform/ParserHierarchyTest.java parboiled-1.4.1/parboiled-java/src/test/java/org/parboiled/transform/ParserHierarchyTest.java ---- parboiled-1.4.1.orig/parboiled-java/src/test/java/org/parboiled/transform/ParserHierarchyTest.java 2023-10-11 09:54:38.812122172 +0200 -+++ parboiled-1.4.1/parboiled-java/src/test/java/org/parboiled/transform/ParserHierarchyTest.java 2023-10-11 09:55:09.208982017 +0200 -@@ -124,13 +124,13 @@ - " 0 ALOAD 0\n" + - " 1 BIPUSH 66\n" + - " 2 INVOKESTATIC java/lang/Character.valueOf (C)Ljava/lang/Character;\n" + -- " 3 NEW org/parboiled/transform/Action$02sFO02Q9LhJ2mmp\n" + -+ " 3 NEW org/parboiled/transform/Action$Px2Jp4FIYS9AjKV7\n" + - " 4 DUP\n" + - " 5 LDC \"$B_Action1\"\n" + -- " 6 INVOKESPECIAL org/parboiled/transform/Action$02sFO02Q9LhJ2mmp. (Ljava/lang/String;)V\n" + -+ " 6 INVOKESPECIAL org/parboiled/transform/Action$Px2Jp4FIYS9AjKV7. (Ljava/lang/String;)V\n" + - " 7 DUP\n" + - " 8 ALOAD 0\n" + -- " 9 PUTFIELD org/parboiled/transform/Action$02sFO02Q9LhJ2mmp.field$0 : Lorg/parboiled/transform/ParserHierarchyTest$Parser3;\n" + -+ " 9 PUTFIELD org/parboiled/transform/Action$Px2Jp4FIYS9AjKV7.field$0 : Lorg/parboiled/transform/ParserHierarchyTest$Parser3$$parboiled;\n" + - "10 ICONST_0\n" + - "11 ANEWARRAY java/lang/Object\n" + - "12 INVOKEVIRTUAL org/parboiled/transform/ParserHierarchyTest$Parser1.Sequence (Ljava/lang/Object;Ljava/lang/Object;[Ljava/lang/Object;)Lorg/parboiled/Rule;\n" + -@@ -160,13 +160,13 @@ - "20 ANEWARRAY java/lang/Object\n" + - "21 DUP\n" + - "22 ICONST_0\n" + -- "23 NEW org/parboiled/transform/Action$UbnKC3brDnPwNKXv\n" + -+ "23 NEW org/parboiled/transform/Action$k4qTyX8Zgn8Lm8a0\n" + - "24 DUP\n" + - "25 LDC \"B_Action1\"\n" + -- "26 INVOKESPECIAL org/parboiled/transform/Action$UbnKC3brDnPwNKXv. (Ljava/lang/String;)V\n" + -+ "26 INVOKESPECIAL org/parboiled/transform/Action$k4qTyX8Zgn8Lm8a0. (Ljava/lang/String;)V\n" + - "27 DUP\n" + - "28 ALOAD 0\n" + -- "29 PUTFIELD org/parboiled/transform/Action$UbnKC3brDnPwNKXv.field$0 : Lorg/parboiled/transform/ParserHierarchyTest$Parser3;\n" + -+ "29 PUTFIELD org/parboiled/transform/Action$k4qTyX8Zgn8Lm8a0.field$0 : Lorg/parboiled/transform/ParserHierarchyTest$Parser3$$parboiled;\n" + - "30 AASTORE\n" + - "31 INVOKEVIRTUAL org/parboiled/transform/ParserHierarchyTest$Parser3.Sequence (Ljava/lang/Object;Ljava/lang/Object;[Ljava/lang/Object;)Lorg/parboiled/Rule;\n" + - "32 DUP\n" + -@@ -187,13 +187,13 @@ - " 0 ALOAD 0\n" + - " 1 ALOAD 0\n" + - " 2 INVOKESPECIAL org/parboiled/transform/ParserHierarchyTest$Parser1.C ()Lorg/parboiled/Rule;\n" + -- " 3 NEW org/parboiled/transform/Action$COjnrfuG0T4POBCt\n" + -+ " 3 NEW org/parboiled/transform/Action$zJfzDznnLMaJTxvg\n" + - " 4 DUP\n" + - " 5 LDC \"$C_Action1\"\n" + -- " 6 INVOKESPECIAL org/parboiled/transform/Action$COjnrfuG0T4POBCt. (Ljava/lang/String;)V\n" + -+ " 6 INVOKESPECIAL org/parboiled/transform/Action$zJfzDznnLMaJTxvg. (Ljava/lang/String;)V\n" + - " 7 DUP\n" + - " 8 ALOAD 0\n" + -- " 9 PUTFIELD org/parboiled/transform/Action$COjnrfuG0T4POBCt.field$0 : Lorg/parboiled/transform/ParserHierarchyTest$Parser3;\n" + -+ " 9 PUTFIELD org/parboiled/transform/Action$zJfzDznnLMaJTxvg.field$0 : Lorg/parboiled/transform/ParserHierarchyTest$Parser3$$parboiled;\n" + - "10 ICONST_0\n" + - "11 ANEWARRAY java/lang/Object\n" + - "12 INVOKEVIRTUAL org/parboiled/transform/ParserHierarchyTest$Parser2.Sequence (Ljava/lang/Object;Ljava/lang/Object;[Ljava/lang/Object;)Lorg/parboiled/Rule;\n" + -diff -urEbwBN parboiled-1.4.1.orig/parboiled-java/src/test/java/org/parboiled/transform/RuleMethodRewriterTest.java parboiled-1.4.1/parboiled-java/src/test/java/org/parboiled/transform/RuleMethodRewriterTest.java ---- parboiled-1.4.1.orig/parboiled-java/src/test/java/org/parboiled/transform/RuleMethodRewriterTest.java 2023-10-11 09:54:38.812122172 +0200 -+++ parboiled-1.4.1/parboiled-java/src/test/java/org/parboiled/transform/RuleMethodRewriterTest.java 2023-10-11 09:55:09.208982017 +0200 -@@ -59,13 +59,13 @@ - " 6 ANEWARRAY java/lang/Object\n" + - " 7 DUP\n" + - " 8 ICONST_0\n" + -- " 9 NEW org/parboiled/transform/Action$9oFgHpRIhPPzfI17\n" + -+ " 9 NEW org/parboiled/transform/Action$K54Cjo0vNpv0KPTK\n" + - "10 DUP\n" + - "11 LDC \"RuleWithIndirectImplicitAction_Action1\"\n" + -- "12 INVOKESPECIAL org/parboiled/transform/Action$9oFgHpRIhPPzfI17. (Ljava/lang/String;)V\n" + -+ "12 INVOKESPECIAL org/parboiled/transform/Action$K54Cjo0vNpv0KPTK. (Ljava/lang/String;)V\n" + - "13 DUP\n" + - "14 ALOAD 0\n" + -- "15 PUTFIELD org/parboiled/transform/Action$9oFgHpRIhPPzfI17.field$0 : Lorg/parboiled/transform/TestParser;\n" + -+ "15 PUTFIELD org/parboiled/transform/Action$K54Cjo0vNpv0KPTK.field$0 : Lorg/parboiled/transform/TestParser$$parboiled;\n" + - "16 AASTORE\n" + - "17 INVOKEVIRTUAL org/parboiled/transform/TestParser.Sequence (Ljava/lang/Object;Ljava/lang/Object;[Ljava/lang/Object;)Lorg/parboiled/Rule;\n" + - "18 ARETURN\n"); -@@ -118,25 +118,25 @@ - "43 AASTORE\n" + - "44 DUP\n" + - "45 ICONST_1\n" + -- "46 NEW org/parboiled/transform/Action$xPqljUb88dWGGhyd\n" + -+ "46 NEW org/parboiled/transform/Action$OrG2zjbz0MYoT8sO\n" + - "47 DUP\n" + - "48 LDC \"RuleWithComplexActionSetup_Action2\"\n" + -- "49 INVOKESPECIAL org/parboiled/transform/Action$xPqljUb88dWGGhyd. (Ljava/lang/String;)V\n" + -+ "49 INVOKESPECIAL org/parboiled/transform/Action$OrG2zjbz0MYoT8sO. (Ljava/lang/String;)V\n" + - "50 DUP\n" + - "51 ALOAD 0\n" + -- "52 PUTFIELD org/parboiled/transform/Action$xPqljUb88dWGGhyd.field$0 : Lorg/parboiled/transform/TestParser;\n" + -+ "52 PUTFIELD org/parboiled/transform/Action$OrG2zjbz0MYoT8sO.field$0 : Lorg/parboiled/transform/TestParser$$parboiled;\n" + - "53 DUP\n" + - "54 ILOAD 1\n" + -- "55 PUTFIELD org/parboiled/transform/Action$xPqljUb88dWGGhyd.field$1 : I\n" + -+ "55 PUTFIELD org/parboiled/transform/Action$OrG2zjbz0MYoT8sO.field$1 : I\n" + - "56 DUP\n" + - "57 ALOAD 4\n" + -- "58 PUTFIELD org/parboiled/transform/Action$xPqljUb88dWGGhyd.field$2 : Lorg/parboiled/support/Var;\n" + -+ "58 PUTFIELD org/parboiled/transform/Action$OrG2zjbz0MYoT8sO.field$2 : Lorg/parboiled/support/Var;\n" + - "59 DUP\n" + - "60 ILOAD 2\n" + -- "61 PUTFIELD org/parboiled/transform/Action$xPqljUb88dWGGhyd.field$3 : I\n" + -+ "61 PUTFIELD org/parboiled/transform/Action$OrG2zjbz0MYoT8sO.field$3 : I\n" + - "62 DUP\n" + - "63 ILOAD 3\n" + -- "64 PUTFIELD org/parboiled/transform/Action$xPqljUb88dWGGhyd.field$4 : I\n" + -+ "64 PUTFIELD org/parboiled/transform/Action$OrG2zjbz0MYoT8sO.field$4 : I\n" + - "65 AASTORE\n" + - "66 INVOKEVIRTUAL org/parboiled/transform/TestParser.Sequence (Ljava/lang/Object;Ljava/lang/Object;[Ljava/lang/Object;)Lorg/parboiled/Rule;\n" + - "67 NEW org/parboiled/matchers/VarFramingMatcher\n" + -diff -urEbwBN parboiled-1.4.1.orig/parboiled-java/src/test/java/org/parboiled/transform/VarInitClassGeneratorTest.java parboiled-1.4.1/parboiled-java/src/test/java/org/parboiled/transform/VarInitClassGeneratorTest.java ---- parboiled-1.4.1.orig/parboiled-java/src/test/java/org/parboiled/transform/VarInitClassGeneratorTest.java 2023-10-11 09:54:38.815455526 +0200 -+++ parboiled-1.4.1/parboiled-java/src/test/java/org/parboiled/transform/VarInitClassGeneratorTest.java 2023-10-11 09:55:09.208982017 +0200 -@@ -120,14 +120,14 @@ - assertEquals(getClassDump(group.getGroupClassCode()), "" + - "// class version 51.0 (51)\n" + - "// access flags 0x1011\n" + -- "public final synthetic class org/parboiled/transform/Action$wahXW5a63chqvc1g extends org/parboiled/transform/BaseAction {\n" + -+ "public final synthetic class org/parboiled/transform/Action$ha3NOiBr9DZ3I2Sh extends org/parboiled/transform/BaseAction {\n" + - "\n" + - "\n" + - " // access flags 0x1001\n" + - " public synthetic Lorg/parboiled/support/Var; field$0\n" + - "\n" + - " // access flags 0x1001\n" + -- " public synthetic Lorg/parboiled/transform/VarInitClassGeneratorTest$Parser; field$1\n" + -+ " public synthetic Lorg/parboiled/transform/VarInitClassGeneratorTest$Parser$$parboiled; field$1\n" + - "\n" + - " // access flags 0x1\n" + - " public (Ljava/lang/String;)V\n" + -@@ -141,11 +141,11 @@ - " // access flags 0x1\n" + - " public run(Lorg/parboiled/Context;)Z\n" + - " ALOAD 0\n" + -- " GETFIELD org/parboiled/transform/Action$wahXW5a63chqvc1g.field$0 : Lorg/parboiled/support/Var;\n" + -+ " GETFIELD org/parboiled/transform/Action$ha3NOiBr9DZ3I2Sh.field$0 : Lorg/parboiled/support/Var;\n" + - " INVOKEVIRTUAL org/parboiled/support/Var.get ()Ljava/lang/Object;\n" + - " CHECKCAST java/util/List\n" + - " ALOAD 0\n" + -- " GETFIELD org/parboiled/transform/Action$wahXW5a63chqvc1g.field$1 : Lorg/parboiled/transform/VarInitClassGeneratorTest$Parser;\n" + -+ " GETFIELD org/parboiled/transform/Action$ha3NOiBr9DZ3I2Sh.field$1 : Lorg/parboiled/transform/VarInitClassGeneratorTest$Parser$$parboiled;\n" + - " DUP\n" + - " ALOAD 1\n" + - " INVOKEINTERFACE org/parboiled/ContextAware.setContext (Lorg/parboiled/Context;)V (itf)\n" +