Merge branch 'master' into genericsTake2

Author: LadyCailin

src/main/java/com/laytonsmith/core/compiler/ProcedureDefinition.java

@@ -3,6 +3,7 @@
 import com.laytonsmith.PureUtilities.Version;
 import com.laytonsmith.core.ParseTree;
 import com.laytonsmith.core.constructs.CClassType;
+import com.laytonsmith.core.constructs.generics.GenericParameters;
 import com.laytonsmith.core.constructs.Construct;
 import com.laytonsmith.core.constructs.DocComment;
 import com.laytonsmith.core.constructs.Target;

src/main/java/com/laytonsmith/core/exceptions/CRE/CREGenericConstraintException.java

@@ -50,5 +50,6 @@ public CClassType[] getInterfaces() {
 	public GenericParameters getGenericParameters() {
 		return null;
 	}
+
 }
 

src/main/java/com/laytonsmith/core/natives/interfaces/ArrayAccessSetRunner.java

@@ -37,4 +37,9 @@ public CClassType[] getSuperclasses() {
 	public CClassType[] getInterfaces() {
 		return CClassType.EMPTY_CLASS_ARRAY;
 	}
+
+	@Override
+	public GenericParameters getGenericParameters() {
+		return null;
+	}
 }

src/main/java/com/laytonsmith/core/natives/interfaces/MatrixRunner.java

@@ -40,4 +40,9 @@ public CClassType[] getSuperclasses() {
 	public CClassType[] getInterfaces() {
 		return CClassType.EMPTY_CLASS_ARRAY;
 	}
+
+	@Override
+	public GenericParameters getGenericParameters() {
+		return null;
+	}
 }