Merge pull request #25 from Over-Run/update

Author: squid233

build.gradle.kts

@@ -93,6 +93,7 @@ allprojects {
         // add your dependencies
         compileOnly("org.jetbrains:annotations:25.0.0")
         testImplementation("org.junit.jupiter:junit-jupiter:$junitVersion")
+        testRuntimeOnly("org.junit.platform:junit-platform-launcher")
         testImplementation("io.github.over-run:platform:$platformVersion")
         api("io.github.over-run:memstack:$memstackVersion")
     }

gradle.properties

@@ -12,8 +12,8 @@ projGroupId=io.github.over-run
 projArtifactId=marshal
 # The project name should only contain lowercase letters, numbers and hyphen.
 projName=marshal
-projVersion=0.1.0-alpha.36-jdk23
-projDesc=Marshaler of native libraries
+projVersion=0.1.0-alpha.37-jdk23
+projDesc=Marshal allows you to conveniently create native library bindings with FFM API.
 # Uncomment them if you want to publish to maven repository.
 projUrl=https://github.com/Over-Run/marshal
 projLicenseUrl=https://raw.githubusercontent.com/Over-Run/marshal/main/LICENSE
@@ -34,6 +34,6 @@ jdkEnablePreview=true
 # Uncomment it if you need to use EA build of JDK.
 #jdkEarlyAccessDoc=jdk23
 
-junitVersion=5.11.0
+junitVersion=5.11.3
 memstackVersion=0.3.0
 platformVersion=1.0.0

src/main/java/overrun/marshal/CanonicalLayouts.java

@@ -125,7 +125,6 @@ private static void popStack(Throwable t) {
     /// @param ref           ref
     /// @param sized         sized
     /// @param charset       charset
-    /// @param canonicalType canonicalType
     /// @return the created [DowncallMethodParameter]
     public static DowncallMethodParameter createDowncallMethodParameter(
         MethodHandles.Lookup lookup,
@@ -135,10 +134,9 @@ public static DowncallMethodParameter createDowncallMethodParameter(
         boolean byValue,
         boolean ref,
         long sized,
-        String charset,
-        String canonicalType
+        String charset
     ) {
-        return new DowncallMethodParameter(parameterType, byValue, ref, sized, charset, canonicalType);
+        return new DowncallMethodParameter(parameterType, byValue, ref, sized, charset);
     }
 
     /// BSM for [DowncallMethodType]
@@ -152,7 +150,6 @@ public static DowncallMethodParameter createDowncallMethodParameter(
     /// @param criticalAllowHeapAccess criticalAllowHeapAccess
     /// @param sized                   sized
     /// @param charset                 charset
-    /// @param canonicalType           canonicalType
     /// @param args                    parameters
     /// @return the created [DowncallMethodType]
     public static DowncallMethodType createDowncallMethodType(
@@ -165,7 +162,6 @@ public static DowncallMethodType createDowncallMethodType(
         boolean criticalAllowHeapAccess,
         long sized,
         String charset,
-        String canonicalType,
         Object... args
     ) {
         return new DowncallMethodType(entrypoint,
@@ -175,8 +171,7 @@ public static DowncallMethodType createDowncallMethodType(
             critical,
             criticalAllowHeapAccess,
             sized,
-            charset,
-            canonicalType);
+            charset);
     }
 
     /// BSM for [ConvertedClassType]

src/main/java/overrun/marshal/DowncallFactory.java

@@ -30,7 +30,7 @@
  * @since 0.1.0
  */
 @Documented
-@Target(ElementType.TYPE_USE)
+@Target({ElementType.METHOD, ElementType.PARAMETER})
 @Retention(RetentionPolicy.SOURCE)
 public @interface CType {
     /**

src/main/java/overrun/marshal/gen/CType.java

@@ -31,37 +31,33 @@
 /// @param ref           `true` if returns from native function
 /// @param sized         value of [Sized]
 /// @param charset       value of [StrCharset]
-/// @param canonicalType value of [CanonicalType]
 /// @author squid233
 /// @since 0.1.0
 public record DowncallMethodParameter(
     ConvertedClassType type,
     boolean byValue,
     boolean ref,
     long sized,
-    String charset,
-    String canonicalType
+    String charset
 ) implements Constable {
     /// Creates a downcall method parameter from the given parameter.
     ///
     /// @param parameter the parameter
     /// @return the downcall method parameter
     public static DowncallMethodParameter of(Parameter parameter) {
-        CanonicalType anCanonicalType = parameter.getDeclaredAnnotation(CanonicalType.class);
         Sized anSized = parameter.getDeclaredAnnotation(Sized.class);
         StrCharset anStrCharset = parameter.getDeclaredAnnotation(StrCharset.class);
 
         return new DowncallMethodParameter(ConvertedClassType.parameterType(parameter),
             parameter.getDeclaredAnnotation(ByValue.class) != null,
             parameter.getDeclaredAnnotation(Ref.class) != null,
             anSized != null ? anSized.value() : -1,
-            anStrCharset != null ? anStrCharset.value() : null,
-            anCanonicalType != null ? anCanonicalType.value() : null);
+            anStrCharset != null ? anStrCharset.value() : null);
     }
 
     @Override
     public Optional<Desc> describeConstable() {
-        return Optional.of(new Desc(type.describeConstable().orElseThrow(), byValue, ref, sized, charset, canonicalType));
+        return Optional.of(new Desc(type.describeConstable().orElseThrow(), byValue, ref, sized, charset));
     }
 
     @Override
@@ -70,9 +66,6 @@ public String toString() {
         if (byValue) {
             sb.append("[ByValue]");
         }
-        if (canonicalType != null) {
-            sb.append("[CanonicalType=").append(canonicalType).append(']');
-        }
         if (ref) {
             sb.append("[Ref]");
         }
@@ -93,7 +86,6 @@ public static final class Desc extends DynamicConstantDesc<DowncallMethodParamet
         private final boolean ref;
         private final long sized;
         private final String charset;
-        private final String canonicalType;
 
         /// constructor
         ///
@@ -102,28 +94,25 @@ public static final class Desc extends DynamicConstantDesc<DowncallMethodParamet
         /// @param ref           ref
         /// @param sized         sized
         /// @param charset       charset
-        /// @param canonicalType canonicalType
-        public Desc(ConvertedClassType.Desc type, boolean byValue, boolean ref, long sized, String charset, String canonicalType) {
+        public Desc(ConvertedClassType.Desc type, boolean byValue, boolean ref, long sized, String charset) {
             super(Constants.BSM_DowncallFactory_createDowncallMethodParameter,
                 ConstantDescs.DEFAULT_NAME,
                 Constants.CD_DowncallMethodParameter,
                 type,
                 byValue ? ConstantDescs.TRUE : ConstantDescs.FALSE,
                 ref ? ConstantDescs.TRUE : ConstantDescs.FALSE,
                 sized,
-                charset != null ? charset : ConstantDescs.NULL,
-                canonicalType != null ? canonicalType : ConstantDescs.NULL);
+                charset != null ? charset : ConstantDescs.NULL);
             this.type = type;
             this.byValue = byValue;
             this.ref = ref;
             this.sized = sized;
             this.charset = charset;
-            this.canonicalType = canonicalType;
         }
 
         @Override
         public DowncallMethodParameter resolveConstantDesc(MethodHandles.Lookup lookup) throws ReflectiveOperationException {
-            return new DowncallMethodParameter(type.resolveConstantDesc(lookup), byValue, ref, sized, charset, canonicalType);
+            return new DowncallMethodParameter(type.resolveConstantDesc(lookup), byValue, ref, sized, charset);
         }
     }
 }