Skip to content

Commit

Permalink
rename base tags too
Browse files Browse the repository at this point in the history
  • Loading branch information
@mcmonkey4eva
mcmonkey4eva committed Oct 23, 2021
1 parent 47995e8 commit fa46f45
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 16 deletions.
3 changes: 2 additions & 1 deletion src/main/java/com/denizenscript/denizencore/tags/TagManager.java
View file
Expand Up @@ -6,6 +6,7 @@
import com.denizenscript.denizencore.scripts.ScriptEntry;
import com.denizenscript.denizencore.tags.core.*;
import com.denizenscript.denizencore.utilities.CoreUtilities;
import com.denizenscript.denizencore.utilities.codegen.TagNamer;
import com.denizenscript.denizencore.utilities.debugging.Debug;
import com.denizenscript.denizencore.DenizenCore;

Expand Down Expand Up @@ -65,7 +66,7 @@ public <R extends ObjectTag> TagBaseData(String name, Class<R> returnType, TagRu
public static HashMap<String, TagBaseData> baseTags = new HashMap<>();

public static <R extends ObjectTag> void registerTagHandler(Class<R> returnType, String name, TagRunnable.BaseInterface<R> run) {
baseTags.put(name, new TagBaseData(name, returnType, run));
baseTags.put(name, new TagBaseData(name, returnType, TagNamer.nameBaseInterface(name, run)));
}

@Deprecated
Expand Down
48 changes: 33 additions & 15 deletions src/main/java/com/denizenscript/denizencore/utilities/codegen/TagNamer.java
View file
Expand Up @@ -14,29 +14,43 @@
public class TagNamer {

public static final String TAG_GEN_PACKAGE = "com/denizenscript/tag_gen/";
public static final String OBJECT_INTERFACE_PATH = Type.getInternalName(TagRunnable.ObjectInterface.class);
public static final String OBJECT_TAG_PATH = Type.getInternalName(ObjectTag.class);
public static final String[] OBJECT_INTERFACE_TYPE = new String[] { OBJECT_INTERFACE_PATH };
public static String OBJECT_INTERFACE_DESCRIPTOR = "L" + OBJECT_INTERFACE_PATH + ";";
public static final String ATTRIBUTE_LOCAL_TYPE = "L" + Type.getInternalName(Attribute.class) + ";";
public static final String OBJECT_TAG_PATH = Type.getInternalName(ObjectTag.class);
public static final String OBJECT_LOCAL_TYPE = "L" + OBJECT_TAG_PATH + ";";
public static final Method OBJECTINTERFACE_RUN_METHOD = ReflectionHelper.getMethod(TagRunnable.ObjectInterface.class, "run", Attribute.class, ObjectTag.class);
public static final String OBJECTINTERFACE_RUN_DESCRIPTOR = Type.getMethodDescriptor(OBJECTINTERFACE_RUN_METHOD);

public static DynamicClassLoader loader = new DynamicClassLoader();

public static AsciiMatcher TAG_NAME_PERMITTED = new AsciiMatcher(AsciiMatcher.LETTERS_LOWER + AsciiMatcher.LETTERS_UPPER + AsciiMatcher.DIGITS + "_");

public static long tagsGenerated = 0;

public static final String OBJECT_INTERFACE_PATH = Type.getInternalName(TagRunnable.ObjectInterface.class);
public static String OBJECT_INTERFACE_DESCRIPTOR = "L" + OBJECT_INTERFACE_PATH + ";";
public static final Method OBJECT_INTERFACE_RUN_METHOD = ReflectionHelper.getMethod(TagRunnable.ObjectInterface.class, "run", Attribute.class, ObjectTag.class);
public static final String OBJECT_INTERFACE_RUN_DESCRIPTOR = Type.getMethodDescriptor(OBJECT_INTERFACE_RUN_METHOD);

public static <T extends ObjectTag, R extends ObjectTag> TagRunnable.ObjectInterface<T, R> nameTagInterface(Class<T> mainType, String tagName, TagRunnable.ObjectInterface<T, R> tag) {
String fullTagName = mainType.getSimpleName() + "_" + tagName;
return (TagRunnable.ObjectInterface<T, R>) nameInternal(fullTagName, tag, OBJECT_INTERFACE_PATH, OBJECT_INTERFACE_DESCRIPTOR, true, OBJECT_INTERFACE_RUN_DESCRIPTOR);
}

public static final String BASE_INTERFACE_PATH = Type.getInternalName(TagRunnable.BaseInterface.class);
public static String BASE_INTERFACE_DESCRIPTOR = "L" + BASE_INTERFACE_PATH + ";";
public static final Method BASE_NTERFACE_RUN_METHOD = ReflectionHelper.getMethod(TagRunnable.BaseInterface.class, "run", Attribute.class);
public static final String BASE_INTERFACE_RUN_DESCRIPTOR = Type.getMethodDescriptor(BASE_NTERFACE_RUN_METHOD);

public static <R extends ObjectTag> TagRunnable.BaseInterface<R> nameBaseInterface(String tagName, TagRunnable.BaseInterface<R> tag) {
return (TagRunnable.BaseInterface<R>) nameInternal("base_" + tagName, tag, BASE_INTERFACE_PATH, BASE_INTERFACE_DESCRIPTOR, false, BASE_INTERFACE_RUN_DESCRIPTOR);
}

public static Object nameInternal(String fullTagName, Object tag, String typePath, String typeDescription, boolean hasObject, String runDescriptor) {
try {
// ====== Gen class ======
String className = TAG_GEN_PACKAGE + "Tag" + (tagsGenerated++) + "_" + mainType.getSimpleName() + "_" + TAG_NAME_PERMITTED.trimToMatches(tagName);
String className = TAG_GEN_PACKAGE + "Tag" + (tagsGenerated++) + "_" + TAG_NAME_PERMITTED.trimToMatches(fullTagName);
ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_MAXS);
cw.visit(Opcodes.V1_8, Opcodes.ACC_PUBLIC + Opcodes.ACC_STATIC, className, null, "java/lang/Object", OBJECT_INTERFACE_TYPE);
cw.visit(Opcodes.V1_8, Opcodes.ACC_PUBLIC + Opcodes.ACC_STATIC, className, null, "java/lang/Object", new String[] { typePath });
cw.visitSource("GENERATED_TAG", null);
cw.visitField(Opcodes.ACC_PUBLIC | Opcodes.ACC_STATIC, "runnable", OBJECT_INTERFACE_DESCRIPTOR, null, null);
cw.visitField(Opcodes.ACC_PUBLIC | Opcodes.ACC_STATIC, "runnable", typeDescription, null, null);
// ====== Gen constructor ======
{
MethodVisitor mv = cw.visitMethod(Opcodes.ACC_PUBLIC, "<init>", "()V", null, null);
Expand All @@ -53,17 +67,21 @@ public static <T extends ObjectTag, R extends ObjectTag> TagRunnable.ObjectInter
}
// ====== Gen 'run' method ======
{
MethodVisitor mv = cw.visitMethod(Opcodes.ACC_PUBLIC | Opcodes.ACC_FINAL, "run", OBJECTINTERFACE_RUN_DESCRIPTOR, null, null);
MethodVisitor mv = cw.visitMethod(Opcodes.ACC_PUBLIC | Opcodes.ACC_FINAL, "run", runDescriptor, null, null);
mv.visitCode();
Label startLabel = new Label();
mv.visitLabel(startLabel);
mv.visitLineNumber(1, startLabel);
mv.visitFieldInsn(Opcodes.GETSTATIC, className, "runnable", OBJECT_INTERFACE_DESCRIPTOR);
mv.visitFieldInsn(Opcodes.GETSTATIC, className, "runnable", typeDescription);
mv.visitVarInsn(Opcodes.ALOAD, 1);
mv.visitVarInsn(Opcodes.ALOAD, 2);
mv.visitMethodInsn(Opcodes.INVOKEINTERFACE, OBJECT_INTERFACE_PATH, "run", OBJECTINTERFACE_RUN_DESCRIPTOR, true);
if (hasObject) {
mv.visitVarInsn(Opcodes.ALOAD, 2);
}
mv.visitMethodInsn(Opcodes.INVOKEINTERFACE, typePath, "run", runDescriptor, true);
mv.visitLocalVariable("attribute", ATTRIBUTE_LOCAL_TYPE, null, startLabel, startLabel, 0);
mv.visitLocalVariable("object", OBJECT_LOCAL_TYPE, null, startLabel, startLabel, 1);
if (hasObject) {
mv.visitLocalVariable("object", OBJECT_LOCAL_TYPE, null, startLabel, startLabel, 1);
}
mv.visitInsn(Opcodes.ARETURN);
mv.visitMaxs(0, 0);
mv.visitEnd();
Expand All @@ -72,7 +90,7 @@ public static <T extends ObjectTag, R extends ObjectTag> TagRunnable.ObjectInter
cw.visitEnd();
byte[] compiled = cw.toByteArray();
Class<?> generatedClass = loader.define(className.replace('/', '.'), compiled);
TagRunnable.ObjectInterface<T, R> result = (TagRunnable.ObjectInterface<T, R>) generatedClass.getConstructors()[0].newInstance();
Object result = generatedClass.getConstructors()[0].newInstance();
ReflectionHelper.setFieldValue(generatedClass, "runnable", result, tag);
return result;
}
Expand Down

0 comments on commit fa46f45

Please sign in to comment.