parser: Replace Sig types with string references

Author: NotStirred

src/api/java/io/github/notstirred/dasm/api/annotations/redirect/redirects/AddFieldToMethodToSets.java

@@ -3,7 +3,6 @@
 import io.github.notstirred.dasm.api.annotations.Dasm;
 import io.github.notstirred.dasm.api.annotations.redirect.sets.InterOwnerContainer;
 import io.github.notstirred.dasm.api.annotations.redirect.sets.IntraOwnerContainer;
-import io.github.notstirred.dasm.api.annotations.selector.FieldSig;
 import io.github.notstirred.dasm.api.annotations.selector.Ref;
 
 import java.lang.annotation.Retention;
@@ -29,7 +28,7 @@
  *
  *     @AddFieldToMethodToSets(
  *         containers = Bar_redirects.class,
- *         field = @FieldSig(type = int.class, name = "barX"),
+ *         field = "barX:I",
  *         setter = "setBarX"
  *     )
  *     public int getBarX() {
@@ -53,7 +52,7 @@
     /**
      * The field to replace
      */
-    FieldSig field();
+    String field();
 
     /**
      * The <b>name</b> of the setter method, must have the same owner (be in the same class) as the getter method

src/api/java/io/github/notstirred/dasm/api/annotations/redirect/redirects/AddFieldToSets.java

@@ -3,7 +3,6 @@
 import io.github.notstirred.dasm.api.annotations.Dasm;
 import io.github.notstirred.dasm.api.annotations.redirect.sets.InterOwnerContainer;
 import io.github.notstirred.dasm.api.annotations.redirect.sets.IntraOwnerContainer;
-import io.github.notstirred.dasm.api.annotations.selector.FieldSig;
 import io.github.notstirred.dasm.api.annotations.selector.Ref;
 
 import java.lang.annotation.ElementType;
@@ -26,7 +25,7 @@
  * public class Foo {
  *     @AddFieldToSets(
  *         containers = Bar_to_Foo_redirects.class,
- *         field = @FieldSig(type = int.class, name = "barX"),
+ *         field = "barX:I",
  *     )
  *     private final int x;
  * }
@@ -44,7 +43,7 @@
     /**
      * The field to replace
      */
-    FieldSig field();
+    String field();
 
     /**
      * The source field's mapping owner.

src/api/java/io/github/notstirred/dasm/api/annotations/redirect/redirects/AddMethodToSets.java

@@ -3,7 +3,6 @@
 import io.github.notstirred.dasm.api.annotations.Dasm;
 import io.github.notstirred.dasm.api.annotations.redirect.sets.InterOwnerContainer;
 import io.github.notstirred.dasm.api.annotations.redirect.sets.IntraOwnerContainer;
-import io.github.notstirred.dasm.api.annotations.selector.MethodSig;
 import io.github.notstirred.dasm.api.annotations.selector.Ref;
 
 import java.lang.annotation.ElementType;
@@ -25,8 +24,8 @@
  * @Dasm
  * public class Foo {
  *     @AddMethodToSets(
- *         containers = Bar_to_Foo_redirects
- *         method = @MethodSig(name = "getBarX", ret = int.class, args = { }),
+ *         containers = Bar_to_Foo_redirects.class,
+ *         method = "getBarX()I"
  *     )
  *     private int getX();
  * }
@@ -44,7 +43,7 @@
     /**
      * The method to replace
      */
-    MethodSig method();
+    String method();
 
     /**
      * The source method's mapping owner.

src/api/java/io/github/notstirred/dasm/api/annotations/redirect/redirects/ConstructorToFactoryRedirect.java

@@ -2,7 +2,6 @@
 
 import io.github.notstirred.dasm.api.annotations.redirect.sets.InterOwnerContainer;
 import io.github.notstirred.dasm.api.annotations.redirect.sets.RedirectSet;
-import io.github.notstirred.dasm.api.annotations.selector.ConstructorMethodSig;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
@@ -28,7 +27,7 @@
  * <pre>{@code
  * @IntraOwnerContainer(owner = @Ref(Vec3i.class))
  * abstract class Vec3i_redirects {
- *     @ConstructorToFactoryRedirect(@ConstructorMethodSig(args = { @Ref(long.class) }))
+ *     @ConstructorToFactoryRedirect("<init>(J)V)
  *     static native Vec3i fromLong(long packed);
  * }
  * }</pre>
@@ -41,9 +40,7 @@
  * <pre>{@code
  * @InterOwnerContainer(owner = @Ref(Vec3i.class), newOwner = @Ref(Util.class))
  * abstract class Vec3i_redirects {
- *     @ConstructorToFactoryRedirect(
- *         @ConstructorMethodSig(args = { @Ref(int.class), @Ref(int.class), @Ref(int.class) })
- *     )
+ *     @ConstructorToFactoryRedirect("<init>(III)V")
  *     static native Vec3i newVec3i(int x, int y, int z);
  * }
  * }</pre>
@@ -56,9 +53,7 @@
  * <pre>{@code
  * @TypeRedirect(from = @Ref(Vec3i.class), to = @Ref(Vec3d.class))
  * abstract class Vec3i_redirects {
- *     @ConstructorToFactoryRedirect(
- *         @ConstructorMethodSig(args = { @Ref(int.class), @Ref(int.class), @Ref(int.class) })
- *     )
+ *     @ConstructorToFactoryRedirect("<init>(III)V")
  *     static native Vec3d of(double x, double y, double z);
  * }
  *
@@ -81,15 +76,13 @@
  *
  * @InterOwnerContainer(owner = @Ref(Vec3i.class), newOwner = @Ref(VecUtils.class))
  * abstract class Vec3i_to_VecUtils {
- *     @ConstructorToFactoryRedirect(
- *         @ConstructorMethodSig(args = { @Ref(int.class), @Ref(int.class), @Ref(int.class) })
- *     )
+ *     @ConstructorToFactoryRedirect("<init>(III)V")
  *     static native Vec3d vec3dOf(double x, double y, double z);
  * }
  * }</pre>
  */
 @Target(METHOD)
 @Retention(CLASS)
 public @interface ConstructorToFactoryRedirect {
-    ConstructorMethodSig value();
+    String value();
 }

src/api/java/io/github/notstirred/dasm/api/annotations/redirect/redirects/FieldRedirect.java

@@ -2,7 +2,6 @@
 
 import io.github.notstirred.dasm.api.annotations.redirect.sets.InterOwnerContainer;
 import io.github.notstirred.dasm.api.annotations.redirect.sets.IntraOwnerContainer;
-import io.github.notstirred.dasm.api.annotations.selector.FieldSig;
 import io.github.notstirred.dasm.api.annotations.selector.Ref;
 
 import java.lang.annotation.ElementType;
@@ -23,7 +22,7 @@
  * <h2>Example:</h2>
  * The following field redirect specifies a redirect from {@code int existingFieldName} to {@code int newFieldName}
  * <pre>{@code
- *     @FieldRedirect(type = @Ref(int.class), name = "existingFieldName")
+ *     @FieldRedirect("existingFieldName:I")
  *     private int newFieldName;
  * }</pre>
  */
@@ -33,7 +32,7 @@
     /**
      * The field to replace
      */
-    FieldSig value();
+    String value();
 
     /**
      * The source field's mapping owner.

src/api/java/io/github/notstirred/dasm/api/annotations/redirect/redirects/FieldToMethodRedirect.java

@@ -2,7 +2,6 @@
 
 import io.github.notstirred.dasm.api.annotations.redirect.sets.InterOwnerContainer;
 import io.github.notstirred.dasm.api.annotations.redirect.sets.IntraOwnerContainer;
-import io.github.notstirred.dasm.api.annotations.selector.FieldSig;
 import io.github.notstirred.dasm.api.annotations.selector.Ref;
 
 import java.lang.annotation.Retention;
@@ -35,10 +34,10 @@
  * <pre>{@code
  * @TypeRedirect(from = @Ref(Vec3i.class), to = @Ref(Vec3.class))
  * abstract class Vec3i_to_Vec3 {
- *     @FieldToMethodRedirect(@FieldSig(type = @Ref(int.class), name = "x"), setter = "setX")
+ *     @FieldToMethodRedirect(value = "x:I"), setter = "setX")
  *     native double getX();
  *
- *     @FieldToMethodRedirect(@FieldSig(type = @Ref(int.class), name = "z"), setter = "setZ")
+ *     @FieldToMethodRedirect(value = "z:I", setter = "setZ")
  *     native double getZ();
  * }
  * @TypeRedirect(from = @Ref(int.class), to = @Ref(double.class))
@@ -56,19 +55,21 @@
  * <pre>{@code
  * @IntraOwnerContainer(owner = @Ref(Vec3i.class))
  * abstract class Vec3i_redirects {
- *     @FieldToMethodRedirect(@FieldSig(type = @Ref(int.class), name = "x"))
+ *     @FieldToMethodRedirect("x:I")
  *     native int getX();
  *
- *     @FieldToMethodRedirect(@FieldSig(type = @Ref(int.class), name = "z"))
+ *     @FieldToMethodRedirect("z:I")
  *     native int getZ();
  * }
  * }</pre>
  */
 @Target(METHOD)
 @Retention(CLASS)
 public @interface FieldToMethodRedirect {
-    /** The field to replace access to. */
-    FieldSig value();
+    /**
+     * The field to replace access to.
+     */
+    String value();
 
     /**
      * The <b>name</b> of the setter method, must have the same owner (be in the same class) as the getter method

src/api/java/io/github/notstirred/dasm/api/annotations/redirect/redirects/MethodRedirect.java

@@ -2,7 +2,6 @@
 
 import io.github.notstirred.dasm.api.annotations.redirect.sets.InterOwnerContainer;
 import io.github.notstirred.dasm.api.annotations.redirect.sets.IntraOwnerContainer;
-import io.github.notstirred.dasm.api.annotations.selector.MethodSig;
 import io.github.notstirred.dasm.api.annotations.selector.Ref;
 
 import java.lang.annotation.Retention;
@@ -27,14 +26,14 @@
  * <h3>E1:</h3>
  * Specifies a {@code private String} method with the name {@code existingMethodName}, and the new name {@code newMethodName}
  * <pre>{@code
- *     @MethodRedirect(@MethodSig(name = "existingMethodName", args = { }, ret = @Ref(String.class)))
+ *     @MethodRedirect("existingMethodName()Ljava/lang/String;")
  *     private native String newMethodName();
  * }</pre><br/>
  * <h3>E2:</h3>
  * Specifies a {@code private String} method with the name {@code existingMethodName}, and the new name {@code newMethodName}.<br/>
  * Additionally an optional mappings owner is specified, see: {@link MethodRedirect#mappingsOwner()}.
  * <pre>{@code
- *     @MethodRedirect(name = "existingMethodName", mappingsOwner = @Ref(OtherClass.class))
+ *     @MethodRedirect(value = "existingMethodName()Ljava/lang/String;", mappingsOwner = @Ref(OtherClass.class))
  *     private native String newMethodName();
  * }</pre>
  */
@@ -44,7 +43,7 @@
     /**
      * The method to replace
      */
-    MethodSig value();
+    String value();
 
     /**
      * The source method's mapping owner.