michael/lwjgl
michael
/
lwjgl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Added friendly error message when a non-static inner class is registered with the transformer.

This commit is contained in:
Ioannis Tsakpinis 2011-07-12 19:29:15 +00:00
parent 1e108964cd
commit a75b1dde68
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/java/org/lwjgl/util/mapped/MappedForeach.java
View File

@ -40,8 +40,8 @@ import java.util.Iterator;
*/ */
public class MappedForeach<T extends MappedObject> implements Iterable<T> { public class MappedForeach<T extends MappedObject> implements Iterable<T> {
private final T mapped; final T mapped;
private final int elementCount; final int elementCount;
MappedForeach(T mapped, int elementCount) { MappedForeach(T mapped, int elementCount) {
this.mapped = mapped; this.mapped = mapped;

13
src/java/org/lwjgl/util/mapped/MappedObjectTransformer.java
View File

@ -36,7 +36,7 @@ public class MappedObjectTransformer {
static final boolean PRINT_ACTIVITY = false;//LWJGLUtil.DEBUG && LWJGLUtil.getPrivilegedBoolean("org.lwjgl.util.mapped.PrintActivity"); static final boolean PRINT_ACTIVITY = false;//LWJGLUtil.DEBUG && LWJGLUtil.getPrivilegedBoolean("org.lwjgl.util.mapped.PrintActivity");
static final boolean PRINT_BYTECODE = false; //LWJGLUtil.DEBUG && LWJGLUtil.getPrivilegedBoolean("org.lwjgl.util.mapped.PrintBytecode"); static final boolean PRINT_BYTECODE = false; //LWJGLUtil.DEBUG && LWJGLUtil.getPrivilegedBoolean("org.lwjgl.util.mapped.PrintBytecode");
private static final Map<String, MappedSubtypeInfo> className_to_subtype; static final Map<String, MappedSubtypeInfo> className_to_subtype;
static { static {
className_to_subtype = new HashMap<String, MappedSubtypeInfo>(); className_to_subtype = new HashMap<String, MappedSubtypeInfo>();
@ -80,6 +80,9 @@ public class MappedObjectTransformer {
if ( mapped == null ) if ( mapped == null )
throw new InternalError("missing " + MappedType.class.getName() + " annotation"); throw new InternalError("missing " + MappedType.class.getName() + " annotation");
if ( type.getEnclosingClass() != null && !Modifier.isStatic(type.getModifiers()) )
throw new InternalError("only top-level or static inner classes are allowed");
String className = jvmClassName(type); String className = jvmClassName(type);
MappedSubtypeInfo mappedType = new MappedSubtypeInfo(className, mapped.sizeof(), mapped.align()); MappedSubtypeInfo mappedType = new MappedSubtypeInfo(className, mapped.sizeof(), mapped.align());
@ -88,7 +91,7 @@ public class MappedObjectTransformer {
for ( Field field : type.getDeclaredFields() ) { for ( Field field : type.getDeclaredFields() ) {
// static fields are never mapped // static fields are never mapped
if ( (field.getModifiers() & Modifier.STATIC) != 0 ) if ( Modifier.isStatic(field.getModifiers()) )
continue; continue;
// we only support primitives and ByteBuffers // we only support primitives and ByteBuffers
@ -135,7 +138,7 @@ public class MappedObjectTransformer {
} }
} }
private static final String view_constructor_method = "_construct_view_"; static final String view_constructor_method = "_construct_view_";
static byte[] transformFieldAccess(final String className, byte[] bytecode) { static byte[] transformFieldAccess(final String className, byte[] bytecode) {
int flags = 0;//ClassWriter.COMPUTE_FRAMES; int flags = 0;//ClassWriter.COMPUTE_FRAMES;
@ -525,7 +528,7 @@ public class MappedObjectTransformer {
} }
} }
private static void pushInt(MethodVisitor mv, int value) { static void pushInt(MethodVisitor mv, int value) {
if ( value == -1 ) if ( value == -1 )
mv.visitInsn(ICONST_M1); mv.visitInsn(ICONST_M1);
else if ( value == 0 ) else if ( value == 0 )
@ -548,7 +551,7 @@ public class MappedObjectTransformer {
mv.visitLdcInsn(Integer.valueOf(value)); mv.visitLdcInsn(Integer.valueOf(value));
} }
private static String jvmClassName(Class<?> type) { static String jvmClassName(Class<?> type) {
return type.getName().replace('.', '/'); return type.getName().replace('.', '/');
} }