Merge remote-tracking branch 'origin/master' into genericsTake2

Author: LadyCailin

src/main/java/com/laytonsmith/PureUtilities/Common/StringUtils.java

@@ -50,8 +50,8 @@ public static String Join(Map map, String entryGlue, String elementGlue, String
 	 * @param entryGlue The glue to use between the key and value of each pair in the map
 	 * @param elementGlue The glue to use between each key-value element pairs in the map
 	 * @param lastElementGlue The glue for the last two elements
-	 * @param elementGlueForTwoItems If only two items are in the map, then this glue is used instead. If it is null, then
-	 * lastElementGlue is used instead.
+	 * @param elementGlueForTwoItems If only two items are in the map, then this glue is used instead. If it is null,
+	 * then lastElementGlue is used instead.
 	 * @return The concatenated string
 	 */
 	public static String Join(Map map, String entryGlue, String elementGlue, String lastElementGlue, String elementGlueForTwoItems) {
@@ -65,8 +65,8 @@ public static String Join(Map map, String entryGlue, String elementGlue, String
 	 * @param entryGlue The glue to use between the key and value of each pair in the map
 	 * @param elementGlue The glue to use between each key-value element pairs in the map
 	 * @param lastElementGlue The glue for the last two elements
-	 * @param elementGlueForTwoItems If only two items are in the map, then this glue is used instead. If it is null, then
-	 * lastElementGlue is used instead.
+	 * @param elementGlueForTwoItems If only two items are in the map, then this glue is used instead. If it is null,
+	 * then lastElementGlue is used instead.
 	 * @param empty If the map is completely empty, this string is simply returned. If null, an empty string is used.
 	 * @return The concatenated string
 	 */
@@ -84,6 +84,7 @@ public static String Join(Map map, String entryGlue, String elementGlue, String
 	/**
 	 * Joins a set together (using StringBuilder's {@link StringBuilder#append(Object)} method to "toString" the Object)
 	 * using the specified string for glue.
+	 *
 	 * @param <T> The set type
 	 * @param set The set to concatenate
 	 * @param glue The glue to use
@@ -95,6 +96,7 @@ public static <T> String Join(Set<T> set, String glue) {
 
 	/**
 	 * Joins a set together, rendering each item with the custom renderer.
+	 *
 	 * @param <T> The set type
 	 * @param set The set to concatenate
 	 * @param glue The glue to use
@@ -134,9 +136,10 @@ public static <T> String Join(T[] list, String glue, Renderer<T> r) {
 
 	/**
 	 * Joins a set together (using StringBuilder's {@link StringBuilder#append(Object)} method to "toString" the Object)
-	 * using the specified string for glue. If
-	 * lastGlue is null, it is the same as glue, but otherwise it is used to glue just the last two items together,
-	 * which is useful for sets that are being read by a human, to have a proper conjunction at the end.
+	 * using the specified string for glue. If lastGlue is null, it is the same as glue, but otherwise it is used to
+	 * glue just the last two items together, which is useful for sets that are being read by a human, to have a proper
+	 * conjunction at the end.
+	 *
 	 * @param <T> The set type
 	 * @param set The set to concatenate
 	 * @param glue The glue to use
@@ -149,9 +152,10 @@ public static <T> String Join(Set<T> set, String glue, String lastGlue) {
 
 	/**
 	 * Joins a set together (using StringBuilder's {@link StringBuilder#append(Object)} method to "toString" the Object)
-	 * using the specified string for glue.
-	 * If lastGlue is null, it is the same as glue, but otherwise it is used to glue just the last two items together,
-	 * which is useful for sets that are being read by a human, to have a proper conjunction at the end.
+	 * using the specified string for glue. If lastGlue is null, it is the same as glue, but otherwise it is used to
+	 * glue just the last two items together, which is useful for sets that are being read by a human, to have a proper
+	 * conjunction at the end.
+	 *
 	 * @param <T> The set type
 	 * @param set The set to concatenate
 	 * @param glue The glue to use
@@ -166,9 +170,10 @@ public static <T> String Join(Set<T> set, String glue, String lastGlue, String g
 
 	/**
 	 * Joins a set together (using StringBuilder's {@link StringBuilder#append(Object)} method to "toString" the Object)
-	 * using the specified string for glue.
-	 * If lastGlue is null, it is the same as glue, but otherwise it is used to glue just the last two items together,
-	 * which is useful for sets that are being read by a human, to have a proper conjunction at the end.
+	 * using the specified string for glue. If lastGlue is null, it is the same as glue, but otherwise it is used to
+	 * glue just the last two items together, which is useful for sets that are being read by a human, to have a proper
+	 * conjunction at the end.
+	 *
 	 * @param <T> The set type
 	 * @param set The set to concatenate
 	 * @param glue The glue to use
@@ -184,9 +189,10 @@ public static <T> String Join(Set<T> set, String glue, String lastGlue, String g
 
 	/**
 	 * Joins a set together (using StringBuilder's {@link StringBuilder#append(Object)} method to "toString" the Object)
-	 * using the specified string for glue.
-	 * If lastGlue is null, it is the same as glue, but otherwise it is used to glue just the last two items together,
-	 * which is useful for sets that are being read by a human, to have a proper conjunction at the end.
+	 * using the specified string for glue. If lastGlue is null, it is the same as glue, but otherwise it is used to
+	 * glue just the last two items together, which is useful for sets that are being read by a human, to have a proper
+	 * conjunction at the end.
+	 *
 	 * @param <T>
 	 * @param set The set to concatenate
 	 * @param glue The glue to use
@@ -221,8 +227,9 @@ public boolean isEmpty() {
 	}
 
 	/**
-	 * Joins an array together (using StringBuilder's {@link StringBuilder#append(Object)} method
-	 * to "toString" the Object) using the specified string for glue.
+	 * Joins an array together (using StringBuilder's {@link StringBuilder#append(Object)} method to "toString" the
+	 * Object) using the specified string for glue.
+	 *
 	 * @param <T> The array type
 	 * @param list The array to concatenate
 	 * @param glue The glue to use
@@ -233,10 +240,11 @@ public static <T> String Join(T[] list, String glue) {
 	}
 
 	/**
-	 * Joins an array together (using StringBuilder's {@link StringBuilder#append(Object)} method
-	 * to "toString" the Object) using the specified string for glue.
-	 * If lastGlue is null, it is the same as glue, but otherwise it is used to glue just the last two items together,
-	 * which is useful for lists that are being read by a human, to have a proper conjunction at the end.
+	 * Joins an array together (using StringBuilder's {@link StringBuilder#append(Object)} method to "toString" the
+	 * Object) using the specified string for glue. If lastGlue is null, it is the same as glue, but otherwise it is
+	 * used to glue just the last two items together, which is useful for lists that are being read by a human, to have
+	 * a proper conjunction at the end.
+	 *
 	 * @param <T> The array type
 	 * @param list The array to concatenate
 	 * @param glue The glue to use
@@ -248,10 +256,11 @@ public static <T> String Join(T[] list, String glue, String lastGlue) {
 	}
 
 	/**
-	 * Joins an array together (using StringBuilder's {@link StringBuilder#append(Object)} method
-	 * to "toString" the Object) using the specified string for glue.
-	 * If lastGlue is null, it is the same as glue, but otherwise it is used to glue just the last two items together,
-	 * which is useful for lists that are being read by a human, to have a proper conjunction at the end.
+	 * Joins an array together (using StringBuilder's {@link StringBuilder#append(Object)} method to "toString" the
+	 * Object) using the specified string for glue. If lastGlue is null, it is the same as glue, but otherwise it is
+	 * used to glue just the last two items together, which is useful for lists that are being read by a human, to have
+	 * a proper conjunction at the end.
+	 *
 	 * @param <T> The array type
 	 * @param list The array to concatenate
 	 * @param glue The glue to use
@@ -265,10 +274,11 @@ public static <T> String Join(T[] list, String glue, String lastGlue, String glu
 	}
 
 	/**
-	 * Joins an array together (using StringBuilder's {@link StringBuilder#append(Object)} method
-	 * to "toString" the Object) using the specified string for glue.
-	 * If lastGlue is null, it is the same as glue, but otherwise it is used to glue just the last two items together,
-	 * which is useful for lists that are being read by a human, to have a proper conjunction at the end.
+	 * Joins an array together (using StringBuilder's {@link StringBuilder#append(Object)} method to "toString" the
+	 * Object) using the specified string for glue. If lastGlue is null, it is the same as glue, but otherwise it is
+	 * used to glue just the last two items together, which is useful for lists that are being read by a human, to have
+	 * a proper conjunction at the end.
+	 *
 	 * @param <T> The array type
 	 * @param list The array to concatenate
 	 * @param glue The glue to use
@@ -382,10 +392,11 @@ public static String Join(final List list, String glue, String lastGlue, String
 	}
 
 	/**
-	 * Joins a list together (using StringBuilder's {@link StringBuilder#append(Object)} method
-	 * to "toString" the Object) using the specified string for glue.
-	 * If lastGlue is null, it is the same as glue, but otherwise it is used to glue just the last two items together,
-	 * which is useful for lists that are being read by a human, to have a proper conjunction at the end.
+	 * Joins a list together (using StringBuilder's {@link StringBuilder#append(Object)} method to "toString" the
+	 * Object) using the specified string for glue. If lastGlue is null, it is the same as glue, but otherwise it is
+	 * used to glue just the last two items together, which is useful for lists that are being read by a human, to have
+	 * a proper conjunction at the end.
+	 *
 	 * @param <T> The list type
 	 * @param list The list to concatenate
 	 * @param glue The glue to use

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

@@ -73,7 +73,7 @@ public Procedure(String name, CClassType returnType, List<IVariable> varList, Li
 		this.procComment = procComment;
 		for(int i = 0; i < varList.size(); i++) {
 			IVariable var = varList.get(i);
-			if(isVarArg.get(i) && i != varList.size() - 1) {
+			if(var.getDefinedType().isVariadicType() && i != varList.size() - 1) {
 				throw new CREFormatException("Varargs can only be added to the last argument.", t);
 			}
 			try {
@@ -82,7 +82,7 @@ public Procedure(String name, CClassType returnType, List<IVariable> varList, Li
 				this.varList.put(var.getVariableName(), var);
 			}
 			this.varIndex.add(var);
-			if(isVarArg.get(i) && var.ival() != CNull.UNDEFINED) {
+			if(var.getDefinedType().isVariadicType() && var.ival() != CNull.UNDEFINED) {
 				throw new CREFormatException("Varargs may not have default values", t);
 			}
 			this.originals.put(var.getVariableName(), var.ival());
@@ -225,10 +225,10 @@ public Mixed execute(List<Mixed> args, Environment oldEnv, Target t) {
 			arguments.push(c, t);
 			if(this.varIndex.size() > varInd
 					|| (!this.varIndex.isEmpty()
-						&& this.isVarArg.get(this.varIndex.size() - 1))) {
+						&& this.varIndex.get(this.varIndex.size() - 1).getDefinedType().isVariadicType())) {
 				IVariable var;
 				if(varInd < this.varIndex.size() - 1
-						|| !this.isVarArg.get(this.varIndex.size() - 1)) {
+						|| !this.varIndex.get(this.varIndex.size() - 1).getDefinedType().isVariadicType()) {
 					var = this.varIndex.get(varInd);
 				} else {
 					var = this.varIndex.get(this.varIndex.size() - 1);
@@ -254,7 +254,7 @@ public Mixed execute(List<Mixed> args, Environment oldEnv, Target t) {
 
 				// Type check vararg parameter.
 				if(var.getDefinedType().isVariadicType()) {
-					if(InstanceofUtil.isInstanceof(c.typeof(env), var.getDefinedType().getNakedType(t, env), env)) {
+					if(InstanceofUtil.isInstanceof(c.typeof(env), var.getDefinedType().getVarargsBaseType(), env)) {
 						vararg.push(c, t, env);
 						continue;
 					} else {

src/main/java/com/laytonsmith/core/compiler/FileOptions.java

@@ -369,7 +369,7 @@ public static enum SuppressWarning implements Documentation {
 		UnexpectedStatement("In strict mode, unexpected statements are an error, but in non-strict mode, they are"
 				+ " a warning.", MSVersion.V3_3_5, SeverityLevel.HIGH),
 		GenericTypeOverrides("When using generics, defining a typename which matches an in-scope actual object type"
-				+ " can lead to confusion, since referneces to the original type will no longer reference the"
+				+ " can lead to confusion, since references to the original type will no longer reference the"
 				+ " actual type, but rather the typename. Thus, this should be avoided.", MSVersion.V3_3_6,
 				SeverityLevel.HIGH),
 		PossibleUnexpectedExecution("If the parenthesis following a token is on a different line as the previous"

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

@@ -77,7 +77,7 @@ public CClosure(ParseTree node, Environment env, LeftHandSideType returnType, St
 		this.isVarArgs = isVarArgs;
 		if(types.length > 0) {
 			for(int i = 0; i < types.length - 1; i++) {
-				if(isVarArgs[i]) {
+				if(types[i].isVariadicType()) {
 					throw new CREFormatException("Varargs can only be added to the last argument.", t);
 				}
 			}
@@ -253,10 +253,10 @@ protected void execute(Mixed... values) throws ConfigRuntimeException, ProgramFl
 					boolean isVarArg = false;
 					if(this.names.length > i
 						|| (this.names.length != 0
-							&& this.isVarArgs[this.names.length - 1])) {
+							&& this.types[this.names.length - 1].isVariadicType())) {
 						String name;
 						if(i < this.names.length - 1
-								|| !this.isVarArgs[this.types.length - 1]) {
+								|| !this.types[this.types.length - 1].isVariadicType()) {
 							name = names[i];
 						} else {
 							name = this.names[this.names.length - 1];

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

@@ -54,7 +54,7 @@
 public final class LeftHandSideType extends Construct implements SourceType {
 
 	/**
-	 * Merges the inputs to create a single type union class.For instance, if {@code int | string} and
+	 * Merges the inputs to create a single type union class. For instance, if {@code int | string} and
 	 * {@code array | string} are passed in, the resulting type would be {@code int | string | array}. Note that for
 	 * subtypes with generic parameters, these are not merged unless they are completely equal.
 	 *
@@ -764,4 +764,24 @@ public boolean isVariadicType() {
 		return isVariadicType;
 	}
 
+	/**
+	 * Returns the base type of this variadic type, with generics preserved but the variadic flag removed.
+	 * For instance, {@code myclass<a>...} returns {@code myclass<a>}.
+	 * @return The base {@link LeftHandSideType} of this type.
+	 * @throws IllegalStateException If this is not a variadic type.
+	 */
+	public LeftHandSideType getVarargsBaseType() throws IllegalStateException {
+		if(!this.isVariadicType) {
+			throw new IllegalStateException("LeftHandSideType is not a vararg type.");
+		}
+		String newVal = val();
+		if(newVal.endsWith("...")) {
+			newVal = newVal.substring(0, newVal.length() - 3);
+		}
+		LeftHandSideType newType = new LeftHandSideType(newVal, getTarget(), null, types, isTypenameList,
+				genericTypeName, null);
+		newType.isVariadicType = false;
+		return newType;
+	}
+
 }

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

@@ -8,7 +8,19 @@
  */
 public interface SourceType extends Mixed {
 
+	/**
+	 * Returns true if this type was defined as a variadic type (i.e. `string ...`).
+	 *
+	 * @return
+	 */
 	boolean isVariadicType();
 
+	/**
+	 * For a non-variadic type, this returns a new instance as a variadic type (i.e. if this represents `string` then
+	 * `string ...` is returned).
+	 *
+	 * @param env
+	 * @return
+	 */
 	SourceType asVariadicType(Environment env);
 }

src/test/java/com/laytonsmith/core/constructs/LeftHandSideTypeTest.java

@@ -3,6 +3,7 @@
 import com.laytonsmith.core.Static;
 import com.laytonsmith.core.environments.Environment;
 import com.laytonsmith.core.natives.interfaces.Booleanish;
+import com.laytonsmith.testing.AbstractIntegrationTest;
 import com.laytonsmith.testing.StaticTest;
 import java.util.Arrays;
 import java.util.List;
@@ -13,7 +14,7 @@
 /**
  *
  */
-public class LeftHandSideTypeTest {
+public class LeftHandSideTypeTest extends AbstractIntegrationTest {
 
 	Environment env;