Reverse the order of the getBooleanValue parameters.

LadyCailin · LadyCailin · commit 4af691d207b1 · 2026-02-21T19:02:29.000+01:00
diff --git a/src/main/java/com/laytonsmith/core/constructs/CArray.java b/src/main/java/com/laytonsmith/core/constructs/CArray.java
@@ -557,6 +557,9 @@ public final Mixed get(long index, Target t) {
 	}
 
 	public final Mixed get(long index, Target t, Environment env) {
+		if((int) index != index) {
+			throw new CREIndexOverflowException("The element at index \"" + index + "\" does not exist", t);
+		}
 		return this.get(new CInt(index, t), t, env);
 	}
 
@@ -1177,15 +1180,15 @@ public CClassType[] getInterfaces() {
 			ArrayAccessSet.TYPE};
 	}
 
-	/** @deprecated Use {@link #getBooleanValue(Environment, Target)} instead. */
+	/** @deprecated Use {@link #getBooleanValue(Target, Environment)} instead. */
 	@Deprecated
 	@Override
 	public boolean getBooleanValue(Target t) {
-		return getBooleanValue(null, t);
+		return getBooleanValue(t, null);
 	}
 
 	@Override
-	public boolean getBooleanValue(Environment env, Target t) {
+	public boolean getBooleanValue(Target t, Environment env) {
 		return size(env) > 0;
 	}
 
diff --git a/src/main/java/com/laytonsmith/core/constructs/CBoolean.java b/src/main/java/com/laytonsmith/core/constructs/CBoolean.java
@@ -90,15 +90,15 @@ public boolean getBoolean() {
 		return val;
 	}
 
-	/** @deprecated Use {@link #getBooleanValue(Environment, Target)} instead. */
+	/** @deprecated Use {@link #getBooleanValue(Target, Environment)} instead. */
 	@Deprecated
 	@Override
 	public boolean getBooleanValue(Target t) {
-		return getBooleanValue(null, t);
+		return getBooleanValue(t, null);
 	}
 
 	@Override
-	public boolean getBooleanValue(Environment env, Target t) {
+	public boolean getBooleanValue(Target t, Environment env) {
 		return val;
 	}
 
diff --git a/src/main/java/com/laytonsmith/core/constructs/CClassType.java b/src/main/java/com/laytonsmith/core/constructs/CClassType.java
@@ -719,15 +719,15 @@ public Class<? extends Mixed> getNativeType() {
 		return nativeClass;
 	}
 
-	/** @deprecated Use {@link #getBooleanValue(Environment, Target)} instead. */
+	/** @deprecated Use {@link #getBooleanValue(Target, Environment)} instead. */
 	@Deprecated
 	@Override
 	public boolean getBooleanValue(Target t) {
-		return getBooleanValue(null, t);
+		return getBooleanValue(t, null);
 	}
 
 	@Override
-	public boolean getBooleanValue(Environment env, Target t) {
+	public boolean getBooleanValue(Target t, Environment env) {
 		return true;
 	}
 
diff --git a/src/main/java/com/laytonsmith/core/constructs/CClosure.java b/src/main/java/com/laytonsmith/core/constructs/CClosure.java
@@ -350,15 +350,15 @@ public CClassType[] getInterfaces() {
 		return new CClassType[]{Callable.TYPE, Booleanish.TYPE};
 	}
 
-	/** @deprecated Use {@link #getBooleanValue(Environment, Target)} instead. */
+	/** @deprecated Use {@link #getBooleanValue(Target, Environment)} instead. */
 	@Deprecated
 	@Override
 	public boolean getBooleanValue(Target t) {
-		return getBooleanValue(null, t);
+		return getBooleanValue(t, null);
 	}
 
 	@Override
-	public boolean getBooleanValue(Environment env, Target t) {
+	public boolean getBooleanValue(Target t, Environment env) {
 		return true;
 	}
 }
diff --git a/src/main/java/com/laytonsmith/core/constructs/CDecimal.java b/src/main/java/com/laytonsmith/core/constructs/CDecimal.java
@@ -84,15 +84,15 @@ public CDecimal duplicate() {
 		return new CDecimal(val, getTarget());
 	}
 
-	/** @deprecated Use {@link #getBooleanValue(Environment, Target)} instead. */
+	/** @deprecated Use {@link #getBooleanValue(Target, Environment)} instead. */
 	@Deprecated
 	@Override
 	public boolean getBooleanValue(Target t) {
-		return getBooleanValue(null, t);
+		return getBooleanValue(t, null);
 	}
 
 	@Override
-	public boolean getBooleanValue(Environment env, Target t) {
+	public boolean getBooleanValue(Target t, Environment env) {
 		return val.compareTo(new BigDecimal(0)) != 0;
 	}
 
diff --git a/src/main/java/com/laytonsmith/core/constructs/CFixedArray.java b/src/main/java/com/laytonsmith/core/constructs/CFixedArray.java
@@ -152,15 +152,15 @@ public Mixed slice(int begin, int end, Target t, Environment env) {
 		throw new CREUnsupportedOperationException("slices are not yet implemented on fixed_array", t);
 	}
 
-	/** @deprecated Use {@link #getBooleanValue(Environment, Target)} instead. */
+	/** @deprecated Use {@link #getBooleanValue(Target, Environment)} instead. */
 	@Deprecated
 	@Override
 	public boolean getBooleanValue(Target t) {
-		return getBooleanValue(null, t);
+		return getBooleanValue(t, null);
 	}
 
 	@Override
-	public boolean getBooleanValue(Environment env, Target t) {
+	public boolean getBooleanValue(Target t, Environment env) {
 		return size(env) > 0;
 	}
 
diff --git a/src/main/java/com/laytonsmith/core/constructs/CNull.java b/src/main/java/com/laytonsmith/core/constructs/CNull.java
@@ -107,15 +107,15 @@ public CClassType[] getInterfaces() {
 		throw new RuntimeException("Cannot call getInterfaces on null");
 	}
 
-	/** @deprecated Use {@link #getBooleanValue(Environment, Target)} instead. */
+	/** @deprecated Use {@link #getBooleanValue(Target, Environment)} instead. */
 	@Deprecated
 	@Override
 	public boolean getBooleanValue(Target t) {
-		return getBooleanValue(null, t);
+		return getBooleanValue(t, null);
 	}
 
 	@Override
-	public boolean getBooleanValue(Environment env, Target t) {
+	public boolean getBooleanValue(Target t, Environment env) {
 		return false;
 	}
 
diff --git a/src/main/java/com/laytonsmith/core/constructs/CNumber.java b/src/main/java/com/laytonsmith/core/constructs/CNumber.java
@@ -42,15 +42,15 @@ public Version since() {
 
 	public abstract double getNumber();
 
-	/** @deprecated Use {@link #getBooleanValue(Environment, Target)} instead. */
+	/** @deprecated Use {@link #getBooleanValue(Target, Environment)} instead. */
 	@Deprecated
 	@Override
 	public boolean getBooleanValue(Target t) {
-		return getBooleanValue(null, t);
+		return getBooleanValue(t, null);
 	}
 
 	@Override
-	public boolean getBooleanValue(Environment env, Target t) {
+	public boolean getBooleanValue(Target t, Environment env) {
 		return getNumber() != 0.0;
 	}
 }
diff --git a/src/main/java/com/laytonsmith/core/constructs/CReal2dMatrix.java b/src/main/java/com/laytonsmith/core/constructs/CReal2dMatrix.java
@@ -210,15 +210,15 @@ public Set<Mixed> keySet(Environment env) {
 		return set;
 	}
 
-	/** @deprecated Use {@link #getBooleanValue(Environment, Target)} instead. */
+	/** @deprecated Use {@link #getBooleanValue(Target, Environment)} instead. */
 	@Deprecated
 	@Override
 	public boolean getBooleanValue(Target t) {
-		return getBooleanValue(null, t);
+		return getBooleanValue(t, null);
 	}
 
 	@Override
-	public boolean getBooleanValue(Environment env, Target t) {
+	public boolean getBooleanValue(Target t, Environment env) {
 		return data.length != 0;
 	}
 
diff --git a/src/main/java/com/laytonsmith/core/constructs/CReal2dMatrixRow.java b/src/main/java/com/laytonsmith/core/constructs/CReal2dMatrixRow.java
@@ -136,15 +136,15 @@ public Mixed slice(int begin, int end, Target t, Environment env) {
 		return ret;
 	}
 
-	/** @deprecated Use {@link #getBooleanValue(Environment, Target)} instead. */
+	/** @deprecated Use {@link #getBooleanValue(Target, Environment)} instead. */
 	@Deprecated
 	@Override
 	public boolean getBooleanValue(Target t) {
-		return getBooleanValue(null, t);
+		return getBooleanValue(t, null);
 	}
 
 	@Override
-	public boolean getBooleanValue(Environment env, Target t) {
+	public boolean getBooleanValue(Target t, Environment env) {
 		// 0 dimension matrices are not possible, so this will
 		// always have at least one value in it, thus always
 		// true.
diff --git a/src/main/java/com/laytonsmith/core/constructs/CString.java b/src/main/java/com/laytonsmith/core/constructs/CString.java
@@ -217,15 +217,15 @@ public CString duplicate() {
 		return new CString(val(), getTarget());
 	}
 
-	/** @deprecated Use {@link #getBooleanValue(Environment, Target)} instead. */
+	/** @deprecated Use {@link #getBooleanValue(Target, Environment)} instead. */
 	@Deprecated
 	@Override
 	public boolean getBooleanValue(Target t) {
-		return getBooleanValue(null, t);
+		return getBooleanValue(t, null);
 	}
 
 	@Override
-	public boolean getBooleanValue(Environment env, Target t) {
+	public boolean getBooleanValue(Target t, Environment env) {
 		if(val().equals("false")) {
 			MSLog.GetLogger().e(MSLog.Tags.FALSESTRING, "String \"false\" evaluates as true (non-empty strings are"
 					+ " true). This is most likely not what you meant to do. This warning can globally be disabled"
diff --git a/src/main/java/com/laytonsmith/core/exceptions/CRE/AbstractCREException.java b/src/main/java/com/laytonsmith/core/exceptions/CRE/AbstractCREException.java
@@ -365,15 +365,15 @@ public GenericParameters getGenericParameters() {
 		return null;
 	}
 
-	/** @deprecated Use {@link #getBooleanValue(Environment, Target)} instead. */
+	/** @deprecated Use {@link #getBooleanValue(Target, Environment)} instead. */
 	@Deprecated
 	@Override
 	public boolean getBooleanValue(Target t) {
-		return getBooleanValue(null, t);
+		return getBooleanValue(t, null);
 	}
 
 	@Override
-	public boolean getBooleanValue(Environment env, Target t) {
+	public boolean getBooleanValue(Target t, Environment env) {
 		return true;
 	}
 
diff --git a/src/main/java/com/laytonsmith/core/natives/interfaces/Booleanish.java b/src/main/java/com/laytonsmith/core/natives/interfaces/Booleanish.java
@@ -28,18 +28,26 @@ public interface Booleanish extends Mixed {
 	 * @param t The code target, in case there are errors that are thrown, the correct target can be provided in the
 	 * error.
 	 * @return True if the value is trueish, false if it is falseish.
-	 * @deprecated Use {@link #getBooleanValue(Environment, Target)} instead.
+	 * @deprecated Use {@link #getBooleanValue(Target, Environment)} instead.
 	 */
 	@Deprecated
 	boolean getBooleanValue(Target t);
 
 	/**
-	 * Returns true if this value is a trueish value, with environment context.
+	 * Returns true if this value is a trueish value. Each implementation is free to define this as they wish. In
+	 * general, code that supports Booleanish values should not use this method directly, use
+	 * {@link ArgumentValidation#getBooleanish(com.laytonsmith.core.natives.interfaces.Mixed,
+	 * com.laytonsmith.core.constructs.Target)}, which ensures that the error message, if this is not an actual
+	 * Booleanish value, is standardized. In general, methods should not accept a Booleanish value (with some critical
+	 * exceptions, such as if(), for(), etc) as in the future, this will prevent functions from being fully strongly
+	 * typed in strict mode. In non-strict mode (or strict mode with the auto keyword) Booleanish types will be cross
+	 * cast to a boolean first anyways, so there is no point in accepting Booleanish values.
 	 *
+	 * @param t The code target, in case there are errors that are thrown, the correct target can be provided in the
+	 * error.
 	 * @param env The environment.
-	 * @param t The code target.
 	 * @return True if the value is trueish, false if it is falseish.
 	 */
-	boolean getBooleanValue(Environment env, Target t);
+	boolean getBooleanValue(Target t, Environment env);
 
 }
diff --git a/src/main/java/com/laytonsmith/core/natives/interfaces/MEnumType.java b/src/main/java/com/laytonsmith/core/natives/interfaces/MEnumType.java
@@ -363,15 +363,15 @@ public int size() {
 				};
 			}
 
-			/** @deprecated Use {@link #getBooleanValue(Environment, Target)} instead. */
+			/** @deprecated Use {@link #getBooleanValue(Target, Environment)} instead. */
 			@Deprecated
 			@Override
 			public boolean getBooleanValue(Target t) {
-				return getBooleanValue(null, t);
+				return getBooleanValue(t, null);
 			}
 
 			@Override
-			public boolean getBooleanValue(Environment env, Target t) {
+			public boolean getBooleanValue(Target t, Environment env) {
 				return true;
 			}
 
@@ -630,15 +630,15 @@ public Mixed slice(int begin, int end, Target t, Environment env) {
 	 */
 	protected abstract List<MEnumTypeValue> getValues();
 
-	/** @deprecated Use {@link #getBooleanValue(Environment, Target)} instead. */
+	/** @deprecated Use {@link #getBooleanValue(Target, Environment)} instead. */
 	@Deprecated
 	@Override
 	public boolean getBooleanValue(Target t) {
-		return getBooleanValue(null, t);
+		return getBooleanValue(t, null);
 	}
 
 	@Override
-	public boolean getBooleanValue(Environment env, Target t) {
+	public boolean getBooleanValue(Target t, Environment env) {
 		return true;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -557,6 +557,9 @@ public final Mixed get(long index, Target t) {`
`557`	`557`	`}`
`558`	`558`
`559`	`559`	`public final Mixed get(long index, Target t, Environment env) {`
	`560`	`+ if((int) index != index) {`
	`561`	`+ throw new CREIndexOverflowException("The element at index \"" + index + "\" does not exist", t);`
	`562`	`+ }`
`560`	`563`	`return this.get(new CInt(index, t), t, env);`
`561`	`564`	`}`
`562`	`565`
`@@ -1177,15 +1180,15 @@ public CClassType[] getInterfaces() {`
`1177`	`1180`	`ArrayAccessSet.TYPE};`
`1178`	`1181`	`}`
`1179`	`1182`
`1180`		`- /** @deprecated Use {@link #getBooleanValue(Environment, Target)} instead. */`
	`1183`	`+ /** @deprecated Use {@link #getBooleanValue(Target, Environment)} instead. */`
`1181`	`1184`	`@Deprecated`
`1182`	`1185`	`@Override`
`1183`	`1186`	`public boolean getBooleanValue(Target t) {`
`1184`		`- return getBooleanValue(null, t);`
	`1187`	`+ return getBooleanValue(t, null);`
`1185`	`1188`	`}`
`1186`	`1189`
`1187`	`1190`	`@Override`
`1188`		`- public boolean getBooleanValue(Environment env, Target t) {`
	`1191`	`+ public boolean getBooleanValue(Target t, Environment env) {`
`1189`	`1192`	`return size(env) > 0;`
`1190`	`1193`	`}`
`1191`	`1194`
Original file line number	Diff line number	Diff line change
`@@ -90,15 +90,15 @@ public boolean getBoolean() {`
`90`	`90`	`return val;`
`91`	`91`	`}`
`92`	`92`
`93`		`- /** @deprecated Use {@link #getBooleanValue(Environment, Target)} instead. */`
	`93`	`+ /** @deprecated Use {@link #getBooleanValue(Target, Environment)} instead. */`
`94`	`94`	`@Deprecated`
`95`	`95`	`@Override`
`96`	`96`	`public boolean getBooleanValue(Target t) {`
`97`		`- return getBooleanValue(null, t);`
	`97`	`+ return getBooleanValue(t, null);`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`@Override`
`101`		`- public boolean getBooleanValue(Environment env, Target t) {`
	`101`	`+ public boolean getBooleanValue(Target t, Environment env) {`
`102`	`102`	`return val;`
`103`	`103`	`}`
`104`	`104`
Original file line number	Diff line number	Diff line change
`@@ -719,15 +719,15 @@ public Class<? extends Mixed> getNativeType() {`
`719`	`719`	`return nativeClass;`
`720`	`720`	`}`
`721`	`721`
`722`		`- /** @deprecated Use {@link #getBooleanValue(Environment, Target)} instead. */`
	`722`	`+ /** @deprecated Use {@link #getBooleanValue(Target, Environment)} instead. */`
`723`	`723`	`@Deprecated`
`724`	`724`	`@Override`
`725`	`725`	`public boolean getBooleanValue(Target t) {`
`726`		`- return getBooleanValue(null, t);`
	`726`	`+ return getBooleanValue(t, null);`
`727`	`727`	`}`
`728`	`728`
`729`	`729`	`@Override`
`730`		`- public boolean getBooleanValue(Environment env, Target t) {`
	`730`	`+ public boolean getBooleanValue(Target t, Environment env) {`
`731`	`731`	`return true;`
`732`	`732`	`}`
`733`	`733`
Original file line number	Diff line number	Diff line change
`@@ -350,15 +350,15 @@ public CClassType[] getInterfaces() {`
`350`	`350`	`return new CClassType[]{Callable.TYPE, Booleanish.TYPE};`
`351`	`351`	`}`
`352`	`352`
`353`		`- /** @deprecated Use {@link #getBooleanValue(Environment, Target)} instead. */`
	`353`	`+ /** @deprecated Use {@link #getBooleanValue(Target, Environment)} instead. */`
`354`	`354`	`@Deprecated`
`355`	`355`	`@Override`
`356`	`356`	`public boolean getBooleanValue(Target t) {`
`357`		`- return getBooleanValue(null, t);`
	`357`	`+ return getBooleanValue(t, null);`
`358`	`358`	`}`
`359`	`359`
`360`	`360`	`@Override`
`361`		`- public boolean getBooleanValue(Environment env, Target t) {`
	`361`	`+ public boolean getBooleanValue(Target t, Environment env) {`
`362`	`362`	`return true;`
`363`	`363`	`}`
`364`	`364`	`}`
Original file line number	Diff line number	Diff line change
`@@ -84,15 +84,15 @@ public CDecimal duplicate() {`
`84`	`84`	`return new CDecimal(val, getTarget());`
`85`	`85`	`}`
`86`	`86`
`87`		`- /** @deprecated Use {@link #getBooleanValue(Environment, Target)} instead. */`
	`87`	`+ /** @deprecated Use {@link #getBooleanValue(Target, Environment)} instead. */`
`88`	`88`	`@Deprecated`
`89`	`89`	`@Override`
`90`	`90`	`public boolean getBooleanValue(Target t) {`
`91`		`- return getBooleanValue(null, t);`
	`91`	`+ return getBooleanValue(t, null);`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`@Override`
`95`		`- public boolean getBooleanValue(Environment env, Target t) {`
	`95`	`+ public boolean getBooleanValue(Target t, Environment env) {`
`96`	`96`	`return val.compareTo(new BigDecimal(0)) != 0;`
`97`	`97`	`}`
`98`	`98`
Original file line number	Diff line number	Diff line change
`@@ -152,15 +152,15 @@ public Mixed slice(int begin, int end, Target t, Environment env) {`
`152`	`152`	`throw new CREUnsupportedOperationException("slices are not yet implemented on fixed_array", t);`
`153`	`153`	`}`
`154`	`154`
`155`		`- /** @deprecated Use {@link #getBooleanValue(Environment, Target)} instead. */`
	`155`	`+ /** @deprecated Use {@link #getBooleanValue(Target, Environment)} instead. */`
`156`	`156`	`@Deprecated`
`157`	`157`	`@Override`
`158`	`158`	`public boolean getBooleanValue(Target t) {`
`159`		`- return getBooleanValue(null, t);`
	`159`	`+ return getBooleanValue(t, null);`
`160`	`160`	`}`
`161`	`161`
`162`	`162`	`@Override`
`163`		`- public boolean getBooleanValue(Environment env, Target t) {`
	`163`	`+ public boolean getBooleanValue(Target t, Environment env) {`
`164`	`164`	`return size(env) > 0;`
`165`	`165`	`}`
`166`	`166`
Original file line number	Diff line number	Diff line change
`@@ -107,15 +107,15 @@ public CClassType[] getInterfaces() {`
`107`	`107`	`throw new RuntimeException("Cannot call getInterfaces on null");`
`108`	`108`	`}`
`109`	`109`
`110`		`- /** @deprecated Use {@link #getBooleanValue(Environment, Target)} instead. */`
	`110`	`+ /** @deprecated Use {@link #getBooleanValue(Target, Environment)} instead. */`
`111`	`111`	`@Deprecated`
`112`	`112`	`@Override`
`113`	`113`	`public boolean getBooleanValue(Target t) {`
`114`		`- return getBooleanValue(null, t);`
	`114`	`+ return getBooleanValue(t, null);`
`115`	`115`	`}`
`116`	`116`
`117`	`117`	`@Override`
`118`		`- public boolean getBooleanValue(Environment env, Target t) {`
	`118`	`+ public boolean getBooleanValue(Target t, Environment env) {`
`119`	`119`	`return false;`
`120`	`120`	`}`
`121`	`121`
Original file line number	Diff line number	Diff line change
`@@ -42,15 +42,15 @@ public Version since() {`
`42`	`42`
`43`	`43`	`public abstract double getNumber();`
`44`	`44`
`45`		`- /** @deprecated Use {@link #getBooleanValue(Environment, Target)} instead. */`
	`45`	`+ /** @deprecated Use {@link #getBooleanValue(Target, Environment)} instead. */`
`46`	`46`	`@Deprecated`
`47`	`47`	`@Override`
`48`	`48`	`public boolean getBooleanValue(Target t) {`
`49`		`- return getBooleanValue(null, t);`
	`49`	`+ return getBooleanValue(t, null);`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`@Override`
`53`		`- public boolean getBooleanValue(Environment env, Target t) {`
	`53`	`+ public boolean getBooleanValue(Target t, Environment env) {`
`54`	`54`	`return getNumber() != 0.0;`
`55`	`55`	`}`
`56`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -210,15 +210,15 @@ public Set<Mixed> keySet(Environment env) {`
`210`	`210`	`return set;`
`211`	`211`	`}`
`212`	`212`
`213`		`- /** @deprecated Use {@link #getBooleanValue(Environment, Target)} instead. */`
	`213`	`+ /** @deprecated Use {@link #getBooleanValue(Target, Environment)} instead. */`
`214`	`214`	`@Deprecated`
`215`	`215`	`@Override`
`216`	`216`	`public boolean getBooleanValue(Target t) {`
`217`		`- return getBooleanValue(null, t);`
	`217`	`+ return getBooleanValue(t, null);`
`218`	`218`	`}`
`219`	`219`
`220`	`220`	`@Override`
`221`		`- public boolean getBooleanValue(Environment env, Target t) {`
	`221`	`+ public boolean getBooleanValue(Target t, Environment env) {`
`222`	`222`	`return data.length != 0;`
`223`	`223`	`}`
`224`	`224`