Merge remote-tracking branch 'jared/development' into genericParams

CodeModel/src/main/java/org/openzen/zenscript/codemodel/type/DefinitionTypeID.java

@@ -5,14 +5,8 @@
  */
 package org.openzen.zenscript.codemodel.type;
 
-import org.openzen.zenscript.codemodel.GenericName;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
 import org.openzen.zenscript.codemodel.GenericMapper;
+import org.openzen.zenscript.codemodel.GenericName;
 import org.openzen.zenscript.codemodel.HighLevelDefinition;
 import org.openzen.zenscript.codemodel.definition.AliasDefinition;
 import org.openzen.zenscript.codemodel.definition.EnumDefinition;
@@ -21,6 +15,13 @@ import org.openzen.zenscript.codemodel.definition.VariantDefinition;
 import org.openzen.zenscript.codemodel.generic.TypeParameter;
 import org.openzen.zenscript.codemodel.type.storage.StorageTag;
 
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+
 /**
  *
  * @author Hoofdgebruiker
@@ -42,7 +43,7 @@ public class DefinitionTypeID implements TypeID {
 		if (typeArguments == null)
 			throw new NullPointerException("typeParameters cannot be null");
 		if (typeArguments.length != definition.getNumberOfGenericParameters())
-			throw new IllegalArgumentException("Wrong number of type parameters!");
+			throw new IllegalArgumentException("Wrong number of type parameters! " + definition.name + " expected: " + definition.getNumberOfGenericParameters() + " got: " + typeArguments.length);
 		if (definition.isInnerDefinition() && !definition.isStatic() && outer == null)
 			throw new IllegalArgumentException("Inner definition requires outer instance");
 		if ((!definition.isInnerDefinition() || definition.isStatic()) && outer != null)

JavaBytecodeCompiler/build.gradle

@@ -14,7 +14,8 @@ if (!hasProperty('mainClass')) {
 }
 
 dependencies {
-	compile 'org.ow2.asm:asm-debug-all:6.0_BETA'
-	compile project(':CodeModel')
+    compile group: 'org.ow2.asm', name: 'asm', version: '7.2'
+    compile group: 'org.ow2.asm', name: 'asm-commons', version: '7.2'
+    compile project(':CodeModel')
 	compile project(':JavaShared')
 }

JavaIntegration/src/main/java/org/openzen/zencode/java/JavaNativeModule.java

@@ -274,7 +274,7 @@ public class JavaNativeModule {
 				} else if (specifiedName.indexOf('.') >= 0) {
 					if (!specifiedName.startsWith(pkg.fullName))
 						throw new IllegalArgumentException("Specified @Name as \"" + specifiedName + "\" for class: \"" + cls
-								.toString() + "\" but it's not in the module root package");
+								.toString() + "\" but it's not in the module root package: \"" + pkg.fullName + "\"");
 
 					classPkg = getPackage(basePackage + specifiedName.substring(pkg.fullName.length()));
 					className = specifiedName.substring(specifiedName.lastIndexOf('.') + 1);
@@ -306,9 +306,8 @@ public class JavaNativeModule {
 
 		//TypeVariableContext context = new TypeVariableContext();
 		TypeVariable<Class<T>>[] javaTypeParameters = cls.getTypeParameters();
-		TypeParameter[] typeParameters = new TypeParameter[cls.getTypeParameters().length];
+        TypeParameter[] typeParameters = new TypeParameter[cls.getTypeParameters().length];
 		definition.typeParameters = typeParameters;
-
 		for (int i = 0; i < javaTypeParameters.length; i++) {
 			//Put up here for nested parameters?
 			TypeVariable<Class<T>> typeVariable = javaTypeParameters[i];
@@ -324,7 +323,7 @@ public class JavaNativeModule {
 				TypeID type = loadType(context, bound).type;
 				parameter.addBound(new ParameterTypeBound(CodePosition.NATIVE, type));
 			}
-			typeParameters[i] = parameter;
+            typeParameters[i] = parameter;
 		}
 
 		if (!foundRegistry && definition instanceof ClassDefinition && cls.getAnnotatedSuperclass() != null && shouldLoadType(cls.getAnnotatedSuperclass().getType())) {
@@ -343,7 +342,6 @@ public class JavaNativeModule {
 				compiled.setImplementationInfo(member, new JavaImplementation(true, javaClass));
 			}
 		}
-
 		compiled.setClassInfo(definition, javaClass);
 
 		StoredType thisType = new StoredType(registry.getForMyDefinition(definition), AutoStorageTag.INSTANCE);