Regenerate Sources

Author: Morgoth398

natives/clang.dll

@@ -12,8 +12,8 @@
 //import org.lwjgl.llvm.ClangIndex;
 //
 //import volucris.bindings.generator.generation.Generator;
-//import volucris.bindings.generator.parsing.FunctionPointer;
 //import volucris.bindings.generator.parsing.HeaderFile;
+//import volucris.bindings.generator.parsing.NativeFunctionPointer;
 //
 //public class Box2DGeneration {
 //
@@ -45,9 +45,10 @@
 //			e.printStackTrace();
 //		}
 //		
-//		Map<String, FunctionPointer> functionPointers = new HashMap<>();
-//		headerFile.getStruct("b2DebugDraw").getFunctionPointers().forEach(f -> {
-//			functionPointers.put(f.getName(), f);
+//		Map<String, NativeFunctionPointer> functionPointers = new HashMap<>();
+//		headerFile.getRecord("b2DebugDraw").getFunctionPointerFields().forEach(f -> {
+//			NativeFunctionPointer functionPointer = f.getFunctionPointer();
+//			functionPointers.put(functionPointer.getName(), functionPointer);
 //		});
 //		
 //		generator.generateCallbacks("src/main/resources/callbacksConfig/callbacksConfig.yaml", functionPointers);

src/main/java/generation/Box2DGeneration.java

@@ -3,6 +3,7 @@
  */
 package volucris.bindings.box2d;
 
+import edu.umd.cs.findbugs.annotations.Nullable;
 import java.lang.foreign.Arena;
 import java.lang.foreign.FunctionDescriptor;
 import java.lang.foreign.Linker;
@@ -11,13 +12,19 @@
 import java.lang.invoke.MethodHandles;
 import java.lang.ref.WeakReference;
 import java.util.HashMap;
+import java.util.Map;
 
 import static java.lang.foreign.ValueLayout.*;
 import static volucris.bindings.core.FFMUtils.*;
 
+/// ```
+/// Prototype for user allocation function
+/// @param size the allocation size in bytes
+/// @param alignment the required alignment, guaranteed to be a power of 2
+/// ```
 public abstract class AllocFcn {
 
-    private static final HashMap<Long, WeakReference<AllocFcn>> CACHE;
+    private static final Map<Long, WeakReference<AllocFcn>> CACHE;
 
     public static final FunctionDescriptor DESCRIPTION;
     public static final MethodHandle HANDLE;
@@ -51,7 +58,7 @@ public AllocFcn(Arena arena) {
     }
 
     public MemorySegment invoke(
-        int size, 
+        int size,
         int alignment
     ) {
         throw new UnsupportedOperationException(
@@ -63,7 +70,7 @@ public MemorySegment memorySegment() {
         return segment;
     }
 
-    public static AllocFcn get(MemorySegment segment) {
+    public static @Nullable AllocFcn get(MemorySegment segment) {
         WeakReference<AllocFcn> reference = CACHE.get(segment.address());
 
         if (reference == null)

src/main/java/volucris/bindings/box2d/AllocFcn.java

@@ -3,6 +3,7 @@
  */
 package volucris.bindings.box2d;
 
+import edu.umd.cs.findbugs.annotations.Nullable;
 import java.lang.foreign.Arena;
 import java.lang.foreign.FunctionDescriptor;
 import java.lang.foreign.Linker;
@@ -11,14 +12,18 @@
 import java.lang.invoke.MethodHandles;
 import java.lang.ref.WeakReference;
 import java.util.HashMap;
+import java.util.Map;
 import volucris.bindings.core.NativeByteArray;
 
 import static java.lang.foreign.ValueLayout.*;
 import static volucris.bindings.core.FFMUtils.*;
 
+/// ```
+/// Prototype for the user assert callback. Return 0 to skip the debugger break.
+/// ```
 public abstract class AssertFcn {
 
-    private static final HashMap<Long, WeakReference<AssertFcn>> CACHE;
+    private static final Map<Long, WeakReference<AssertFcn>> CACHE;
 
     public static final FunctionDescriptor DESCRIPTION;
     public static final MethodHandle HANDLE;
@@ -53,33 +58,32 @@ public AssertFcn(Arena arena) {
     }
 
     public int invoke(
-        MemorySegment condition, 
-        MemorySegment fileName, 
+        MemorySegment condition,
+        MemorySegment fileName,
         int lineNumber
     ) {
-        return (int) invoke(
-            new NativeByteArray(condition), 
-            new NativeByteArray(fileName), 
-            lineNumber
+        return invoke(
+            new NativeByteArray(condition),
+            new NativeByteArray(fileName),
+		    lineNumber
         );
     }
 
     public int invoke(
-        NativeByteArray condition, 
-        NativeByteArray fileName, 
+        NativeByteArray condition,
+        NativeByteArray fileName,
         int lineNumber
     ) {
         throw new UnsupportedOperationException(
             "Override either the typed or raw callback method in AssertFcn."
         );
     };
 
-
     public MemorySegment memorySegment() {
         return segment;
     }
 
-    public static AssertFcn get(MemorySegment segment) {
+    public static @Nullable AssertFcn get(MemorySegment segment) {
         WeakReference<AssertFcn> reference = CACHE.get(segment.address());
 
         if (reference == null)

src/main/java/volucris/bindings/box2d/AssertFcn.java

@@ -3,6 +3,7 @@
  */
 package volucris.bindings.box2d;
 
+import edu.umd.cs.findbugs.annotations.Nullable;
 import java.lang.foreign.Arena;
 import java.lang.foreign.FunctionDescriptor;
 import java.lang.foreign.Linker;
@@ -11,13 +12,17 @@
 import java.lang.invoke.MethodHandles;
 import java.lang.ref.WeakReference;
 import java.util.HashMap;
+import java.util.Map;
 
-import static java.lang.foreign.ValueLayout.*;
 import static volucris.bindings.core.FFMUtils.*;
 
+/// ```
+/// Prototype for user free function
+/// @param mem the memory previously allocated through `b2AllocFcn`
+/// ```
 public abstract class FreeFcn {
 
-    private static final HashMap<Long, WeakReference<FreeFcn>> CACHE;
+    private static final Map<Long, WeakReference<FreeFcn>> CACHE;
 
     public static final FunctionDescriptor DESCRIPTION;
     public static final MethodHandle HANDLE;
@@ -60,7 +65,7 @@ public MemorySegment memorySegment() {
         return segment;
     }
 
-    public static FreeFcn get(MemorySegment segment) {
+    public static @Nullable FreeFcn get(MemorySegment segment) {
         WeakReference<FreeFcn> reference = CACHE.get(segment.address());
 
         if (reference == null)