Optimize alias matching

Author: PseudoKnight

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

@@ -166,8 +166,9 @@ public boolean alias(String command, final MCCommandSender sender) {
 		}
 
 		Script script = null;
+		String[] args = command.split(" ");
 		for(Script s : scripts) {
-			if(s.match(command)) {
+			if(s.match(args)) {
 				script = s;
 				break;
 			}

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

@@ -580,82 +580,35 @@ private void doDebugOutput(String nodeName, List<ParseTree> children) {
 	}
 
 	public boolean match(String command) {
+		String[] cmds = command.split(" ");
+		return match(cmds);
+	}
+
+	public boolean match(String[] args) {
 		if(cleft == null) {
 			//The compilation error happened during the signature declaration, so
 			//we can't match it, nor can we even tell if it's what they intended for us to run.
 			return false;
 		}
 		boolean caseSensitive = Prefs.CaseSensitive();
-		String[] cmds = command.split(" ");
-		List<String> args = new ArrayList<>(Arrays.asList(cmds));
-		boolean isAMatch = true;
-		StringBuilder lastVar = new StringBuilder();
-		int lastJ = 0;
 		for(int j = 0; j < cleft.size(); j++) {
-			if(!isAMatch) {
-				break;
-			}
-			lastJ = j;
 			Mixed c = cleft.get(j);
-			if(args.size() <= j) {
-				if(!Construct.IsCType(c, ConstructType.VARIABLE) || !((Variable) c).isOptional()) {
-					isAMatch = false;
-				}
-				break;
+			if(args.length <= j) {
+				// If this optional, the rest are too.
+				return c instanceof Variable v && v.isOptional();
 			}
-			String arg = args.get(j);
-			if(!Construct.IsCType(c, ConstructType.VARIABLE)) {
+			if(!(c instanceof Variable)) {
+				String arg = args[j];
 				if(caseSensitive && !c.val().equals(arg) || !caseSensitive && !c.val().equalsIgnoreCase(arg)) {
-					isAMatch = false;
-					continue;
+					return false;
 				}
-			} else {
+			} else if(((Variable) c).isOptional()) {
 				//It's a variable. If it's optional, the rest of them are optional too, so as long as the size of
 				//args isn't greater than the size of cleft, it's a match
-				if(((Variable) c).isOptional()) {
-					if(args.size() <= cleft.size()) {
-						return true;
-					} else {
-						Mixed fin = cleft.get(cleft.size() - 1);
-						if(fin instanceof Variable) {
-							if(((Variable) fin).isFinal()) {
-								return true;
-							}
-						}
-						return false;
-					}
-				}
-			}
-			if(j == cleft.size() - 1) {
-				if(Construct.IsCType(cleft.get(j), ConstructType.VARIABLE)) {
-					Variable lv = (Variable) cleft.get(j);
-					if(lv.isFinal()) {
-						for(int a = j; a < args.size(); a++) {
-							if(lastVar.length() == 0) {
-								lastVar.append(args.get(a));
-							} else {
-								lastVar.append(" ").append(args.get(a));
-							}
-						}
-					}
-				}
-			}
-		}
-		boolean lastIsFinal = false;
-		if(cleft.get(cleft.size() - 1) instanceof Variable) {
-			Variable v = (Variable) cleft.get(cleft.size() - 1);
-			if(v.isFinal()) {
-				lastIsFinal = true;
+				return args.length <= cleft.size() || cleft.get(cleft.size() - 1) instanceof Variable v && v.isFinal();
 			}
 		}
-		if((cleft.get(lastJ) instanceof Variable && ((Variable) cleft.get(lastJ)).isOptional())) {
-			return true;
-		}
-
-		if(cleft.size() != cmds.length && !lastIsFinal) {
-			isAMatch = false;
-		}
-		return isAMatch;
+		return args.length == cleft.size() || cleft.get(cleft.size() - 1) instanceof Variable v && v.isFinal();
 	}
 
 	public List<Variable> getVariables(String command) {

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

@@ -605,8 +605,9 @@ public CBoolean exec(Target t, Environment environment, Mixed... args)
 				throws ConfigRuntimeException {
 			AliasCore ac = Static.getAliasCore();
 
+			String[] cmdArgs = args[0].val().split(" ");
 			for(Script s : ac.getScripts()) {
-				if(s.match(args[0].val())) {
+				if(s.match(cmdArgs)) {
 					return CBoolean.TRUE;
 				}
 			}