summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/java/com/jogamp/gluegen/JavaConfiguration.java134
-rw-r--r--src/java/com/jogamp/gluegen/JavaEmitter.java14
2 files changed, 83 insertions, 65 deletions
diff --git a/src/java/com/jogamp/gluegen/JavaConfiguration.java b/src/java/com/jogamp/gluegen/JavaConfiguration.java
index 8f27f69..32fb5cd 100644
--- a/src/java/com/jogamp/gluegen/JavaConfiguration.java
+++ b/src/java/com/jogamp/gluegen/JavaConfiguration.java
@@ -562,17 +562,6 @@ public class JavaConfiguration {
return forceUseNIODirectOnly4All || useNIODirectOnly.contains(functionName);
}
- /** Returns true if the glue code for the given function will be
- manually implemented by the end user.
- * <p>
- * If symbol references a struct field or method, see {@link #canonicalStructFieldSymbol(String, String)},
- * it describes field's array-length or element-count referenced by a pointer.
- * </p>
- */
- public boolean manuallyImplement(final String functionName) {
- return manuallyImplement.contains(functionName);
- }
-
/**
* Returns true if the static initialization java code calling <code>initializeImpl()</code>
* for the given class will be manually implemented by the end user
@@ -786,51 +775,6 @@ public class JavaConfiguration {
}
}
- /**
- * Returns the canonical configuration name for a struct field name,
- * i.e. 'struct-name'.'field-name'
- */
- public static String canonicalStructFieldSymbol(final String structName, final String fieldName) {
- return structName+"."+fieldName;
- }
-
- /**
- * Returns true if the given struct, or field within a struct
- * should be ignored during glue code generation of interfaces and implementation.
- * For other types, use {@link #shouldIgnoreInInterface(AliasedSymbol)}.
- * <p>
- * This method only considers the {@link AliasedSymbol#getName() current-name}
- * of the given symbol, i.e. does not test the {@link #getJavaSymbolRename(String) renamed-symbol}.
- * </p>
- * <p>
- * For struct fields see {@link #canonicalStructFieldSymbol(String, String)}.
- * </p>
- * <p>
- * Implementation calls {@link #shouldIgnoreInInterface(AliasedSymbol)}
- * </p>
- * @param symbol the symbolic name to check for exclusion
- *
- */
- public final boolean shouldIgnoreInInterface(final String symbol) {
- return shouldIgnoreInInterface( new AliasedSymbol.NoneAliasedSymbol(symbol) );
- }
- /**
- * Returns true if this aliased symbol should be ignored
- * during glue code generation of interfaces and implementation.
- * <p>
- * Both, the {@link AliasedSymbol#getName() current-name}
- * and all {@link AliasedSymbol#getAliasedNames() aliases} shall be considered.
- * </p>
- * <p>
- * Implementation calls {@link #shouldIgnoreInInterface_Int(AliasedSymbol)}
- * and overriding implementations shall ensure its being called as well!
- * </p>
- * @param symbol the symbolic aliased name to check for exclusion
- */
- public boolean shouldIgnoreInInterface(final AliasedSymbol symbol) {
- return shouldIgnoreInInterface_Int(symbol);
- }
-
public static <K,V> V oneInMap(final Map<K, V> map, final Set<K> symbols) {
if( null != map && map.size() > 0 &&
null != symbols && symbols.size() > 0 ) {
@@ -873,6 +817,80 @@ public class JavaConfiguration {
}
}
+ /**
+ * Returns the canonical configuration name for a struct field name,
+ * i.e. 'struct-name'.'field-name'
+ */
+ public static String canonicalStructFieldSymbol(final String structName, final String fieldName) {
+ return structName+"."+fieldName;
+ }
+
+ /**
+ * Variant of {@link #manuallyImplement(AliasedSymbol)},
+ * where this method only considers the {@link AliasedSymbol#getName() current-name}
+ * of the given symbol, not the {@link #getJavaSymbolRename(String) renamed-symbol}.
+ */
+ public boolean manuallyImplement(final String functionName) {
+ if( manuallyImplement.contains(functionName) ) {
+ LOG.log(INFO, "ManuallyImplement: \"{0}\"", functionName);
+ return true;
+ } else {
+ return false;
+ }
+ }
+
+ /**
+ * Returns true if the glue code for the given aliased function will be
+ * manually implemented by the end user.
+ * <p>
+ * Both, the {@link AliasedSymbol#getName() current-name}
+ * and all {@link AliasedSymbol#getAliasedNames() aliases} shall be considered.
+ * </p>
+ * <p>
+ * If symbol references a struct field or method, see {@link #canonicalStructFieldSymbol(String, String)},
+ * it describes field's array-length or element-count referenced by a pointer.
+ * </p>
+ * @see #manuallyImplement(String)
+ */
+ public boolean manuallyImplement(final AliasedSymbol symbol) {
+ final String name = symbol.getName();
+ final Set<String> aliases = symbol.getAliasedNames();
+
+ if ( manuallyImplement.contains( name ) ||
+ oneInSet(manuallyImplement, aliases)
+ )
+ {
+ LOG.log(INFO, getASTLocusTag(symbol), "ManuallyImplement: {0}", symbol.getAliasedString());
+ return true;
+ } else {
+ return false;
+ }
+ }
+
+ /**
+ * Variant of {@link #shouldIgnoreInInterface(AliasedSymbol)},
+ * where this method only considers the {@link AliasedSymbol#getName() current-name}
+ * of the given symbol, not the {@link #getJavaSymbolRename(String) renamed-symbol}.
+ */
+ public final boolean shouldIgnoreInInterface(final String symbol) {
+ return shouldIgnoreInInterface( new AliasedSymbol.NoneAliasedSymbol(symbol) );
+ }
+ /**
+ * Returns true if this aliased symbol should be ignored
+ * during glue code generation of interfaces and implementation.
+ * <p>
+ * Both, the {@link AliasedSymbol#getName() current-name}
+ * and all {@link AliasedSymbol#getAliasedNames() aliases} shall be considered.
+ * </p>
+ * <p>
+ * Implementation calls {@link #shouldIgnoreInInterface_Int(AliasedSymbol)}
+ * and overriding implementations shall ensure its being called as well!
+ * </p>
+ * @param symbol the symbolic aliased name to check for exclusion
+ */
+ public boolean shouldIgnoreInInterface(final AliasedSymbol symbol) {
+ return shouldIgnoreInInterface_Int(symbol);
+ }
protected final boolean shouldIgnoreInInterface_Int(final AliasedSymbol symbol) {
if( GlueGen.debug() ) {
@@ -1236,9 +1254,7 @@ public class JavaConfiguration {
readParentClass(tok, filename, lineNo);
} else if (cmd.equalsIgnoreCase("RenameJavaType")) {
readRenameJavaType(tok, filename, lineNo);
- } else if (cmd.equalsIgnoreCase("RenameJavaSymbol") ||
- // Backward compatibility
- cmd.equalsIgnoreCase("RenameJavaMethod")) {
+ } else if (cmd.equalsIgnoreCase("RenameJavaSymbol")) {
readRenameJavaSymbol(tok, filename, lineNo);
} else if (cmd.equalsIgnoreCase("RuntimeExceptionType")) {
runtimeExceptionType = readString("RuntimeExceptionType", tok, filename, lineNo);
diff --git a/src/java/com/jogamp/gluegen/JavaEmitter.java b/src/java/com/jogamp/gluegen/JavaEmitter.java
index a829419..933e35e 100644
--- a/src/java/com/jogamp/gluegen/JavaEmitter.java
+++ b/src/java/com/jogamp/gluegen/JavaEmitter.java
@@ -558,7 +558,8 @@ public class JavaEmitter implements GlueEmitter {
* outgoing arguments).
*/
protected void generatePublicEmitters(final MethodBinding binding, final List<FunctionEmitter> allEmitters, final boolean signatureOnly) {
- if (cfg.manuallyImplement(binding.getName()) && !signatureOnly) {
+ final FunctionSymbol cSymbol = binding.getCSymbol();
+ if ( !signatureOnly && cfg.manuallyImplement(cSymbol) ) {
// We only generate signatures for manually-implemented methods;
// user provides the implementation
return;
@@ -575,7 +576,7 @@ public class JavaEmitter implements GlueEmitter {
// It's possible we may not need a body even if signatureOnly is
// set to false; for example, if the routine doesn't take any
// arrays or buffers as arguments
- final boolean isUnimplemented = cfg.isUnimplemented(binding.getCSymbol());
+ final boolean isUnimplemented = cfg.isUnimplemented(cSymbol);
final List<String> prologue = cfg.javaPrologueForMethod(binding, false, false);
final List<String> epilogue = cfg.javaEpilogueForMethod(binding, false, false);
final boolean needsBody = isUnimplemented ||
@@ -587,7 +588,7 @@ public class JavaEmitter implements GlueEmitter {
if( !requiresStaticInitialization ) {
requiresStaticInitialization = binding.signatureRequiresStaticInitialization();
if( requiresStaticInitialization ) {
- LOG.log(INFO, binding.getCSymbol().getASTLocusTag(), "StaticInit Trigger.1 \"{0}\"", binding);
+ LOG.log(INFO, cSymbol.getASTLocusTag(), "StaticInit Trigger.1 \"{0}\"", binding);
}
}
@@ -636,7 +637,8 @@ public class JavaEmitter implements GlueEmitter {
*/
protected void generatePrivateEmitters(final MethodBinding binding,
final List<FunctionEmitter> allEmitters) {
- if (cfg.manuallyImplement(binding.getName())) {
+ final FunctionSymbol cSymbol = binding.getCSymbol();
+ if (cfg.manuallyImplement(cSymbol)) {
// Don't produce emitters for the implementation class
return;
}
@@ -645,11 +647,11 @@ public class JavaEmitter implements GlueEmitter {
cfg.javaPrologueForMethod(binding, false, false) != null ||
cfg.javaEpilogueForMethod(binding, false, false) != null ;
- if ( !cfg.isUnimplemented( binding.getCSymbol() ) ) {
+ if ( !cfg.isUnimplemented( cSymbol ) ) {
if( !requiresStaticInitialization ) {
requiresStaticInitialization = binding.signatureRequiresStaticInitialization();
if( requiresStaticInitialization ) {
- LOG.log(INFO, binding.getCSymbol().getASTLocusTag(), "StaticInit Trigger.2 \"{0}\"", binding);
+ LOG.log(INFO, cSymbol.getASTLocusTag(), "StaticInit Trigger.2 \"{0}\"", binding);
}
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-28 14:51:48 +0000