Upgrade some call sites to non-deprecated versions

Author: LadyCailin

pom.xml

@@ -493,6 +493,8 @@
 					<compilerArgs>
 						<arg>-XDignore.symbol.file</arg>
 						<arg>-parameters</arg>
+						<arg>-Xmaxwarns</arg>
+						<arg>9999</arg>
 					</compilerArgs>
 				</configuration>
 			</plugin>

src/main/java/com/laytonsmith/core/ArgumentValidation.java

@@ -491,7 +491,7 @@ public static boolean getBooleanish(Mixed c, Target t, Environment env) {
 		if(InstanceofUtil.isInstanceof(c, Booleanish.class, env)) {
 			return ((Booleanish) c).getBooleanValue(t);
 		}
-		throw new CRECastException("Could not convert value of type " + c.typeof() + " to a " + Booleanish.TYPE, t);
+		throw new CRECastException("Could not convert value of type " + c.typeof(env) + " to a " + Booleanish.TYPE, t);
 	}
 
 	/**
@@ -516,15 +516,21 @@ public static CByteArray getByteArray(Mixed c, Target t, Environment env) {
 		} else if(c instanceof CNull) {
 			return new CByteArray(t, 0);
 		} else {
-			throw new CRECastException("Expecting byte array, but found " + c.typeof() + " instead.", t);
+			throw new CRECastException("Expecting byte array, but found " + c.typeof(env) + " instead.", t);
 		}
 	}
 
+	/** @deprecated Use {@link #getClassType(Mixed, Target, Environment)} instead. */
+	@Deprecated
 	public static CClassType getClassType(Mixed c, Target t) {
+		return getClassType(c, t, null);
+	}
+
+	public static CClassType getClassType(Mixed c, Target t, Environment env) {
 		if(c instanceof CClassType) {
 			return (CClassType) c;
 		} else {
-			throw new CRECastException("Expecting a ClassType, but found " + c.typeof() + " instead.", t);
+			throw new CRECastException("Expecting a ClassType, but found " + c.typeof(env) + " instead.", t);
 		}
 	}
 
@@ -559,7 +565,7 @@ public static String getStringObject(Mixed c, Target t) {
 	 */
 	public static String getStringObject(Mixed c, Target t, Environment env) {
 		if(!c.isInstanceOf(CString.class)) {
-			throw new CRECastException("Expected a string, but found " + c.typeof() + " instead.", t);
+			throw new CRECastException("Expected a string, but found " + c.typeof(env) + " instead.", t);
 		}
 		return c.val();
 	}

src/main/java/com/laytonsmith/core/ObjectGenerator.java

@@ -181,16 +181,22 @@ public CArray location(MCLocation l, boolean includeYawAndPitch) {
 		return ca;
 	}
 
+	/** @deprecated Use {@link #location(Mixed, MCWorld, Target, Environment)} instead. */
+	@Deprecated
+	public MCLocation location(Mixed c, MCWorld w, Target t) {
+		return location(c, w, t, null);
+	}
+
 	/**
 	 * Given a Location Object, returns a MCLocation. If the optional world is not specified in the object, the world
 	 * provided is used instead. Location "objects" are MethodScript arrays that represent a location in game. There are
 	 * 4 usages: <ul> <li>(x, y, z)</li> <li>(x, y, z, world)</li> <li>(x, y, z, yaw, pitch)</li> <li>(x, y, z, world,
 	 * yaw, pitch)</li> </ul> In all cases, the pitch and yaw default to 0, and the world defaults to the specified
 	 * world. <em>More conveniently: ([world], x, y, z, [yaw, pitch])</em>
 	 */
-	public MCLocation location(Mixed c, MCWorld w, Target t) {
+	public MCLocation location(Mixed c, MCWorld w, Target t, Environment env) {
 		if(!(c.isInstanceOf(CArray.TYPE))) {
-			throw new CREFormatException("Expecting an array, received " + c.typeof().getSimpleName(), t);
+			throw new CREFormatException("Expecting an array, received " + c.typeof(env).getSimpleName(), t);
 		}
 		CArray array = (CArray) c;
 		MCWorld world = w;
@@ -2063,6 +2069,12 @@ public Vector3D vector(Mixed c, Target t) {
 		return vector(Vector3D.ZERO, c, t);
 	}
 
+	/** @deprecated Use {@link #vector(Vector3D, Mixed, Target, Environment)} instead. */
+	@Deprecated
+	public Vector3D vector(Vector3D v, Mixed c, Target t) {
+		return vector(v, c, t, null);
+	}
+
 	/**
 	 * Modifies an existing vector using a given vector object. Because Vector3D is immutable, this method does not
 	 * actually modify the existing vector, but creates a new one.
@@ -2072,7 +2084,7 @@ public Vector3D vector(Mixed c, Target t) {
 	 * @param t the target
 	 * @return the Vector
 	 */
-	public Vector3D vector(Vector3D v, Mixed c, Target t) {
+	public Vector3D vector(Vector3D v, Mixed c, Target t, Environment env) {
 		if(c.isInstanceOf(CArray.TYPE)) {
 			CArray va = (CArray) c;
 			double x = v.X();
@@ -2107,7 +2119,7 @@ public Vector3D vector(Vector3D v, Mixed c, Target t) {
 			// fulfilling the todo?
 			return v;
 		} else {
-			throw new CREFormatException("Expecting an array, received " + c.typeof().getSimpleName(), t);
+			throw new CREFormatException("Expecting an array, received " + c.typeof(env).getSimpleName(), t);
 		}
 	}
 
@@ -2446,7 +2458,13 @@ public CArray fireworkEffect(MCFireworkEffect mcfe, Target t) {
 		return fe;
 	}
 
+	/** @deprecated Use {@link #fireworkEffect(CArray, Target, Environment)} instead. */
+	@Deprecated
 	public MCFireworkEffect fireworkEffect(CArray fe, Target t) {
+		return fireworkEffect(fe, t, null);
+	}
+
+	public MCFireworkEffect fireworkEffect(CArray fe, Target t, Environment env) {
 		MCFireworkBuilder builder = StaticLayer.GetConvertor().GetFireworkBuilder();
 		if(fe.containsKey("flicker")) {
 			builder.setFlicker(ArgumentValidation.getBoolean(fe.get("flicker", t), t));
@@ -2473,7 +2491,7 @@ public MCFireworkEffect fireworkEffect(CArray fe, Target t) {
 							break;
 						} else {
 							throw new CREFormatException("Expecting individual color to be an array or string, but found "
-									+ color.typeof(), t);
+									+ color.typeof(env), t);
 						}
 						builder.addColor(mccolor);
 					}
@@ -2489,7 +2507,7 @@ public MCFireworkEffect fireworkEffect(CArray fe, Target t) {
 				}
 			} else {
 				throw new CREFormatException("Expecting an array or string for colors parameter, but found "
-						+ colors.typeof(), t);
+						+ colors.typeof(env), t);
 			}
 		} else {
 			builder.addColor(MCColor.WHITE);
@@ -2510,7 +2528,7 @@ public MCFireworkEffect fireworkEffect(CArray fe, Target t) {
 						break;
 					} else {
 						throw new CREFormatException("Expecting individual color to be an array or string, but found "
-								+ color.typeof(), t);
+								+ color.typeof(env), t);
 					}
 					builder.addFadeColor(mccolor);
 				}
@@ -2521,7 +2539,7 @@ public MCFireworkEffect fireworkEffect(CArray fe, Target t) {
 				}
 			} else {
 				throw new CREFormatException("Expecting an array or string for fade parameter, but found "
-						+ colors.typeof(), t);
+						+ colors.typeof(env), t);
 			}
 		}
 		if(fe.containsKey("type")) {
@@ -2595,9 +2613,15 @@ public Construct recipe(MCRecipe r, Target t) {
 		return ret;
 	}
 
+	/** @deprecated Use {@link #recipe(Mixed, Target, Environment)} instead. */
+	@Deprecated
 	public MCRecipe recipe(Mixed c, Target t) {
+		return recipe(c, t, null);
+	}
+
+	public MCRecipe recipe(Mixed c, Target t, Environment env) {
 		if(!(c.isInstanceOf(CArray.TYPE))) {
-			throw new CRECastException("Expected array but received " + c.typeof().getSimpleName(), t);
+			throw new CRECastException("Expected array but received " + c.typeof(env).getSimpleName(), t);
 		}
 		CArray recipe = (CArray) c;
 

src/main/java/com/laytonsmith/core/Procedure.java

@@ -243,25 +243,25 @@ public Mixed execute(List<Mixed> args, Environment oldEnv, Target t) {
 
 				// Type check vararg parameter.
 				if(var.getDefinedType().isVariadicType()) {
-					if(InstanceofUtil.isInstanceof(c.typeof(), var.getDefinedType().getVarargsBaseType(), env)) {
+					if(InstanceofUtil.isInstanceof(c.typeof(env), var.getDefinedType().getVarargsBaseType(), env)) {
 						vararg.push(c, t);
 						continue;
 					} else {
 						throw new CRECastException("Procedure \"" + name + "\" expects a value of type "
 								+ var.getDefinedType().val() + " in argument " + (varInd + 1) + ", but"
-								+ " a value of type " + c.typeof() + " was found instead.", c.getTarget());
+								+ " a value of type " + c.typeof(env) + " was found instead.", c.getTarget());
 					}
 				}
 
 				// Type check non-vararg parameter.
-				if(InstanceofUtil.isInstanceof(c.typeof(), var.getDefinedType(), env)) {
+				if(InstanceofUtil.isInstanceof(c.typeof(env), var.getDefinedType(), env)) {
 					env.getEnv(GlobalEnv.class).GetVarList().set(new IVariable(var.getDefinedType(),
 							var.getVariableName(), c, c.getTarget()));
 					continue;
 				} else {
 					throw new CRECastException("Procedure \"" + name + "\" expects a value of type "
 							+ var.getDefinedType().val() + " in argument " + (varInd + 1) + ", but"
-							+ " a value of type " + c.typeof() + " was found instead.", c.getTarget());
+							+ " a value of type " + c.typeof(env) + " was found instead.", c.getTarget());
 				}
 			}
 		}
@@ -302,9 +302,9 @@ public Mixed execute(List<Mixed> args, Environment oldEnv, Target t) {
 			}
 			if(returnType.equals(CVoid.TYPE) != ret.equals(CVoid.VOID)
 					|| !ret.equals(CNull.NULL) && !ret.equals(CVoid.VOID)
-					&& !InstanceofUtil.isInstanceof(ret.typeof(), returnType, env)) {
+					&& !InstanceofUtil.isInstanceof(ret.typeof(env), returnType, env)) {
 				throw new CRECastException("Expected procedure \"" + name + "\" to return a value of type "
-						+ returnType.val() + " but a value of type " + ret.typeof() + " was returned instead",
+						+ returnType.val() + " but a value of type " + ret.typeof(env) + " was returned instead",
 						ret.getTarget());
 			}
 			return ret;

src/main/java/com/laytonsmith/core/Static.java

@@ -1485,6 +1485,12 @@ public static boolean InCmdLine(Environment environment, boolean defaultValue) {
 		return environment.getEnv(GlobalEnv.class).inCmdlineMode();
 	}
 
+	/** @deprecated Use {@link #AssertType(Class, Mixed[], int, Function, Target, Environment)} instead. */
+	@Deprecated
+	public static <T extends Mixed> T AssertType(Class<T> type, Mixed[] args, int argNumber, Function func, Target t) {
+		return AssertType(type, args, argNumber, func, t, null);
+	}
+
 	/**
 	 * This verifies that the type required is actually present, and returns the value, cast to the appropriate type,
 	 * or, if not the correct type, a CRE.
@@ -1497,15 +1503,16 @@ public static boolean InCmdLine(Environment environment, boolean defaultValue) {
 	 * @param args The array of arguments.
 	 * @param argNumber The argument number, used both for grabbing the correct argument from args, and building the
 	 * error message if the cast cannot occur.
-	 * @param func The function, in case this errors out, to build the error message.
+	 * @param func The function, in case this errors out,
+	 * @param envto build the error message.
 	 * @param t The code target
 	 * @return The value, cast to the desired type.
 	 */
-	public static <T extends Mixed> T AssertType(Class<T> type, Mixed[] args, int argNumber, Function func, Target t) {
+	public static <T extends Mixed> T AssertType(Class<T> type, Mixed[] args, int argNumber, Function func, Target t, Environment env) {
 		Mixed value = args[argNumber];
 		if(!type.isAssignableFrom(value.getClass())) {
 			typeof todesired = ClassDiscovery.GetClassAnnotation(type, typeof.class);
-			CClassType toactual = value.typeof();
+			CClassType toactual = value.typeof(env);
 			if(todesired != null) {
 				throw new CRECastException("Argument " + (argNumber + 1) + " of " + func.getName() + " was expected to be a "
 						+ todesired.value() + ", but " + toactual + " \"" + value.val() + "\" was found.", t);

src/main/java/com/laytonsmith/core/asm/LLVMArgumentValidation.java

@@ -200,7 +200,7 @@ public static String getValueFromConstant(IRBuilder builder, ParseTree data, Env
 	public static IRData getAny(IRBuilder builder, Environment env, ParseTree c, Target t) throws ConfigCompileException {
 		LLVMEnvironment e = env.getEnv(LLVMEnvironment.class);
 		if(c.isConst()) {
-			IRType datatype = convertCClassTypeToIRType(c.getData().typeof());
+			IRType datatype = convertCClassTypeToIRType(c.getData().typeof(env));
 			String data = getValueFromConstant(builder, c, env);
 			int alloca = e.getNewLocalVariableReference(datatype);
 			int load = e.getNewLocalVariableReference(datatype);

src/main/java/com/laytonsmith/core/asm/LLVMPlatformResolver.java

@@ -40,6 +40,6 @@ public static IRData outputConstant(IRBuilder builder, Mixed c, Environment env)
 			builder.appendLine(c.getTarget(), "%" + gep + " = getelementptr inbounds [" + length + " x i8], [" + length + " x i8]* %" + alloca + ", i64 0, i64 0");
 			return IRDataBuilder.setReturnVariable(gep, IRType.STRING);
 		}
-		throw new UnsupportedOperationException("Unsupported data type " + c.typeof().getName());
+		throw new UnsupportedOperationException("Unsupported data type " + c.typeof(env).getName());
 	}
 }

src/main/java/com/laytonsmith/core/constructs/CFixedArray.java

@@ -103,9 +103,9 @@ public Set<Mixed> keySet(Environment env) {
 		return set;
 	}
 
-	private void validateSet(Mixed value, Target t) {
-		if(!value.typeof().doesExtend(allowedType)) {
-			throw new CRECastException("Cannot set value of type " + value.typeof().toString() + " into fixed_array of type " + allowedType.toString(), t);
+	private void validateSet(Mixed value, Target t, Environment env) {
+		if(!value.typeof(env).doesExtend(allowedType)) {
+			throw new CRECastException("Cannot set value of type " + value.typeof(env).toString() + " into fixed_array of type " + allowedType.toString(), t);
 		}
 	}
 
@@ -119,11 +119,11 @@ public void set(Mixed index, Mixed value, Target t) {
 	@Override
 	public void set(Mixed index, Mixed value, Target t, Environment env) {
 		int in = ArgumentValidation.getInt32(index, t, env);
-		set(in, value, t);
+		set(in, value, t, env);
 	}
 
-	public void set(int index, Mixed value, Target t) {
-		validateSet(value, t);
+	public void set(int index, Mixed value, Target t, Environment env) {
+		validateSet(value, t, env);
 		if(index >= data.length || index < 0) {
 			throw new CREIndexOverflowException("Index under/overflow in fixed_array", t);
 		}
@@ -176,8 +176,8 @@ public long size(Environment env) {
 		return data.length;
 	}
 
-	public void fill(Mixed value, Target t) {
-		validateSet(value, t);
+	public void fill(Mixed value, Target t, Environment env) {
+		validateSet(value, t, env);
 		ArrayUtils.fill(data, value);
 	}
 

src/main/java/com/laytonsmith/core/constructs/CMutablePrimitive.java

@@ -126,7 +126,7 @@ public long size() {
 
 	@Override
 	public long size(Environment env) {
-		if(value.isInstanceOf(Sizeable.TYPE)) {
+		if(value.isInstanceOf(Sizeable.TYPE, null, env)) {
 			return ArgumentValidation.getObject(value, Target.UNKNOWN, Sizeable.class).size(env);
 		} else {
 			return 0;

src/main/java/com/laytonsmith/core/constructs/InstanceofUtil.java

@@ -75,7 +75,7 @@ public static boolean isInstanceof(Mixed value, FullyQualifiedClassName instance
 			// TODO: Need to put the return type here, so we can work with this, but for now, just always return false
 			return false;
 		}
-		return isInstanceof(value.typeof(), instanceofThis, env);
+		return isInstanceof(value.typeof(env), instanceofThis, env);
 	}
 
 	/**