GlueGen FunctionType: Factor out getParameterList(..) from toString(..) and drop 'void' and use typedef-name; MethodBinding: Add getCParameterList(..) and getJavaParameterList(..) for general usage similar to FunctionType.getParameterList()

1 files changed, 62 insertions, 0 deletions

diff --git a/src/java/com/jogamp/gluegen/MethodBinding.java b/src/java/com/jogamp/gluegen/MethodBinding.java
index 21df415..44ed2e3 100644
--- a/src/java/com/jogamp/gluegen/MethodBinding.java
+++ b/src/java/com/jogamp/gluegen/MethodBinding.java
@@ -41,6 +41,7 @@
 package com.jogamp.gluegen;
 
 import com.jogamp.gluegen.cgram.types.FunctionSymbol;
+import com.jogamp.gluegen.cgram.types.FunctionType;
 import com.jogamp.gluegen.cgram.types.Type;
 
 import java.util.ArrayList;
@@ -154,6 +155,67 @@ public class MethodBinding {
         return sym.getArgumentType(i);
     }
 
+    /**
+     * Returns the function parameter list, i.e. a comma separated list of argument type and name.
+     * @param buf StringBuilder instance
+     * @param callingConvention optional calling-convention
+     * @return given StringBuilder instance
+     */
+    public StringBuilder getCParameterList(final StringBuilder buf, final String callingConvention) {
+        final int n = getNumArguments();
+        final boolean[] needsComma = { false };
+        for (int i = 0; i < n; i++) {
+            final Type t = getCArgumentType(i);
+            if( t.isVoid() ) {
+                // nop
+            } else if( t.isTypedef() ) {
+                CodeGenUtils.addParameterToList(buf, t.getName(), needsComma);
+                final String argumentName = getArgumentName(i);
+                if (argumentName != null) {
+                    buf.append(" ");
+                    buf.append(argumentName);
+                }
+            } else  if ( t.isFunctionPointer() ) {
+                final FunctionType ft = t.getTargetFunction();
+                CodeGenUtils.addParameterToList(buf, ft.toString(getArgumentName(i), callingConvention, false, true), needsComma);
+            } else if (t.isArray()) {
+                CodeGenUtils.addParameterToList(buf, t.asArray().toString(getArgumentName(i)), needsComma);
+            } else {
+                CodeGenUtils.addParameterToList(buf, t.getCName(true), needsComma);
+                final String argumentName = getArgumentName(i);
+                if (argumentName != null) {
+                    buf.append(" ");
+                    buf.append(argumentName);
+                }
+            }
+        }
+        return buf;
+    }
+
+    /**
+     * Returns the function parameter list, i.e. a comma separated list of argument type and name.
+     * @param buf StringBuilder instance
+     * @return given StringBuilder instance
+     */
+    public StringBuilder getJavaParameterList(final StringBuilder buf) {
+        final int n = getNumArguments();
+        final boolean[] needsComma = { false };
+        for (int i = 0; i < n; i++) {
+            final JavaType t = getJavaArgumentType(i);
+            if( t.isVoid() ) {
+                // nop
+            } else {
+                CodeGenUtils.addParameterToList(buf, t.getName(), needsComma);
+                final String argumentName = getArgumentName(i);
+                if (argumentName != null) {
+                    buf.append(" ");
+                    buf.append(argumentName);
+                }
+            }
+        }
+        return buf;
+    }
+
     public final boolean isReturnCompoundByValue() {
         final Type cReturnType = getCReturnType();
         if (cReturnType.isVoid()) {