fix for haxe 3.1

Author: Misha Vakulich

src/Dynamics.hx

@@ -1,5 +1,6 @@
 import thx.culture.Culture;
 import thx.error.Error;
+import haxe.Constraints;
 
 /**
  * ...
@@ -266,10 +267,10 @@ class Dynamics
 					return untyped a.getTime() == b.getTime();
 
 				// hash, inthash
-				if (Std.is(a, Hash) || Std.is(a, IntHash))
+				if (Std.is(a, IMap))
 				{
-					var ha : Hash<Dynamic> = cast a,
-						hb : Hash<Dynamic> = cast b;
+					var ha : Map<Dynamic, Dynamic> = cast a,
+						hb : Map<Dynamic, Dynamic> = cast b;
 					var ka = Iterators.array(ha.keys()),
 						kb = Iterators.array(hb.keys());
 					if (ka.length != kb.length)

src/Ints.hx

@@ -109,5 +109,5 @@ class Ints
 		return Std.parseInt(s);
 	}
 
-	inline public static function compare(a : Int, b : Int) return a - b
+	inline public static function compare(a : Int, b : Int) return a - b;
 }

src/Objects.hx

@@ -59,13 +59,13 @@ class Objects
 		return ob;
 	}
 
-	public static function toHash<T>(ob : {}) : Hash<T>
+	public static function toHash<T>(ob : {}) : Map<String, T>
 	{
-		var hash = new Hash();
+		var hash = new Map<String, T>();
 		return copyToHash(ob, hash);
 	}
 
-	public static function copyToHash<T>(ob : {}, hash : Hash<T>) : Hash<T>
+	public static function copyToHash<T>(ob : {}, hash : Map<String, T>) : Map<String, T>
 	{
 		for (field in Reflect.fields(ob))
 			hash.set(field, Reflect.field(ob, field));
@@ -123,7 +123,7 @@ class Objects
 		return dst;
 	}
 
-	public static function clone<T>(src : T) : T
+	public static function clone<T:{}>(src : T) : T
 	{
 		var dst = { };
 		return cast copyTo(src, dst);

src/Strings.hx

@@ -107,7 +107,7 @@ C           Concats the elements of the list
 Other things to do. Nested placeholders
 </pre>
 	*/
-	public static function format(pattern : String, values : Array<Dynamic>, nullstring = 'null', ?culture : Culture) {
+	public static function format(pattern : String, values : Array<Dynamic>, nullstring = 'null', ?culture : Culture): String {
 		if (null == values || 0 == values.length)
 			return pattern;
 		return formatf(pattern, nullstring, culture)(values);
@@ -140,14 +140,14 @@ Other things to do. Nested placeholders
 			var left = _reFormat.matchedLeft();
 			buf.push(function(_) return left);
 			var df = Dynamics.formatf(format, params, nullstring, culture);
-			buf.push(callback(function(i : Int, v : Array<Dynamic>) return df(v[i]), pos));
+			buf.push((function(i : Int, v : Array<Dynamic>):String return df(v[i])).bind(pos, _));
 			pattern = _reFormat.matchedRight();
 		}
-		return function(values : Array<Dynamic>)
+		return function(values : Array<Dynamic>) : String
 		{
 			if (null == values)
 				values = [];
-			return buf.map(function(df,_) return df(values)).join("");
+			return buf.map(function(df) return df(values)).join("");
 		}
 	}
 
@@ -287,7 +287,7 @@ Other things to do. Nested placeholders
 
 	public static function ucwords(value : String) : String
 	{
-		return __ucwordsPattern.customReplace(ucfirst(value), __upperMatch);
+		return __ucwordsPattern.map(ucfirst(value), __upperMatch);
 	}
 
 	/**
@@ -300,7 +300,7 @@ Other things to do. Nested placeholders
 #if php
 		return untyped __call__("ucwords", value);
 #else
-		return __ucwordswsPattern.customReplace(ucfirst(value), __upperMatch);
+		return __ucwordswsPattern.map(ucfirst(value), __upperMatch);
 #end
 	}
 
@@ -561,5 +561,5 @@ Other things to do. Nested placeholders
 		}
 	}
 
-	public static function compare(a : String, b : String) return a < b ? -1 : a > b ? 1 : 0
+	public static function compare(a : String, b : String) return a < b ? -1 : a > b ? 1 : 0;
 }

src/thx/culture/FormatParams.hx

@@ -1,5 +1,5 @@
 package thx.culture;
-
+ import Lambda;
 /**
  * ...
  * @author Franco Ponticelli
@@ -29,8 +29,16 @@ class FormatParams
 			return [alt];
 		if (null == ps || ps.length == 0)
 		{
+
 			var parts = p.split(":");
-			return [parts[0]].concat(parts.length == 1 ? [] : parts[1].split(",").map(function(s, i) if (0 == i) return s else return cleanQuotes(s)));
+			if (parts.length > 1) {
+				var mapFunc = (function(i, s): String if (0 == i) return s else return cleanQuotes(s));
+				var rest = Lambda.mapi(parts[1].split(","), mapFunc);
+				return [parts[0]].concat(Lambda.array(rest));
+			} else {
+				return [parts[0]];
+			}
+
 		}
 		return ps;
 	}

src/thx/translation/ITranslation.hx

@@ -2,7 +2,7 @@ package thx.translation;
 
 interface ITranslation
 {
-	public var domain(getDomain, setDomain) : String;
+	public var domain(get_domain, set_domain) : String;
 	public function singular(id : String, ?domain : String) : String;
 	public function plural(ids : String, idp : String, quantifier : Int, ?domain : String) : String;
 }