Change 'environment' to 'env' everywhere

Author: LadyCailin

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()) {
@@ -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);
@@ -1922,21 +1922,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) {
@@ -1946,7 +1946,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/Static.java

@@ -984,12 +984,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 {
@@ -1518,16 +1518,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);
+		if(env != null) {
+			GlobalEnv gEnv = env.getEnv(GlobalEnv.class);
+			runtimeSetting = gEnv.GetRuntimeSetting("system.strict_mode.enabled", false, t);
 		}
 		return fileOptions.isStrict() || runtimeSetting;
 	}

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

@@ -107,7 +107,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.");
 	}
 

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

@@ -207,16 +207,16 @@ protected void execute(Mixed... values) throws ConfigRuntimeException, ProgramFl
 		if(node == null) {
 			return;
 		}
-		Environment environment;
+		Environment env;
 		try {
 			synchronized(this) {
-				environment = env.clone();
+				env = this.env.clone();
 			}
 		} catch (CloneNotSupportedException ex) {
 			Logger.getLogger(CClosure.class.getName()).log(Level.SEVERE, null, ex);
 			return;
 		}
-		StackTraceManager stManager = environment.getEnv(GlobalEnv.class).GetStackTraceManager();
+		StackTraceManager stManager = env.getEnv(GlobalEnv.class).GetStackTraceManager();
 		stManager.addStackTraceElement(new ConfigRuntimeException.StackTraceElement("<<closure>>", getTarget()));
 		try {
 			CArray arguments = new CArray(node.getData().getTarget());
@@ -244,7 +244,7 @@ protected void execute(Mixed... values) throws ConfigRuntimeException, ProgramFl
 							if(vararg == null) {
 								// TODO: Once generics are added, add the type
 								vararg = new CArray(value.getTarget());
-								environment.getEnv(GlobalEnv.class).GetVarList().set(new IVariable(CArray.TYPE,
+								env.getEnv(GlobalEnv.class).GetVarList().set(new IVariable(CArray.TYPE,
 										name, vararg, value.getTarget()));
 								varargType = this.types[this.types.length - 1];
 							}
@@ -257,8 +257,8 @@ protected void execute(Mixed... values) throws ConfigRuntimeException, ProgramFl
 							}
 							vararg.push(value, value.getTarget());
 						} else {
-							IVariable var = new IVariable(types[i], name, value, getTarget(), environment);
-							environment.getEnv(GlobalEnv.class).GetVarList().set(var);
+							IVariable var = new IVariable(types[i], name, value, getTarget(), env);
+							env.getEnv(GlobalEnv.class).GetVarList().set(var);
 						}
 					}
 				}
@@ -272,7 +272,7 @@ protected void execute(Mixed... values) throws ConfigRuntimeException, ProgramFl
 			}
 
 			if(!hasArgumentsParam) {
-				environment.getEnv(GlobalEnv.class).GetVarList().set(new IVariable(CArray.TYPE, "@arguments", arguments,
+				env.getEnv(GlobalEnv.class).GetVarList().set(new IVariable(CArray.TYPE, "@arguments", arguments,
 						node.getData().getTarget()));
 			}
 
@@ -281,29 +281,29 @@ protected void execute(Mixed... values) throws ConfigRuntimeException, ProgramFl
 			children.add(node);
 			newNode.setChildren(children);
 			try {
-				MethodScriptCompiler.execute(newNode, environment, null, environment.getEnv(GlobalEnv.class)
+				MethodScriptCompiler.execute(newNode, env, null, env.getEnv(GlobalEnv.class)
 						.GetScript());
 			} catch (LoopManipulationException e) {
 				//This shouldn't ever happen.
 				LoopManipulationException lme = ((LoopManipulationException) e);
 				Target t = lme.getTarget();
 				ConfigRuntimeException.HandleUncaughtException(ConfigRuntimeException.CreateUncatchableException("A "
 						+ lme.getName() + "() bubbled up to the top of"
-						+ " a closure, which is unexpected behavior.", t), environment);
+						+ " a closure, which is unexpected behavior.", t), env);
 			} catch (FunctionReturnException ex) {
 				// Check the return type of the closure to see if it matches the defined type
 				// Normal execution.
 				Mixed ret = ex.getReturn();
-				if(!InstanceofUtil.isInstanceof(ret.typeof(environment), returnType, environment)) {
+				if(!InstanceofUtil.isInstanceof(ret.typeof(env), returnType, env)) {
 					throw new CRECastException("Expected closure to return a value of type " + returnType.val()
-							+ " but a value of type " + ret.typeof(environment) + " was returned instead", ret.getTarget());
+							+ " but a value of type " + ret.typeof(env) + " was returned instead", ret.getTarget());
 				}
 				// Now rethrow it
 				throw ex;
 			} catch (CancelCommandException e) {
 				// die()
 			} catch (ConfigRuntimeException ex) {
-				ex.setEnv(environment);
+				ex.setEnv(env);
 				if(ex instanceof AbstractCREException) {
 					((AbstractCREException) ex).freezeStackTraceElements(stManager);
 				}

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

@@ -31,9 +31,9 @@ public CIClosure(ParseTree node, Environment env, CClassType returnType, String[
 //		StackTraceManager stManager = env.getEnv(GlobalEnv.class).GetStackTraceManager();
 //		stManager.addStackTraceElement(new ConfigRuntimeException.StackTraceElement("<<iclosure>>", getTarget()));
 //		try {
-//			Environment environment;
+//			Environment env;
 //			synchronized(this) {
-//				environment = env.clone();
+//				env = env.clone();
 //			}
 //			if(values != null) {
 //				for(int i = 0; i < names.length; i++) {
@@ -44,8 +44,8 @@ public CIClosure(ParseTree node, Environment env, CClassType returnType, String[
 //					} catch (Exception e) {
 //						value = defaults[i].clone();
 //					}
-//					environment.getEnv(GlobalEnv.class).GetVarList().set(new IVariable(types[i], name, value,
-//							getTarget(), environment));
+//					env.getEnv(GlobalEnv.class).GetVarList().set(new IVariable(types[i], name, value,
+//							getTarget(), env));
 //				}
 //			}
 //			boolean hasArgumentsParam = false;
@@ -63,7 +63,7 @@ public CIClosure(ParseTree node, Environment env, CClassType returnType, String[
 //						arguments.push(value, node.getData().getTarget());
 //					}
 //				}
-//				environment.getEnv(GlobalEnv.class).GetVarList().set(new IVariable(CArray.TYPE, "@arguments", arguments,
+//				env.getEnv(GlobalEnv.class).GetVarList().set(new IVariable(CArray.TYPE, "@arguments", arguments,
 //						node.getData().getTarget()));
 //			}
 //
@@ -72,7 +72,7 @@ public CIClosure(ParseTree node, Environment env, CClassType returnType, String[
 //			children.add(node);
 //			newNode.setChildren(children);
 //			try {
-//				MethodScriptCompiler.execute(newNode, environment, null, environment.getEnv(GlobalEnv.class)
+//				MethodScriptCompiler.execute(newNode, env, null, env.getEnv(GlobalEnv.class)
 //						.GetScript());
 //			} catch (LoopManipulationException e) {
 //				//This shouldn't ever happen.
@@ -84,7 +84,7 @@ public CIClosure(ParseTree node, Environment env, CClassType returnType, String[
 //			} catch (FunctionReturnException ex) {
 //				// Check the return type of the closure to see if it matches the defined type
 //				Mixed ret = ex.getReturn();
-//				if(!InstanceofUtil.isInstanceof(ret, returnType, environment)) {
+//				if(!InstanceofUtil.isInstanceof(ret, returnType, env)) {
 //					throw new CRECastException("Expected closure to return a value of type " + returnType.val()
 //							+ " but a value of type " + ret.typeof() + " was returned instead", ret.getTarget());
 //				}

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

@@ -39,8 +39,8 @@ public boolean isDynamic() {
 	}
 
 	@Override
-	public Mixed executeCallable(Environment environment, Target t, Mixed... values) throws ConfigRuntimeException, ProgramFlowManipulationException, CancelCommandException {
-		return runnable.execute(t, environment, values);
+	public Mixed executeCallable(Environment env, Target t, Mixed... values) throws ConfigRuntimeException, ProgramFlowManipulationException, CancelCommandException {
+		return runnable.execute(t, env, values);
 	}
 
 	@Override

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

@@ -76,9 +76,9 @@ public Set<ObjectModifier> getObjectModifiers() {
 	}
 
 	@Override
-	public Mixed executeCallable(Environment environment, Target t, Mixed... values) throws ConfigRuntimeException,
+	public Mixed executeCallable(Environment env, Target t, Mixed... values) throws ConfigRuntimeException,
 			ProgramFlowManipulationException, CancelCommandException {
-		return proc.execute(Arrays.asList(values), environment, t);
+		return proc.execute(Arrays.asList(values), env, t);
 	}
 
 	@Override