Merge branch 'master' into genericsTake2

Author: LadyCailin

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

@@ -12,7 +12,6 @@
 import com.laytonsmith.core.environments.Environment;
 import com.laytonsmith.core.exceptions.CRE.CRECastException;
 import com.laytonsmith.core.exceptions.CRE.CREFormatException;
-import com.laytonsmith.core.environments.Environment;
 import com.laytonsmith.core.natives.interfaces.Mixed;
 
 import java.util.function.BiFunction;

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

@@ -558,7 +558,7 @@ public static CByteArray getByteArray(Mixed c, Target t, Environment env) {
 	public static LeftHandSideType getClassType(Mixed c, Target t) {
 		return getClassType(c, t, null);
 	}
-	
+
 	/**
 	 * Returns the LeftHandSideType from the given Construct. This accepts either a LeftHandSideType directly, or a
 	 * CClassType, which is converted to a LeftHandSideType.

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

@@ -1265,10 +1265,10 @@ public static List<Script> preprocess(TokenStream tokenStream,
 	 * Compiles the token stream into a valid ParseTree. This also includes optimization and reduction.
 	 *
 	 * @param stream The token stream, as generated by {@link #lex(String, Environment, File, boolean) lex}
-	 * @param environment If an environment is already set up, it can be passed in here. The code will tolerate a null
+	 * @param env If an environment is already set up, it can be passed in here. The code will tolerate a null
 	 * value, but if present, should be passed in. If the value is null, a standalone environment will be generated
 	 * and used.
-	 * @param envs The environments that are going to be present at runtime. Even if the {@code environment} parameter
+	 * @param envs The environments that are going to be present at runtime. Even if the {@code env} parameter
 	 * is null, this still must be non-null and populated with one or more values.
 	 * @return A fully compiled, optimized, and reduced parse tree. If {@code stream} is null or empty, null is
 	 * returned.
@@ -1278,20 +1278,20 @@ public static List<Script> preprocess(TokenStream tokenStream,
 	 * @throws com.laytonsmith.core.exceptions.ConfigCompileGroupException A ConfigCompileGroupException is just
 	 * a collection of single {@link ConfigCompileException}s.
 	 */
-	public static ParseTree compile(TokenStream stream, Environment environment,
+	public static ParseTree compile(TokenStream stream, Environment env,
 			Set<Class<? extends Environment.EnvironmentImpl>> envs) throws ConfigCompileException,
 			ConfigCompileGroupException {
-		return compile(stream, environment, envs, new StaticAnalysis(true));
+		return compile(stream, env, envs, new StaticAnalysis(true));
 	}
 
 	/**
 	 * Compiles the token stream into a valid ParseTree. This also includes optimization and reduction.
 	 *
 	 * @param stream The token stream, as generated by {@link #lex(String, Environment, File, boolean) lex}
-	 * @param environment If an environment is already set up, it can be passed in here. The code will tolerate a null
+	 * @param env If an environment is already set up, it can be passed in here. The code will tolerate a null
 	 * value, but if present, should be passed in. If the value is null, a standalone environment will be generated
 	 * and used.
-	 * @param envs The environments that are going to be present at runtime. Even if the {@code environment} parameter
+	 * @param envs The environments that are going to be present at runtime. Even if the {@code env} parameter
 	 * is null, this still must be non-null and populated with one or more values.
 	 * @param staticAnalysis The static analysis object, or {@code null} to not perform static analysis. This object
 	 * is used to perform static analysis on the AST that results from parsing, before any AST optimizations.
@@ -1304,22 +1304,22 @@ public static ParseTree compile(TokenStream stream, Environment environment,
 	 * @throws com.laytonsmith.core.exceptions.ConfigCompileGroupException A ConfigCompileGroupException is just
 	 * a collection of single {@link ConfigCompileException}s.
 	 */
-	public static ParseTree compile(TokenStream stream, Environment environment,
+	public static ParseTree compile(TokenStream stream, Environment env,
 			Set<Class<? extends Environment.EnvironmentImpl>> envs, StaticAnalysis staticAnalysis)
 			throws ConfigCompileException, ConfigCompileGroupException {
 		Objects.requireNonNull(envs, "envs parameter must not be null");
 		Objects.requireNonNull(staticAnalysis, "Static Analysis may be disabled, but cannot be null.");
 		try {
-			if(environment == null) {
+			if(env == null) {
 					// We MUST have a CompilerEnvironment. It doesn't need to be used, but we have to create it at
 					// this stage.
-					environment = Static.GenerateStandaloneEnvironment(false);
+					env = Static.GenerateStandaloneEnvironment(false);
 			}
-			if(!environment.hasEnv(CompilerEnvironment.class)) {
+			if(!env.hasEnv(CompilerEnvironment.class)) {
 				Environment e = Static.GenerateStandaloneEnvironment(false);
-				environment = environment.cloneAndAdd(e.getEnv(CompilerEnvironment.class));
+				env = env.cloneAndAdd(e.getEnv(CompilerEnvironment.class));
 			}
-			environment.getEnv(CompilerEnvironment.class).setStaticAnalysis(staticAnalysis);
+			env.getEnv(CompilerEnvironment.class).setStaticAnalysis(staticAnalysis);
 		} catch (IOException | DataSourceException | URISyntaxException | Profiles.InvalidProfileException ex) {
 			throw new RuntimeException(ex);
 		}
@@ -1328,7 +1328,7 @@ public static ParseTree compile(TokenStream stream, Environment environment,
 		// Return a null AST when the program is empty.
 		// Do run static analysis to allow for including this empty file in another file.
 		if(stream == null || stream.isEmpty()) {
-			staticAnalysis.analyze(null, environment, envs, compilerErrors);
+			staticAnalysis.analyze(null, env, envs, compilerErrors);
 			return null;
 		}
 
@@ -1348,7 +1348,7 @@ public static ParseTree compile(TokenStream stream, Environment environment,
 			}
 		}
 
-		processEarlyKeywords(stream, environment, compilerErrors);
+		processEarlyKeywords(stream, env, compilerErrors);
 		// All early keyword errors are handled, but then we halt compilation at this stage, since most
 		// further errors are likley meaningless.
 		if(!compilerErrors.isEmpty()) {
@@ -1493,7 +1493,7 @@ public static ParseTree compile(TokenStream stream, Environment environment,
 						myIndex.addChild(tree.getChildAt(j));
 					}
 				} else {
-					myIndex = new ParseTree(new CSlice("0..-1", t.target, environment), fileOptions, true);
+					myIndex = new ParseTree(new CSlice("0..-1", t.target, env), fileOptions, true);
 				}
 				tree.setChildren(tree.getChildren().subList(0, array));
 				ParseTree arrayGet = new ParseTree(new CFunction(array_get.NAME, t.target), fileOptions, true);
@@ -1547,7 +1547,7 @@ public static ParseTree compile(TokenStream stream, Environment environment,
 									+ " usage.";
 							CompilerWarning warning = new CompilerWarning(msg, t.target,
 									FileOptions.SuppressWarning.CodeUpgradeNotices);
-							environment.getEnv(CompilerEnvironment.class).addCodeUpgradeNotice(fileOptions, warning);
+							env.getEnv(CompilerEnvironment.class).addCodeUpgradeNotice(fileOptions, warning);
 						}
 					} catch (ConfigCompileException ex) {
 						// The function doesn't exist. It may be a compile error later (or maybe not, if it's
@@ -1576,7 +1576,7 @@ public static ParseTree compile(TokenStream stream, Environment environment,
 								+ " this warning will go away. If it is intended, move this parenthesis up to the same"
 								+ " line to actually execute it.", t.target,
 								SuppressWarning.PossibleUnexpectedExecution);
-						environment.getEnv(CompilerEnvironment.class).addCompilerWarning(fileOptions, warning);
+						env.getEnv(CompilerEnvironment.class).addCompilerWarning(fileOptions, warning);
 						f = new ParseTree(new CFunction(Compiler.__autoconcat__.NAME, unknown), fileOptions);
 					} else {
 						f = new ParseTree(new CFunction(Compiler.p.NAME, t.getTarget()), fileOptions);
@@ -1676,7 +1676,7 @@ public static ParseTree compile(TokenStream stream, Environment environment,
 							value = next1.val() + next2.val();
 							i++;
 						}
-						slice = new CSlice(".." + value, t.getTarget(), environment);
+						slice = new CSlice(".." + value, t.getTarget(), env);
 						i++;
 						tree.addChild(new ParseTree(slice, fileOptions));
 						constructCount.peek().incrementAndGet();
@@ -1699,7 +1699,7 @@ public static ParseTree compile(TokenStream stream, Environment environment,
 								value = next2.val() + next3.val();
 								i++;
 							}
-							slice = new CSlice(".." + value, next1.getTarget(), environment);
+							slice = new CSlice(".." + value, next1.getTarget(), env);
 							if(t.type.isKeyword()) {
 								tree.addChild(new ParseTree(new CKeyword(t.val(), t.getTarget()), fileOptions));
 								constructCount.peek().incrementAndGet();
@@ -1712,7 +1712,7 @@ public static ParseTree compile(TokenStream stream, Environment environment,
 								modifier = prev1.val();
 								tree.removeChildAt(tree.getChildren().size() - 1);
 							}
-							slice = new CSlice(modifier + t.value + "..", t.target, environment);
+							slice = new CSlice(modifier + t.value + "..", t.target, env);
 						} else {
 							//both are provided
 							String modifier1 = "";
@@ -1734,7 +1734,7 @@ public static ParseTree compile(TokenStream stream, Environment environment,
 								second = next3;
 								i++;
 							}
-							slice = new CSlice(modifier1 + first.value + ".." + modifier2 + second.value, t.target, environment);
+							slice = new CSlice(modifier1 + first.value + ".." + modifier2 + second.value, t.target, env);
 						}
 						i++;
 						tree.addChild(new ParseTree(slice, fileOptions));
@@ -1754,12 +1754,12 @@ public static ParseTree compile(TokenStream stream, Environment environment,
 				if(!(previous.getData() instanceof SourceType st)) {
 					throw new ConfigCompileException("Unexpected varargs token (\"...\"). This can only be used with types.", t.target);
 				}
-				previous.setData(st.asVariadicType(environment));
+				previous.setData(st.asVariadicType(env));
 				continue;
 			} else if(t.type == TType.LIT) {
 				Construct c;
 				try {
-					c = Static.resolveConstruct(t.val(), t.target, true, environment);
+					c = Static.resolveConstruct(t.val(), t.target, true, env);
 				} catch (ConfigRuntimeException ex) {
 					throw new ConfigCompileException(ex);
 				}
@@ -1805,7 +1805,7 @@ public static ParseTree compile(TokenStream stream, Environment environment,
 				tree.addChild(new ParseTree(new IVariable(t.val(), t.target), fileOptions));
 				constructCount.peek().incrementAndGet();
 			} else if(t.type.equals(TType.UNKNOWN)) {
-				tree.addChild(new ParseTree(Static.resolveConstruct(t.val(), t.target, environment), fileOptions));
+				tree.addChild(new ParseTree(Static.resolveConstruct(t.val(), t.target, env), fileOptions));
 				constructCount.peek().incrementAndGet();
 			} else if(t.type.isSymbol()) { //Logic and math symbols
 
@@ -1918,21 +1918,21 @@ public static ParseTree compile(TokenStream stream, Environment environment,
 		// Process the AST.
 		Stack<List<Procedure>> procs = new Stack<>();
 		procs.add(new ArrayList<>());
-		processKeywords(tree, environment, compilerErrors);
-		addSelfStatements(tree, environment, envs, compilerErrors);
-		rewriteAutoconcats(tree, environment, envs, compilerErrors, true);
-		processLateKeywords(tree, environment, compilerErrors);
-		checkLinearComponents(tree, environment, compilerErrors);
-		postParseRewrite(rootNode, environment, envs, compilerErrors, true); // Pass rootNode since this might rewrite 'tree'.
+		processKeywords(tree, env, compilerErrors);
+		addSelfStatements(tree, env, envs, compilerErrors);
+		rewriteAutoconcats(tree, env, envs, compilerErrors, true);
+		processLateKeywords(tree, env, compilerErrors);
+		checkLinearComponents(tree, env, compilerErrors);
+		postParseRewrite(rootNode, env, envs, compilerErrors, true); // Pass rootNode since this might rewrite 'tree'.
 		tree = rootNode.getChildAt(0);
 		moveNodeModifiersOffSyntheticNodes(tree);
-		staticAnalysis.analyze(tree, environment, envs, compilerErrors);
-		optimize(tree, environment, envs, procs, compilerErrors);
+		staticAnalysis.analyze(tree, env, envs, compilerErrors);
+		optimize(tree, env, envs, procs, compilerErrors);
 		link(tree, compilerErrors);
 		checkFunctionsExist(tree, compilerErrors, envs);
 		checkBreaks(tree, compilerErrors);
 		if(!staticAnalysis.isLocalEnabled()) {
-			checkUnhandledCompilerConstructs(tree, environment, compilerErrors);
+			checkUnhandledCompilerConstructs(tree, env, compilerErrors);
 		}
 		if(!compilerErrors.isEmpty()) {
 			if(compilerErrors.size() == 1) {
@@ -1942,7 +1942,7 @@ public static ParseTree compile(TokenStream stream, Environment environment,
 				throw new ConfigCompileGroupException(compilerErrors);
 			}
 		}
-		eliminateDeadCode(tree, environment, envs);
+		eliminateDeadCode(tree, env, envs);
 		return rootNode;
 	}
 

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

@@ -2072,22 +2072,6 @@ public CArray vector(Vector3D vector) {
 		return vector(vector, (Environment) null);
 	}
 
-	/**
-	 * Returns a CArray with an alpha channel from a given MCColor. It will be in the format array(a: 0, r: 0, g: 0, b: 0)
-	 *
-	 * @param color
-	 * @param t
-	 * @return
-	 */
-	public CArray transparentColor(MCColor color, Target t) {
-		CArray ca = CArray.GetAssociativeArray(t);
-		ca.set("r", new CInt(color.getRed(), t), t);
-		ca.set("g", new CInt(color.getGreen(), t), t);
-		ca.set("b", new CInt(color.getBlue(), t), t);
-		ca.set("a", new CInt(color.getAlpha(), t), t);
-		return ca;
-	}
-
 	/**
 	 * Gets a vector object, given a Vector.
 	 *
@@ -2216,6 +2200,22 @@ public Vector3D vector(Vector3D v, Mixed c, Target t, Environment env) {
 		}
 	}
 
+	/**
+	 * Returns a CArray with an alpha channel from a given MCColor. It will be in the format array(a: 0, r: 0, g: 0, b: 0)
+	 *
+	 * @param color
+	 * @param t
+	 * @return
+	 */
+	public CArray transparentColor(MCColor color, Target t) {
+		CArray ca = CArray.GetAssociativeArray(t);
+		ca.set("r", new CInt(color.getRed(), t), t);
+		ca.set("g", new CInt(color.getGreen(), t), t);
+		ca.set("b", new CInt(color.getBlue(), t), t);
+		ca.set("a", new CInt(color.getAlpha(), t), t);
+		return ca;
+	}
+
 	@AggressiveDeprecation(deprecationDate = "2022-04-06", removalVersion = "3.3.7", deprecationVersion = "3.3.6")
 	@Deprecated
 	public CArray enchants(Map<MCEnchantment, Integer> map, Target t) {
@@ -3332,6 +3332,7 @@ public MCMetadataValue metadataValue(Mixed value, MCPlugin plugin, Environment e
 	 * @param value
 	 * @param plugin
 	 * @return
+	 * @deprecated Use {@link #metadataValue(Mixed, MCPlugin, Environment)} instead.
 	 */
 	@AggressiveDeprecation(deprecationDate = "2022-04-06", removalVersion = "3.3.7", deprecationVersion = "3.3.6")
 	@Deprecated
@@ -3363,4 +3364,4 @@ public CArray regMatchValue(MatchResult matchResult, Target t) {
 
 		return ret;
 	}
-}
+}

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

@@ -1028,12 +1028,12 @@ public static MCCommandSender GetCommandSender(String name, Target t) throws Con
 	/**
 	 * If the sender is a player, it is returned, otherwise a ConfigRuntimeException is thrown.
 	 *
-	 * @param environment
+	 * @param env
 	 * @param t
 	 * @return
 	 */
-	public static MCPlayer getPlayer(Environment environment, Target t) {
-		MCPlayer player = environment.getEnv(CommandHelperEnvironment.class).GetPlayer();
+	public static MCPlayer getPlayer(Environment env, Target t) {
+		MCPlayer player = env.getEnv(CommandHelperEnvironment.class).GetPlayer();
 		if(player != null) {
 			return player;
 		} else {
@@ -1564,16 +1564,16 @@ public static File GetFileFromArgument(String arg, Environment env, Target t, Fi
 	 * Returns true if currently running in cmdline mode. If the environment is null, or the GlobalEnv is not available,
 	 * then defaultValue is returned.
 	 *
-	 * @param environment
+	 * @param env
 	 * @param defaultValue What should be returned if the environment is null or GlobalEnv is not present. (Happens
 	 * during compile time.)
 	 * @return
 	 */
-	public static boolean InCmdLine(Environment environment, boolean defaultValue) {
-		if(environment == null || !environment.hasEnv(GlobalEnv.class)) {
+	public static boolean InCmdLine(Environment env, boolean defaultValue) {
+		if(env == null || !env.hasEnv(GlobalEnv.class)) {
 			return defaultValue;
 		}
-		return environment.getEnv(GlobalEnv.class).inCmdlineMode();
+		return env.getEnv(GlobalEnv.class).inCmdlineMode();
 	}
 
 	/** @deprecated Use {@link #AssertType(Class, Mixed[], int, Function, Target, Environment)} instead. */

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

@@ -14,16 +14,16 @@ public class StrictMode {
 	 * There are a couple of factors that go into determining if strict mode is enabled or not. This method
 	 * combines all the reasons into a single function call.
 	 * @param fileOptions This parameter is mandatory, and should be provided by the compiler or other source object.
-	 * @param environment This parameter is optional, and may be set to null. This is going to be the case on the first
+	 * @param env This parameter is optional, and may be set to null. This is going to be the case on the first
 	 * compiler pass, but in dynamic code instances, may be present.
 	 * @param t The code target, for error messages
 	 * @return True if strict mode rules should be followed for this object.
 	 */
-	public static boolean isStrictMode(FileOptions fileOptions, Environment environment, Target t) {
+	public static boolean isStrictMode(FileOptions fileOptions, Environment env, Target t) {
 		boolean runtimeSetting = false;
-		if(environment != null) {
-			GlobalEnv env = environment.getEnv(GlobalEnv.class);
-			runtimeSetting = env.GetRuntimeSetting("system.strict_mode.enabled", false, t, environment);
+		if(env != null) {
+			GlobalEnv genv = env.getEnv(GlobalEnv.class);
+			runtimeSetting = genv.GetRuntimeSetting("system.strict_mode.enabled", false, t, env);
 		}
 		return fileOptions.isStrict() || runtimeSetting;
 	}

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

@@ -109,7 +109,7 @@ public Boolean runAsync() {
 	}
 
 	@Override
-	public final Mixed exec(Target t, Environment environment, GenericParameters generics, Mixed... args) throws ConfigRuntimeException {
+	public final Mixed exec(Target t, Environment env, GenericParameters generics, Mixed... args) throws ConfigRuntimeException {
 		throw new UnsupportedOperationException("Not supported.");
 	}