This commit is contained in:
parent
90b9cefca7
commit
6fb0fb5736
@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:ab40ea0adc098fd8297c2bfc709409e055775d796c0a7b3e46589ae6e72b8143
|
||||
size 2860
|
||||
oid sha256:1b426cd0ac656fe6c6d19037a13766a8214195517d409c2d2b62beed0f48087a
|
||||
size 2856
|
||||
|
@ -39,10 +39,10 @@ Fri Oct 6 11:26:05 UTC 2023 - Fridrich Strba <fstrba@suse.com>
|
||||
2.10 and 2.11
|
||||
+ Upgrade to ASM 5.0.3, closed #76
|
||||
+ Make parboiled-java relocatable, closed #80
|
||||
- Require Java 9 for building because the function
|
||||
java.lang.invoke.MethodHandles.Lookup.defineClass(...) does not
|
||||
exist in earlier versions. Build still with source/target 8 to
|
||||
keep maximum compatibility with java 8
|
||||
- Added patch:
|
||||
* restore-java8-compatibility.patch
|
||||
+ revert upstream commit making changes incompatible with
|
||||
Java 8
|
||||
- Removed patch:
|
||||
* parboiled-port-to-objectweb-asm-5.0.1.patch
|
||||
+ not needed with this version
|
||||
|
@ -25,6 +25,7 @@ Source1: %{base_name}-build.tar.xz
|
||||
# for build see https://github.com/sirthias/parboiled/wiki/Building-parboiled
|
||||
Source2: https://repo1.maven.org/maven2/org/parboiled/%{base_name}-core/%{version}/%{base_name}-core-%{version}.pom
|
||||
Source3: https://repo1.maven.org/maven2/org/parboiled/%{base_name}-java/%{version}/%{base_name}-java-%{version}.pom
|
||||
Patch0: restore-java8-compatibility.patch
|
||||
BuildRequires: ant
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: javapackages-local
|
||||
@ -57,6 +58,7 @@ This package contains javadoc for %{name}.
|
||||
|
||||
%prep
|
||||
%setup -q -n %{base_name}-%{version} -a1
|
||||
%patch0 -p1
|
||||
|
||||
find . -name "*.class" -delete
|
||||
find . -name "*.jar" -delete
|
||||
|
581
restore-java8-compatibility.patch
Normal file
581
restore-java8-compatibility.patch
Normal file
@ -0,0 +1,581 @@
|
||||
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:51.432202375 +0200
|
||||
@@ -35,7 +35,6 @@
|
||||
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
-import java.lang.invoke.MethodHandles;
|
||||
import java.lang.reflect.Array;
|
||||
import java.lang.reflect.Constructor;
|
||||
import java.lang.reflect.Field;
|
||||
@@ -47,8 +46,6 @@
|
||||
|
||||
class AsmUtils {
|
||||
|
||||
- private static final LookupFactory lookupFactory = new LookupFactory();
|
||||
-
|
||||
public static ClassReader createClassReader(Class<?> clazz) throws IOException {
|
||||
checkArgNotNull(clazz, "clazz");
|
||||
String classFilename = clazz.getName().replace('.', '/') + ".class";
|
||||
@@ -199,17 +196,22 @@
|
||||
* Otherwise the method returns null.
|
||||
*
|
||||
* @param className the full name of the class to be loaded
|
||||
- * @param parentClass the parent class of the class with the given className
|
||||
+ * @param classLoader the class loader to use
|
||||
* @return the class instance or null
|
||||
*/
|
||||
- public static Class<?> loadClass(String className, Class<?> parentClass) {
|
||||
+ public static Class<?> findLoadedClass(String className, ClassLoader classLoader) {
|
||||
checkArgNotNull(className, "className");
|
||||
- checkArgNotNull(parentClass, "parentClass");
|
||||
+ checkArgNotNull(classLoader, "classLoader");
|
||||
try {
|
||||
+ Class<?> classLoaderBaseClass = Class.forName("java.lang.ClassLoader");
|
||||
+ Method findLoadedClassMethod = classLoaderBaseClass.getDeclaredMethod("findLoadedClass", String.class);
|
||||
+
|
||||
+ // protected method invocation
|
||||
+ findLoadedClassMethod.setAccessible(true);
|
||||
try {
|
||||
- return parentClass.getClassLoader().loadClass(className);
|
||||
- } catch (ClassNotFoundException cnfe) {
|
||||
- return null;
|
||||
+ return (Class<?>) findLoadedClassMethod.invoke(classLoader, className);
|
||||
+ } finally {
|
||||
+ findLoadedClassMethod.setAccessible(false);
|
||||
}
|
||||
} catch (Exception e) {
|
||||
throw new RuntimeException("Could not determine whether class '" + className +
|
||||
@@ -218,30 +220,22 @@
|
||||
}
|
||||
|
||||
/**
|
||||
- * Defines a new class with the given name and bytecode within the package of the given parent class.
|
||||
- * Since package and class identity includes the ClassLoader instance used to load a class we use reflection
|
||||
+ * Loads the class defined with the given name and bytecode using the given class loader.
|
||||
+ * Since package and class idendity includes the ClassLoader instance used to load a class we use reflection
|
||||
* on the given class loader to define generated classes. If we used our own class loader (in order to be able
|
||||
* to access the protected "defineClass" method) we would likely still be able to load generated classes,
|
||||
* however, they would not have access to package-private classes and members of their super classes.
|
||||
*
|
||||
* @param className the full name of the class to be loaded
|
||||
* @param code the bytecode of the class to load
|
||||
- * @param parentClass the parent class of the new class
|
||||
+ * @param classLoader the class loader to use
|
||||
* @return the class instance
|
||||
*/
|
||||
- public static Class<?> defineClass(String className, byte[] code, Class<?> parentClass) {
|
||||
+ public static Class<?> loadClass(String className, byte[] code, ClassLoader classLoader) {
|
||||
checkArgNotNull(className, "className");
|
||||
checkArgNotNull(code, "code");
|
||||
- checkArgNotNull(parentClass, "parentClass");
|
||||
-
|
||||
+ checkArgNotNull(classLoader, "classLoader");
|
||||
try {
|
||||
- if (lookupFactory != null) {
|
||||
- MethodHandles.Lookup lookup = lookupFactory.lookupFor(parentClass);
|
||||
- if (lookup != null) {
|
||||
- return lookup.defineClass(code);
|
||||
- }
|
||||
- }
|
||||
-
|
||||
Class<?> classLoaderBaseClass = Class.forName("java.lang.ClassLoader");
|
||||
Method defineClassMethod = classLoaderBaseClass.getDeclaredMethod("defineClass",
|
||||
String.class, byte[].class, int.class, int.class);
|
||||
@@ -249,7 +243,7 @@
|
||||
// protected method invocation
|
||||
defineClassMethod.setAccessible(true);
|
||||
try {
|
||||
- return (Class<?>) defineClassMethod.invoke(parentClass.getClassLoader(), className, code, 0, code.length);
|
||||
+ return (Class<?>) defineClassMethod.invoke(classLoader, className, code, 0, code.length);
|
||||
} 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:58:14.413389233 +0200
|
||||
@@ -23,7 +23,8 @@
|
||||
import org.objectweb.asm.tree.*;
|
||||
|
||||
import static org.objectweb.asm.Opcodes.*;
|
||||
-import static org.parboiled.transform.AsmUtils.defineClass;
|
||||
+import static org.parboiled.transform.AsmUtils.findLoadedClass;
|
||||
+import static org.parboiled.transform.AsmUtils.loadClass;
|
||||
|
||||
abstract class GroupClassGenerator implements RuleMethodProcessor {
|
||||
|
||||
@@ -53,15 +54,16 @@
|
||||
private void loadGroupClass(InstructionGroup group) {
|
||||
createGroupClassType(group);
|
||||
String className = group.getGroupClassType().getClassName();
|
||||
+ ClassLoader classLoader = classNode.getParentClass().getClassLoader();
|
||||
|
||||
Class<?> groupClass;
|
||||
synchronized (lock) {
|
||||
- groupClass = AsmUtils.loadClass(className, classNode.getParentClass());
|
||||
+ groupClass = findLoadedClass(className, classLoader);
|
||||
if (groupClass == null || forceCodeBuilding) {
|
||||
byte[] groupClassCode = generateGroupClassCode(group);
|
||||
group.setGroupClassCode(groupClassCode);
|
||||
if (groupClass == null) {
|
||||
- AsmUtils.defineClass(className, groupClassCode, classNode.getParentClass());
|
||||
+ loadClass(className, groupClassCode, classLoader);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -71,7 +73,7 @@
|
||||
String s = classNode.name;
|
||||
int lastSlash = classNode.name.lastIndexOf('/');
|
||||
// do not prepend a slash if class is in the default package (lastSlash == -1)
|
||||
- String groupClassInternalName = (lastSlash >= 0 ? s.substring(0, lastSlash) + '/' : "") + group.getName();
|
||||
+ String groupClassInternalName = (lastSlash >= 0 ? s.substring(0, lastSlash) : s)+ '/' + group.getName();
|
||||
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 1970-01-01 01:00:00.000000000 +0100
|
||||
@@ -1,105 +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 java.lang.invoke.MethodHandles.Lookup;
|
||||
-import java.lang.reflect.Field;
|
||||
-import java.lang.reflect.Method;
|
||||
-import java.util.WeakHashMap;
|
||||
-
|
||||
-/**
|
||||
- * Helper that can be used to create {@link Lookup} instances for
|
||||
- * specific classes.
|
||||
- */
|
||||
-final class LookupFactory {
|
||||
-
|
||||
- private WeakHashMap<Class<?>, Lookup> lookups = new WeakHashMap<>();
|
||||
- private Lookup trustedLookup;
|
||||
-
|
||||
- LookupFactory() {
|
||||
- loadTrustedLookup();
|
||||
- }
|
||||
-
|
||||
- /**
|
||||
- * Tries to load a trusted {@link Lookup} instance.
|
||||
- *
|
||||
- * <p>
|
||||
- * Adapted from <a href="https://github.com/google/guice/blob/cf759d44c78e8490e3d54df6a27918e0811bbdf9/core/src/com/google/inject/internal/aop/HiddenClassDefiner.java#L40">HiddenClassDefiner</a>
|
||||
- * of Google Guice.
|
||||
- * </p>
|
||||
- */
|
||||
- private void loadTrustedLookup() {
|
||||
- try {
|
||||
- Class<?> unsafeType = Class.forName("sun.misc.Unsafe");
|
||||
- Field theUnsafeField = unsafeType.getDeclaredField("theUnsafe");
|
||||
- theUnsafeField.setAccessible(true);
|
||||
- Object unsafeInstance = theUnsafeField.get(null);
|
||||
- Field trustedLookupField = Lookup.class.getDeclaredField("IMPL_LOOKUP");
|
||||
- Method baseMethod = unsafeType.getMethod("staticFieldBase", Field.class);
|
||||
- Object trustedLookupBase = baseMethod.invoke(unsafeInstance, trustedLookupField);
|
||||
- Method offsetMethod = unsafeType.getMethod("staticFieldOffset", Field.class);
|
||||
- Object trustedLookupOffset = offsetMethod.invoke(unsafeInstance, trustedLookupField);
|
||||
- Method getObjectMethod = unsafeType.getMethod("getObject", Object.class, long.class);
|
||||
- this.trustedLookup =
|
||||
- (Lookup) getObjectMethod.invoke(unsafeInstance, trustedLookupBase, trustedLookupOffset);
|
||||
- } catch (Exception e) {
|
||||
- // Unsafe and trusted lookup is not available
|
||||
- }
|
||||
- }
|
||||
-
|
||||
- /**
|
||||
- * Determines a {@link Lookup} instance for the given hostClass.
|
||||
- * <p>
|
||||
- * The method first tries to use a static method of the hostClass with the
|
||||
- * following signature:
|
||||
- * </p>
|
||||
- * <p>
|
||||
- * <code>
|
||||
- * public static {@link Lookup} lookup();
|
||||
- * </code>
|
||||
- * </p>
|
||||
- * <p>
|
||||
- * If this fails then it tries to use a trusted lookup
|
||||
- * instance created via sun.misc.Unsafe.
|
||||
- * </p>
|
||||
- *
|
||||
- * @param hostClass The target class of the lookup instance
|
||||
- * @return a lookup instance or <code>null</code> if not found
|
||||
- */
|
||||
- Lookup lookupFor(Class<?> hostClass) {
|
||||
- Lookup lookup = lookups.get(hostClass);
|
||||
- if (lookup == null) {
|
||||
- try {
|
||||
- // try to find a lookup() method first
|
||||
- Method lookupMethod = hostClass.getMethod("lookup");
|
||||
- lookup = (Lookup) lookupMethod.invoke(null);
|
||||
- } catch (Exception e) {
|
||||
- // failed to use lookup() method
|
||||
- }
|
||||
-
|
||||
- if (lookup == null && trustedLookup != null) {
|
||||
- // use trusted lookup instance if available
|
||||
- lookup = trustedLookup.in(hostClass);
|
||||
- }
|
||||
-
|
||||
- if (lookup != null) {
|
||||
- lookups.put(hostClass, lookup);
|
||||
- }
|
||||
- }
|
||||
- return lookup;
|
||||
- }
|
||||
-}
|
||||
\ 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:55:09.205648662 +0200
|
||||
@@ -32,8 +32,8 @@
|
||||
public static synchronized <T> Class<? extends T> transformParser(Class<T> parserClass) throws Exception {
|
||||
checkArgNotNull(parserClass, "parserClass");
|
||||
// first check whether we did not already create and load the extension of the given parser class
|
||||
- Class<?> extendedClass = AsmUtils.loadClass(
|
||||
- getExtendedParserClassName(parserClass.getName()), parserClass
|
||||
+ Class<?> extendedClass = findLoadedClass(
|
||||
+ getExtendedParserClassName(parserClass.getName()), parserClass.getClassLoader()
|
||||
);
|
||||
return (Class<? extends T>)
|
||||
(extendedClass != null ? extendedClass : extendParserClass(parserClass).getExtendedClass());
|
||||
@@ -102,10 +102,10 @@
|
||||
};
|
||||
classNode.accept(classWriter);
|
||||
classNode.setClassCode(classWriter.toByteArray());
|
||||
- classNode.setExtendedClass(defineClass(
|
||||
+ classNode.setExtendedClass(loadClass(
|
||||
classNode.name.replace('/', '.'),
|
||||
classNode.getClassCode(),
|
||||
- classNode.getParentClass()
|
||||
+ classNode.getParentClass().getClassLoader()
|
||||
));
|
||||
}
|
||||
|
||||
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<Integer> {
|
||||
|
||||
@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<Integer> {
|
||||
- static boolean lookupMethodInvoked = false;
|
||||
-
|
||||
- public static class Parser extends BaseParser<Integer> {
|
||||
-
|
||||
- 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.<init> (Ljava/lang/String;)V\n" +
|
||||
+ " 6 INVOKESPECIAL org/parboiled/transform/Action$Px2Jp4FIYS9AjKV7.<init> (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.<init> (Ljava/lang/String;)V\n" +
|
||||
+ "26 INVOKESPECIAL org/parboiled/transform/Action$k4qTyX8Zgn8Lm8a0.<init> (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.<init> (Ljava/lang/String;)V\n" +
|
||||
+ " 6 INVOKESPECIAL org/parboiled/transform/Action$zJfzDznnLMaJTxvg.<init> (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.<init> (Ljava/lang/String;)V\n" +
|
||||
+ "12 INVOKESPECIAL org/parboiled/transform/Action$K54Cjo0vNpv0KPTK.<init> (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.<init> (Ljava/lang/String;)V\n" +
|
||||
+ "49 INVOKESPECIAL org/parboiled/transform/Action$OrG2zjbz0MYoT8sO.<init> (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 <init>(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" +
|
Loading…
Reference in New Issue
Block a user