Haxe 4.1 compat

joshtynjala · joshtynjala · commit 962290198657 · 2022-08-26T10:19:48.000-07:00
diff --git a/README.md b/README.md
@@ -17,7 +17,7 @@ Includes the following validators:
 
 ## Minimum Requirements
 
-- Haxe 4.2
+- Haxe 4.1
 - OpenFL 9.2
 
 ## Installation
diff --git a/src/feathers/validators/DateValidator.hx b/src/feathers/validators/DateValidator.hx
@@ -858,7 +858,7 @@ class DateValidator extends Validator {
 		if (_yearSource == value)
 			return _yearSource;
 
-		if (value is String) {
+		if ((value is String)) {
 			var message:String = ValidatorStringUtil.substitute(YS_ATTRIBUTE_ERROR, value);
 			throw new Error(message);
 		}
diff --git a/src/feathers/validators/utils/ValidatorStringUtil.hx b/src/feathers/validators/utils/ValidatorStringUtil.hx
@@ -65,11 +65,22 @@ class ValidatorStringUtil {
 		@return New string with all of the `{n}` tokens
 		replaced with the respective arguments specified.
 	**/
-	public static function substitute(str:String, ...rest):String {
+	public static function substitute(str:String, #if (haxe_ver >= 4.2)...rest #else ?value1:String, ?value2:String, ?value3:String #end):String {
 		if (str == null) {
 			return '';
 		}
-
+		#if (haxe_ver < 4.2)
+		var rest:Array<String> = [];
+		if (value1 != null) {
+			rest.push(value1);
+			if (value2 != null) {
+				rest.push(value2);
+				if (value3 != null) {
+					rest.push(value3);
+				}
+			}
+		}
+		#end
 		// Replace all of the parameters in the msg string.
 		var len:UInt = rest.length;
 		var args:Array<String>;
@@ -79,11 +90,9 @@ class ValidatorStringUtil {
 		} else {
 			args = rest;
 		}
-
 		for (i in 0...len) {
 			str = new EReg("\\{" + i + "\\}", "g").replace(str, args[i]);
 		}
-
 		return str;
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -858,7 +858,7 @@ class DateValidator extends Validator {`
`858`	`858`	`if (_yearSource == value)`
`859`	`859`	`return _yearSource;`
`860`	`860`
`861`		`- if (value is String) {`
	`861`	`+ if ((value is String)) {`
`862`	`862`	`var message:String = ValidatorStringUtil.substitute(YS_ATTRIBUTE_ERROR, value);`
`863`	`863`	`throw new Error(message);`
`864`	`864`	`}`