aboutsummaryrefslogtreecommitdiffstats
path: root/src/java/com
diff options
context:
space:
mode:
Diffstat (limited to 'src/java/com')
-rw-r--r--src/java/com/jogamp/gluegen/JavaType.java2
-rw-r--r--src/java/com/jogamp/gluegen/cgram/types/Type.java87
2 files changed, 48 insertions, 41 deletions
diff --git a/src/java/com/jogamp/gluegen/JavaType.java b/src/java/com/jogamp/gluegen/JavaType.java
index 2ea3b5f..c687031 100644
--- a/src/java/com/jogamp/gluegen/JavaType.java
+++ b/src/java/com/jogamp/gluegen/JavaType.java
@@ -571,7 +571,7 @@ public class JavaType {
append(sb, "C-Primitive-Pointer", prepComma); prepComma=true;
}
}
- append(sb, "], descriptor '"+getDescriptor()+"'", prepComma); prepComma=true;
+ append(sb, "], descriptor '"+getDescriptor()+"'", false); prepComma=true;
return sb;
}
diff --git a/src/java/com/jogamp/gluegen/cgram/types/Type.java b/src/java/com/jogamp/gluegen/cgram/types/Type.java
index 9c881c9..5906b19 100644
--- a/src/java/com/jogamp/gluegen/cgram/types/Type.java
+++ b/src/java/com/jogamp/gluegen/cgram/types/Type.java
@@ -196,7 +196,7 @@ public abstract class Type implements SemanticEqualityOp, ASTLocusTagProvider {
if( GlueGen.debug() ) {
sb.append(", o=0x"+Integer.toHexString(objHash()));
}
- sb.append(", size ");
+ sb.append(", size");
prepComma=true;
if( null != size ) {
final long mdSize;
@@ -227,46 +227,53 @@ public abstract class Type implements SemanticEqualityOp, ASTLocusTagProvider {
}
prepComma=true;
}
- if( isVolatile() ) {
- append(sb, "volatile ", prepComma); prepComma=true;
- }
- if( isPointer() ) {
- append(sb, "pointer*"+pointerDepth(), prepComma); prepComma=true;
- }
- if( isArray() ) {
- append(sb, "array*"+arrayDimension(), prepComma); prepComma=true;
- }
- if( isBit() ) {
- append(sb, "bit", prepComma); prepComma=true;
- }
- if( isCompound() ) {
- append(sb, "struct{", prepComma).append(asCompound().getStructName()).append(": ").append(asCompound().getNumFields());
- append(sb, "}", prepComma); prepComma=true;
- }
- if( isDouble() ) {
- append(sb, "double", prepComma); prepComma=true;
- }
- if( isEnum() ) {
- final EnumType eT = asEnum();
- append(sb, "enum ", prepComma).append(" [").append(eT.getUnderlyingType()).append("] {").append(eT.getNumEnumerates()).append(": ");
- eT.appendEnums(sb, false);
- prepComma=true;
- }
- if( isFloat() ) {
- append(sb, "float", prepComma); prepComma=true;
- }
- if( isFunction() ) {
- append(sb, "function", prepComma); prepComma=true;
- }
- if( isFunctionPointer() ) {
- append(sb, "funcPointer", prepComma); prepComma=true;
- }
- if( isInt() ) {
- append(sb, "int", prepComma); prepComma=true;
- }
- if( isVoid() ) {
- append(sb, "void", prepComma); prepComma=true;
+ append(sb, "is[", prepComma); prepComma=false;
+ {
+ if( isVolatile() ) {
+ append(sb, "volatile ", prepComma); prepComma=true;
+ }
+ if( isPrimitive() ) {
+ append(sb, "primitive", prepComma); prepComma=true;
+ }
+ if( isPointer() ) {
+ append(sb, "pointer*"+pointerDepth(), prepComma); prepComma=true;
+ }
+ if( isArray() ) {
+ append(sb, "array*"+arrayDimension(), prepComma); prepComma=true;
+ }
+ if( isBit() ) {
+ append(sb, "bit", prepComma); prepComma=true;
+ }
+ if( isCompound() ) {
+ append(sb, "struct{", prepComma).append(asCompound().getStructName()).append(": ").append(asCompound().getNumFields());
+ append(sb, "}", prepComma); prepComma=true;
+ }
+ if( isDouble() ) {
+ append(sb, "double", prepComma); prepComma=true;
+ }
+ if( isEnum() ) {
+ final EnumType eT = asEnum();
+ append(sb, "enum ", prepComma).append(" [").append(eT.getUnderlyingType()).append("] {").append(eT.getNumEnumerates()).append(": ");
+ eT.appendEnums(sb, false);
+ prepComma=true;
+ }
+ if( isFloat() ) {
+ append(sb, "float", prepComma); prepComma=true;
+ }
+ if( isFunction() ) {
+ append(sb, "function", prepComma); prepComma=true;
+ }
+ if( isFunctionPointer() ) {
+ append(sb, "funcPointer", prepComma); prepComma=true;
+ }
+ if( isInt() ) {
+ append(sb, "int", prepComma); prepComma=true;
+ }
+ if( isVoid() ) {
+ append(sb, "void", prepComma); prepComma=true;
+ }
}
+ append(sb, "]", false); prepComma=true;
}
return sb;
}