Cherry-pick select changes from genericsTake2

Author: LadyCailin

src/main/java/com/laytonsmith/abstraction/enums/MCTagType.java

@@ -68,7 +68,7 @@ public enum MCTagType {
 				return ints;
 			},
 			(int[] array) -> {
-				CArray r = new CArray(Target.UNKNOWN);
+				CArray r = new CArray(Target.UNKNOWN, null, null);
 				for(int i : array) {
 					r.push(new CInt(i, Target.UNKNOWN), Target.UNKNOWN, null);
 				}
@@ -91,7 +91,7 @@ public enum MCTagType {
 				return longs;
 			},
 			(long[] array) -> {
-				CArray ret = new CArray(Target.UNKNOWN);
+				CArray ret = new CArray(Target.UNKNOWN, null, null);
 				for(long i : array) {
 					ret.push(new CInt(i, Target.UNKNOWN), Target.UNKNOWN, null);
 				}

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

@@ -87,10 +87,10 @@ public static String optimize(String script, Environment env,
 	}
 
 	private static String optimize0(ParseTree node, Environment env) {
-		if(node.getData() instanceof CFunction) {
+		if(node.getData() instanceof CFunction cFunction) {
 			StringBuilder b = new StringBuilder();
 			boolean first = true;
-			b.append(((CFunction) node.getData()).val()).append("(");
+			b.append(cFunction.val()).append("(");
 			for(ParseTree child : node.getChildren()) {
 				if(!first) {
 					b.append(",");
@@ -105,26 +105,26 @@ private static String optimize0(ParseTree node, Environment env) {
 			return new StringBuilder().append("'").append(node.getData().val()
 					.replace("\\", "\\\\").replace("\t", "\\t").replace("\n", "\\n")
 					.replace("'", "\\'")).append("'").toString();
-		} else if(node.getData() instanceof IVariable) {
-			return ((IVariable) node.getData()).getVariableName();
-		} else if(node.getData() instanceof Variable) {
-			return ((Variable) node.getData()).getVariableName();
+		} else if(node.getData() instanceof IVariable iVariable) {
+			return iVariable.getVariableName();
+		} else if(node.getData() instanceof Variable variable) {
+			return variable.getVariableName();
 		} else if(node.getData() instanceof CSlice) {
 			return node.getData().val();
-		} else if(node.getData().isInstanceOf(CArray.TYPE, null, env)) {
+		} else if(node.getData() instanceof CArray cArray) {
 			//It's a hardcoded array. This only happens in the course of optimization, if
 			//the optimizer adds a new array. We still need to handle it appropriately though.
 			//The values in the array will be constant, guaranteed.
 			StringBuilder b = new StringBuilder();
 			b.append("array(");
 			boolean first = true;
-			CArray n = (CArray) node.getData();
+			CArray n = cArray;
 			for(String key : n.stringKeySet()) {
 				if(!first) {
 					b.append(",");
 				}
 				first = false;
-				b.append(optimize0(new ParseTree(n.get(key, Target.UNKNOWN), node.getFileOptions(), true), env));
+				b.append(optimize0(new ParseTree(n.get(key, Target.UNKNOWN, null), node.getFileOptions(), true), env));
 			}
 			b.append(")");
 			return b.toString();

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

@@ -3,10 +3,10 @@
 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;
+import com.laytonsmith.core.constructs.generics.GenericParameters;
 import com.laytonsmith.core.environments.Environment;
 import com.laytonsmith.core.natives.interfaces.Mixed;
 import com.laytonsmith.core.objects.ObjectType;
@@ -73,4 +73,5 @@ public ObjectType getObjectType() {
 	public GenericParameters getGenericParameters() {
 		return null;
 	}
+
 }

src/main/java/com/laytonsmith/core/compiler/analysis/Scope.java

@@ -6,6 +6,7 @@
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 import java.util.Stack;
 
@@ -43,6 +44,10 @@ private Scope(Scope parent) {
 
 	private Scope(Set<Scope> parents, Map<Namespace, Set<Scope>> specificParents,
 			Map<Namespace, Map<String, Declaration>> declarations, Map<Namespace, Set<Reference>> references) {
+		Objects.requireNonNull(parents);
+		for(Scope s : parents) {
+			Objects.requireNonNull(s, "The set of parent scopes may not contain null values.");
+		}
 		this.parents = parents;
 		this.specificParents = specificParents;
 		this.declarations = declarations;

src/main/java/com/laytonsmith/core/constructs/generics/GenericParameters.java

@@ -176,7 +176,7 @@ public GenericParameters buildWithoutValidation() {
 
 	/**
 	 * Begins construction of a new GenericParameters object, which represents the RHS of the generic declaration.The
-	 * actual GenericDeclaration object is passed in in order to validate the types against the constraints.Each
+	 * actual GenericDeclaration object is passed in in order to validate the types against the constraints. Each
 	 * instance of a class which has a GenericDeclaration will have one of these objects in it, associated with that
 	 * particular instance. This data is not lost after compilation, and types are reified for runtime use.
 	 * <p>