Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move everything from rewriter except for reflection rules to asm-utils #4

Merged
merged 3 commits into from
Feb 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,17 +1,20 @@
package io.papermc.reflectionrewriter;

import io.papermc.asm.InvokeStaticRewrite;
import io.papermc.asm.MethodMatcher;
import io.papermc.asm.RewriteRule;
import java.util.List;
import java.util.Set;

public final class DefaultRules {
public final class BaseReflectionRules {
private final String proxy;
private final RewriteRule classRule;
private final RewriteRule methodHandlesLookupRule;
private final RewriteRule lambdaMetafactoryRule;
private final RewriteRule constantBootstrapsRule;
private final RewriteRule methodTypeRule;

public DefaultRules(final String proxyClassName) {
public BaseReflectionRules(final String proxyClassName) {
this.proxy = proxyClassName;
this.classRule = this.createClassRule();
this.methodHandlesLookupRule = this.createMethodHandlesLookupRule();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
package io.papermc.reflectionrewriter;

import io.papermc.asm.ClassInfo;
import io.papermc.asm.ClassInfoProvider;
import io.papermc.asm.ClassProcessingContext;
import io.papermc.asm.InvokeStaticRewrite;
import io.papermc.asm.RewriteRule;
import java.util.Set;
import org.checkerframework.checker.nullness.qual.NonNull;
import org.checkerframework.checker.nullness.qual.Nullable;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
package io.papermc.reflectionrewriter;

import io.papermc.asm.ClassInfo;
import io.papermc.asm.ClassInfoProvider;
import io.papermc.asm.InvokeStaticRewrite;
import io.papermc.asm.RewriteRule;
import java.util.function.Predicate;
import org.checkerframework.checker.nullness.qual.Nullable;
import org.objectweb.asm.MethodVisitor;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.papermc.reflectionrewriter;
package io.papermc.asm;

import org.checkerframework.checker.nullness.qual.NonNull;
import org.checkerframework.framework.qual.DefaultQualifier;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.papermc.reflectionrewriter;
package io.papermc.asm;

import org.checkerframework.checker.nullness.qual.NonNull;
import org.checkerframework.checker.nullness.qual.Nullable;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.papermc.reflectionrewriter;
package io.papermc.asm;

import org.checkerframework.checker.nullness.qual.NonNull;
import org.checkerframework.checker.nullness.qual.Nullable;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.papermc.reflectionrewriter;
package io.papermc.asm;

import java.util.Collections;
import java.util.LinkedHashMap;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.papermc.reflectionrewriter;
package io.papermc.asm;

import org.checkerframework.checker.nullness.qual.NonNull;
import org.checkerframework.checker.nullness.qual.Nullable;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.papermc.reflectionrewriter;
package io.papermc.asm;

import org.checkerframework.checker.nullness.qual.NonNull;
import org.checkerframework.checker.nullness.qual.Nullable;
Expand All @@ -9,7 +9,7 @@

@DefaultQualifier(NonNull.class)
@FunctionalInterface
interface InvokeStaticRewrite extends MethodVisitorFactory {
public interface InvokeStaticRewrite extends MethodVisitorFactory {
@Nullable Rewrite rewrite(ClassProcessingContext context, int opcode, String owner, String name, String descriptor, boolean isInterface);

@Override
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.papermc.reflectionrewriter;
package io.papermc.asm;

import java.util.HashSet;
import java.util.Set;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.papermc.reflectionrewriter;
package io.papermc.asm;

import org.checkerframework.checker.nullness.qual.NonNull;
import org.checkerframework.framework.qual.DefaultQualifier;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.papermc.reflectionrewriter;
package io.papermc.asm;

import java.util.Arrays;
import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.papermc.reflectionrewriter;
package io.papermc.asm;

import java.util.ArrayList;
import java.util.Arrays;
Expand Down Expand Up @@ -50,10 +50,6 @@ public Builder rules(final List<RewriteRule> rules) {
return this;
}

public Builder defaultRules(final String proxyClassName) {
return this.rules(new DefaultRules(proxyClassName).rules());
}

public RewriteRules build() {
return new RewriteRules(this.rules);
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.papermc.reflectionrewriter;
package io.papermc.asm;

import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
import org.checkerframework.checker.nullness.qual.NonNull;
Expand All @@ -8,13 +8,13 @@
import org.objectweb.asm.MethodVisitor;

@DefaultQualifier(NonNull.class)
public final class ReflectionRewriter extends ClassVisitor implements ClassProcessingContext {
public final class RewriteRulesClassVisitor extends ClassVisitor implements ClassProcessingContext {
private final RewriteRules rules;
private final ClassInfoProvider classInfoProvider;
private @MonotonicNonNull String name;
private @Nullable String superName;

public ReflectionRewriter(
public RewriteRulesClassVisitor(
final int api,
final ClassVisitor parent,
final RewriteRules rules,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.papermc.reflectionrewriter;
package io.papermc.asm;

import org.checkerframework.checker.nullness.qual.NonNull;
import org.checkerframework.framework.qual.DefaultQualifier;
Expand Down