Always link scopes + Preserve scoping for invalid numargs

- Always link AST term scopes, ensuring that for example ivariable references have a scope assigned to them.
- Preserve scoping behavior for while/for/... functions with an invalid number of arguments. In these cases all arguments within such function will get their own scope, preventing a chain of unexpected SA compile errors on invalid while/for/... usage.

Author: Pieter12345

src/main/java/com/laytonsmith/core/functions/ControlFlow.java

@@ -193,7 +193,10 @@ public Class<? extends CREThrowable>[] thrown() {
 		@Override
 		public Scope linkScope(StaticAnalysis analysis, Scope parentScope,
 				ParseTree ast, Environment env, Set<ConfigCompileException> exceptions) {
+
+			// Handle not enough arguments. Link child scopes, but return parent scope.
 			if(ast.numberOfChildren() < 2) {
+				super.linkScope(analysis, parentScope, ast, env, exceptions);
 				return parentScope;
 			}
 
@@ -1125,9 +1128,10 @@ public Class<? extends CREThrowable>[] thrown() {
 		public Scope linkScope(StaticAnalysis analysis, Scope parentScope,
 				ParseTree ast, Environment env, Set<ConfigCompileException> exceptions) {
 
-			// Fall back to default behavior for invalid usage.
+			// Handle invalid number of arguments. Link child scopes, but return parent scope.
 			if(ast.numberOfChildren() != 4) {
-				return super.linkScope(analysis, parentScope, ast, env, exceptions);
+				super.linkScope(analysis, parentScope, ast, env, exceptions);
+				return parentScope;
 			}
 
 			// Link child scopes.
@@ -1382,30 +1386,38 @@ public FunctionSignatures getSignatures() {
 		@Override
 		public Scope linkScope(StaticAnalysis analysis, Scope parentScope,
 				ParseTree ast, Environment env, Set<ConfigCompileException> exceptions) {
-			if(ast.numberOfChildren() >= (this.runAsFor ? 3 : 4)) {
-				ParseTree assign = ast.getChildAt(0);
-				ParseTree cond = ast.getChildAt(1);
-				ParseTree exp = ast.getChildAt(2);
-				ParseTree code = ast.getChildAt(3);
-				ParseTree elseCode = (this.runAsFor ? null : ast.getChildAt(4));
-
-				// Order: assign -> cond -> (code -> exp -> cond)* -> elseCode?.
-				Scope assignScope = analysis.linkScope(parentScope, assign, env, exceptions);
-				Scope condScope = analysis.linkScope(assignScope, cond, env, exceptions);
-				Scope codeParentScope = analysis.createNewScope(condScope);
-				Scope codeScope = analysis.linkScope(codeParentScope, code, env, exceptions);
-				analysis.linkScope(codeScope, exp, env, exceptions);
-				if(elseCode != null) {
-					analysis.linkScope(condScope, code, env, exceptions);
-				}
 
-				// Add breakable and continuable declaration in loop code parent scope.
-				codeParentScope.addDeclaration(
-						new BreakableDeclaration(parentScope, ast.getNodeModifiers(), ast.getTarget()));
-				codeParentScope.addDeclaration(
-						new ContinuableDeclaration(ast.getNodeModifiers(), ast.getTarget()));
-				analysis.setTermScope(ast, codeParentScope);
+			// Handle not enough arguments. Link child scopes, but return parent scope.
+			if(ast.numberOfChildren() < (this.runAsFor ? 3 : 4)) {
+				super.linkScope(analysis, parentScope, ast, env, exceptions);
+				return parentScope;
+			}
+
+			// Get AST nodes.
+			ParseTree assign = ast.getChildAt(0);
+			ParseTree cond = ast.getChildAt(1);
+			ParseTree exp = ast.getChildAt(2);
+			ParseTree code = ast.getChildAt(3);
+			ParseTree elseCode = (this.runAsFor ? null : ast.getChildAt(4));
+
+			// Order: assign -> cond -> (code -> exp -> cond)* -> elseCode?.
+			Scope assignScope = analysis.linkScope(parentScope, assign, env, exceptions);
+			Scope condScope = analysis.linkScope(assignScope, cond, env, exceptions);
+			Scope codeParentScope = analysis.createNewScope(condScope);
+			Scope codeScope = analysis.linkScope(codeParentScope, code, env, exceptions);
+			analysis.linkScope(codeScope, exp, env, exceptions);
+			if(elseCode != null) {
+				analysis.linkScope(condScope, code, env, exceptions);
 			}
+
+			// Add breakable and continuable declaration in loop code parent scope.
+			codeParentScope.addDeclaration(
+					new BreakableDeclaration(parentScope, ast.getNodeModifiers(), ast.getTarget()));
+			codeParentScope.addDeclaration(
+					new ContinuableDeclaration(ast.getNodeModifiers(), ast.getTarget()));
+			analysis.setTermScope(ast, codeParentScope);
+
+			// Return parent scope.
 			return parentScope;
 		}
 
@@ -1631,34 +1643,41 @@ public Class<? extends CREThrowable>[] thrown() {
 		@Override
 		public Scope linkScope(StaticAnalysis analysis, Scope parentScope,
 				ParseTree ast, Environment env, Set<ConfigCompileException> exceptions) {
-			if(ast.numberOfChildren() >= 3) {
-				int ind = 0;
-				ParseTree array = ast.getChildAt(ind++);
-				ParseTree key = (ast.numberOfChildren() == 4 ? ast.getChildAt(ind++) : null);
-				ParseTree val = ast.getChildAt(ind++);
-				ParseTree code = ast.getChildAt(ind++);
-
-				// Order: array -> [key] -> val -> code?.
-				Scope arrayScope = analysis.linkScope(parentScope, array, env, exceptions);
-				Scope keyParamScope = arrayScope;
-				Scope keyValScope = arrayScope;
-				if(key != null) {
-					Scope[] scopes = analysis.linkParamScope(keyParamScope, keyValScope, key, env, exceptions);
-					keyParamScope = scopes[0];
-					keyValScope = scopes[1];
-				}
-				Scope[] scopes = analysis.linkParamScope(keyParamScope, keyValScope, val, env, exceptions);
-				Scope valScope = scopes[0]; // paramScope.
-				Scope codeParentScope = analysis.createNewScope(valScope);
-				analysis.linkScope(codeParentScope, code, env, exceptions);
-
-				// Add breakable and continuable declaration in loop code parent scope.
-				codeParentScope.addDeclaration(
-						new BreakableDeclaration(parentScope, ast.getNodeModifiers(), ast.getTarget()));
-				codeParentScope.addDeclaration(
-						new ContinuableDeclaration(ast.getNodeModifiers(), ast.getTarget()));
-				analysis.setTermScope(ast, codeParentScope);
+
+			// Handle not enough arguments. Link child scopes, but return parent scope.
+			if(ast.numberOfChildren() < 3) {
+				super.linkScope(analysis, parentScope, ast, env, exceptions);
+				return parentScope;
+			}
+
+			int ind = 0;
+			ParseTree array = ast.getChildAt(ind++);
+			ParseTree key = (ast.numberOfChildren() == 4 ? ast.getChildAt(ind++) : null);
+			ParseTree val = ast.getChildAt(ind++);
+			ParseTree code = ast.getChildAt(ind++);
+
+			// Order: array -> [key] -> val -> code?.
+			Scope arrayScope = analysis.linkScope(parentScope, array, env, exceptions);
+			Scope keyParamScope = arrayScope;
+			Scope keyValScope = arrayScope;
+			if(key != null) {
+				Scope[] scopes = analysis.linkParamScope(keyParamScope, keyValScope, key, env, exceptions);
+				keyParamScope = scopes[0];
+				keyValScope = scopes[1];
 			}
+			Scope[] scopes = analysis.linkParamScope(keyParamScope, keyValScope, val, env, exceptions);
+			Scope valScope = scopes[0]; // paramScope.
+			Scope codeParentScope = analysis.createNewScope(valScope);
+			analysis.linkScope(codeParentScope, code, env, exceptions);
+
+			// Add breakable and continuable declaration in loop code parent scope.
+			codeParentScope.addDeclaration(
+					new BreakableDeclaration(parentScope, ast.getNodeModifiers(), ast.getTarget()));
+			codeParentScope.addDeclaration(
+					new ContinuableDeclaration(ast.getNodeModifiers(), ast.getTarget()));
+			analysis.setTermScope(ast, codeParentScope);
+
+			// Return parent scope.
 			return parentScope;
 		}
 
@@ -1929,36 +1948,43 @@ public FunctionSignatures getSignatures() {
 		@Override
 		public Scope linkScope(StaticAnalysis analysis, Scope parentScope,
 				ParseTree ast, Environment env, Set<ConfigCompileException> exceptions) {
-			if(ast.numberOfChildren() >= 4) {
-				int ind = 0;
-				ParseTree array = ast.getChildAt(ind++);
-				ParseTree key = (ast.numberOfChildren() == 5 ? ast.getChildAt(ind++) : null);
-				ParseTree val = ast.getChildAt(ind++);
-				ParseTree code = ast.getChildAt(ind++);
-				ParseTree elseCode = ast.getChildAt(ind++);
-
-				// Order: array -> [key] -> val -> code? | array -> elseCode.
-				Scope arrayScope = analysis.linkScope(parentScope, array, env, exceptions);
-				Scope keyParamScope = arrayScope;
-				Scope keyValScope = arrayScope;
-				if(key != null) {
-					Scope[] scopes = analysis.linkParamScope(keyParamScope, keyValScope, key, env, exceptions);
-					keyParamScope = scopes[0];
-					keyValScope = scopes[1];
-				}
-				Scope[] scopes = analysis.linkParamScope(keyParamScope, keyValScope, val, env, exceptions);
-				Scope valScope = scopes[0]; // paramScope.
-				Scope codeParentScope = analysis.createNewScope(valScope);
-				analysis.linkScope(codeParentScope, code, env, exceptions);
-				analysis.linkScope(arrayScope, elseCode, env, exceptions);
-
-				// Add breakable and continuable declaration in loop code parent scope.
-				codeParentScope.addDeclaration(
-						new BreakableDeclaration(parentScope, ast.getNodeModifiers(), ast.getTarget()));
-				codeParentScope.addDeclaration(
-						new ContinuableDeclaration(ast.getNodeModifiers(), ast.getTarget()));
-				analysis.setTermScope(ast, codeParentScope);
+
+			// Handle not enough arguments. Link child scopes, but return parent scope.
+			if(ast.numberOfChildren() < 4) {
+				super.linkScope(analysis, parentScope, ast, env, exceptions);
+				return parentScope;
 			}
+
+			int ind = 0;
+			ParseTree array = ast.getChildAt(ind++);
+			ParseTree key = (ast.numberOfChildren() == 5 ? ast.getChildAt(ind++) : null);
+			ParseTree val = ast.getChildAt(ind++);
+			ParseTree code = ast.getChildAt(ind++);
+			ParseTree elseCode = ast.getChildAt(ind++);
+
+			// Order: array -> [key] -> val -> code? | array -> elseCode.
+			Scope arrayScope = analysis.linkScope(parentScope, array, env, exceptions);
+			Scope keyParamScope = arrayScope;
+			Scope keyValScope = arrayScope;
+			if(key != null) {
+				Scope[] scopes = analysis.linkParamScope(keyParamScope, keyValScope, key, env, exceptions);
+				keyParamScope = scopes[0];
+				keyValScope = scopes[1];
+			}
+			Scope[] scopes = analysis.linkParamScope(keyParamScope, keyValScope, val, env, exceptions);
+			Scope valScope = scopes[0]; // paramScope.
+			Scope codeParentScope = analysis.createNewScope(valScope);
+			analysis.linkScope(codeParentScope, code, env, exceptions);
+			analysis.linkScope(arrayScope, elseCode, env, exceptions);
+
+			// Add breakable and continuable declaration in loop code parent scope.
+			codeParentScope.addDeclaration(
+					new BreakableDeclaration(parentScope, ast.getNodeModifiers(), ast.getTarget()));
+			codeParentScope.addDeclaration(
+					new ContinuableDeclaration(ast.getNodeModifiers(), ast.getTarget()));
+			analysis.setTermScope(ast, codeParentScope);
+
+			// Return parent scope.
 			return parentScope;
 		}
 
@@ -2105,9 +2131,10 @@ public Mixed exec(Target t, Environment environment, Mixed... args) throws Confi
 		public Scope linkScope(StaticAnalysis analysis, Scope parentScope,
 				ParseTree ast, Environment env, Set<ConfigCompileException> exceptions) {
 
-			// Fall back to default behavior for invalid usage.
+			// Handle insufficient number of arguments. Link child scopes, but return parent scope.
 			if(ast.numberOfChildren() != 2) {
-				return super.linkScope(analysis, parentScope, ast, env, exceptions);
+				super.linkScope(analysis, parentScope, ast, env, exceptions);
+				return parentScope;
 			}
 
 			// Link child scopes.
@@ -2261,9 +2288,10 @@ public Mixed execs(Target t, Environment env, Script parent, ParseTree... nodes)
 		public Scope linkScope(StaticAnalysis analysis, Scope parentScope,
 				ParseTree ast, Environment env, Set<ConfigCompileException> exceptions) {
 
-			// Fall back to default behavior for invalid usage.
+			// Handle invalid number of arguments. Link child scopes, but return parent scope.
 			if(ast.numberOfChildren() != 2) {
-				return super.linkScope(analysis, parentScope, ast, env, exceptions);
+				super.linkScope(analysis, parentScope, ast, env, exceptions);
+				return parentScope;
 			}
 
 			// Link child scopes.

src/main/java/com/laytonsmith/core/functions/DataHandling.java

@@ -1577,8 +1577,9 @@ public Mixed exec(Target t, Environment env, Mixed... args) throws ConfigRuntime
 		public Scope linkScope(StaticAnalysis analysis, Scope parentScope, ParseTree ast,
 				Environment env, Set<ConfigCompileException> exceptions) {
 
-			// Handle not enough arguments.
+			// Handle not enough arguments. Link child scopes, but return parent scope.
 			if(ast.numberOfChildren() < 2) {
+				super.linkScope(analysis, parentScope, ast, env, exceptions);
 				return parentScope;
 			}
 

src/main/java/com/laytonsmith/core/functions/EventBinding.java

@@ -312,8 +312,9 @@ private CClassType typecheckPrefilterParseTree(
 		public Scope linkScope(StaticAnalysis analysis, Scope parentScope,
 				ParseTree ast, Environment env, Set<ConfigCompileException> exceptions) {
 
-			// Fully ignore the bind() if it will generate an exception later anyways.
+			// Handle not enough arguments. Link child scopes, but return parent scope.
 			if(ast.numberOfChildren() < 5) {
+				super.linkScope(analysis, parentScope, ast, env, exceptions);
 				return parentScope;
 			}
 

src/main/java/com/laytonsmith/core/functions/Exceptions.java

@@ -216,7 +216,12 @@ public Scope linkScope(StaticAnalysis analysis, Scope parentScope,
 			int numArgs = ast.numberOfChildren();
 			Scope catchParentScope = parentScope;
 			switch(numArgs) {
-				default: // Too many arguments, just analyze the first 4, this will cause a compile error later.
+				default: { // Too many arguments. Analyze the first 4 as usual and handle the rest generically.
+					Scope scope = parentScope;
+					for(int i = 4; i < ast.numberOfChildren(); i++) {
+						scope = analysis.linkScope(scope, ast.getChildAt(i), env, exceptions);
+					}
+				}
 				case 4: { // try(tryCode, exParam, catchCode, exTypes).
 					ParseTree exTypes = ast.getChildAt(3);
 					analysis.linkScope(parentScope, exTypes, env, exceptions);