Add methods to get Map and EReg sizes

src/macro/eval/evalStdLib.ml

@@ -916,6 +916,12 @@ module StdEReg = struct
 			vfalse
 		end
 	)
+
+	let matchedNum = vifun0 (fun vthis ->
+		let this = this vthis in
+		let substrings = if Array.length this.r_groups = 0 then exc_string "Invalid regex operation because no match was made" else this.r_groups.(0) in
+		vint (num_of_subs substrings)
+	)
 
 	let replace = vifun2 (fun vthis s by ->
 		let this = this vthis in
@@ -1546,6 +1552,10 @@ module StdIntMap = struct
 		IntHashtbl.clear (this vthis);
 		vnull
 	)
+
+	let size = vifun0 (fun vthis ->
+		vint (IntHashtbl.size (this vthis))
+	)
 end
 
 module StdStringMap = struct
@@ -1605,6 +1615,10 @@ module StdStringMap = struct
 		StringHashtbl.clear (this vthis);
 		vnull
 	)
+
+	let size = vifun0 (fun vthis ->
+		vint (StringHashtbl.size (this vthis))
+	)
 end
 
 module StdObjectMap = struct
@@ -1663,6 +1677,10 @@ module StdObjectMap = struct
 		ValueHashtbl.reset (this vthis);
 		vnull
 	)
+
+	let size = vifun0 (fun vthis ->
+		vint (ValueHashtbl.length (this vthis))
+	)
 end
 
 let random = Random.State.make_self_init()
@@ -3155,6 +3173,7 @@ let init_maps builtins =
 		"set",StdIntMap.set;
 		"toString",StdIntMap.toString;
 		"clear",StdIntMap.clear;
+		"size",StdIntMap.size;
 	];
 	init_fields builtins (["haxe";"ds"],"ObjectMap") [] [
 		"copy",StdObjectMap.copy;
@@ -3167,6 +3186,7 @@ let init_maps builtins =
 		"set",StdObjectMap.set;
 		"toString",StdObjectMap.toString;
 		"clear",StdObjectMap.clear;
+		"size",StdObjectMap.size;
 	];
 	init_fields builtins (["haxe";"ds"],"StringMap") [] [
 		"copy",StdStringMap.copy;
@@ -3179,6 +3199,7 @@ let init_maps builtins =
 		"set",StdStringMap.set;
 		"toString",StdStringMap.toString;
 		"clear",StdStringMap.clear;
+		"size",StdStringMap.size;
 	]
 
 let init_constructors builtins =
@@ -3450,6 +3471,7 @@ let init_standard_library builtins =
 		"matchedPos",StdEReg.matchedPos;
 		"matchedRight",StdEReg.matchedRight;
 		"matchSub",StdEReg.matchSub;
+		"matchedNum",StdEReg.matchedNum;
 		"replace",StdEReg.replace;
 		"split",StdEReg.split;
 	];

src/macro/eval/evalValue.ml

@@ -57,6 +57,7 @@ module StringHashtbl = struct
 	let mem this key = StringMap.mem key.sstring !this
 	let remove this key = this := StringMap.remove key.sstring !this
 	let clear this = this := StringMap.empty
+	let size this = StringMap.cardinal !this
 end
 
 module IntHashtbl = struct
@@ -72,6 +73,7 @@ module IntHashtbl = struct
 	let mem this key = Hashtbl.mem this key
 	let remove this key = Hashtbl.remove this key
 	let clear this = Hashtbl.clear this
+	let size this = Hashtbl.length this
 end
 
 type vregex = {

std/EReg.hx

@@ -133,6 +133,18 @@ class EReg {
 	public function matchSub(s:String, pos:Int, len:Int = -1):Bool {
 		return false;
 	}
+
+	/**
+		Returns the total number of groups captures by the last matched substring.
+
+		To stay consistent with `this.matched`, the matched substring is also
+		counted as a group.
+
+		If no substring has been matched, an error is thrown.
+	**/
+	public function matchedNum():Int {
+		return 0;
+	}
 
 	/**
 		Splits String `s` at all substrings `this` EReg matches.

std/cpp/_std/EReg.hx

@@ -70,6 +70,13 @@
 			last = null;
 		return p;
 	}
+
+	public function matchedNum():Int {
+		var num = _hx_regexp_matched_num(r);
+		if (num == -1)
+			throw "No string matched!";
+		return num;
+	}
 
 	public function split(s:String):Array<String> {
 		var pos = 0;

std/cpp/_std/haxe/ds/IntMap.hx

@@ -105,6 +105,10 @@ package haxe.ds;
 		h = null;
 		#end
 	}
+
+	public function size():Int {
+		return untyped __global__.__root_hash_size(h);
+	}
 
 	#if (scriptable)
 	private function setString(key:Int, val:String):Void {

std/cpp/_std/haxe/ds/ObjectMap.hx

@@ -105,6 +105,10 @@ class ObjectMap<K:{}, V> implements haxe.Constraints.IMap<K, V> {
 		h = null;
 		#end
 	}
+
+	public function size():Int {
+		return untyped __global__.__root_hash_size(h);
+	}
 
 	#if (scriptable)
 	private function setString(key:Dynamic, val:String):Void {

std/cpp/_std/haxe/ds/StringMap.hx

@@ -105,6 +105,10 @@ package haxe.ds;
 		h = null;
 		#end
 	}
+
+	public function size():Int {
+		return untyped __global__.__root_hash_size(h);
+	}
 
 	#if (scriptable)
 	private function setString(key:String, val:String):Void {

std/cpp/_std/haxe/ds/WeakMap.hx

@@ -98,4 +98,8 @@ class WeakMap<K:{}, V> implements haxe.Constraints.IMap<K, V> {
 		h = null;
 		#end
 	}
+
+	public function size():Int {
+		return untyped __global__.__root_hash_size(h);
+	}
 }

std/cs/_std/EReg.hx

@@ -77,6 +77,12 @@ import cs.system.text.regularexpressions.*;
 	public function matchedPos():{pos:Int, len:Int} {
 		return {pos: m.Index, len: m.Length};
 	}
+
+	public function matchedNum():Int {
+		if (m == null)
+			throw "No string matched";
+		return m.Groups.Count;
+	}
 
 	public function matchSub(s:String, pos:Int, len:Int = -1):Bool {
 		m = if (len < 0) regex.Match(s, pos) else regex.Match(s, pos, len);

std/cs/_std/haxe/ds/IntMap.hx

@@ -39,7 +39,7 @@ import cs.NativeArray;
 	private var vals:NativeArray<T>;
 
 	private var nBuckets:Int;
-	private var size:Int;
+	private var _size:Int;
 	private var nOccupied:Int;
 	private var upperBound:Int;
 
@@ -57,7 +57,7 @@ import cs.NativeArray;
 	public function set(key:Int, value:T):Void {
 		var targetIndex:Int;
 		if (nOccupied >= upperBound) {
-			if (nBuckets > (size << 1)) {
+			if (nBuckets > (_size << 1)) {
 				resize(nBuckets - 1); // clear "deleted" elements
 			} else {
 				resize(nBuckets + 1);
@@ -99,13 +99,13 @@ import cs.NativeArray;
 			_keys[targetIndex] = key;
 			vals[targetIndex] = value;
 			setIsBothFalse(flags, targetIndex);
-			size++;
+			_size++;
 			nOccupied++;
 		} else if (isDel(flag)) {
 			_keys[targetIndex] = key;
 			vals[targetIndex] = value;
 			setIsBothFalse(flags, targetIndex);
-			size++;
+			_size++;
 		} else {
 			#if debug
 			assert(_keys[targetIndex] == key);
@@ -223,7 +223,7 @@ import cs.NativeArray;
 			#end
 			if (!isEither(getFlag(flags, idx))) {
 				setIsDelTrue(flags, idx);
-				--size;
+				--_size;
 
 				vals[idx] = null;
 				// we do NOT reset the keys here, as unlike StringMap, we check for keys equality
@@ -245,10 +245,10 @@ import cs.NativeArray;
 			newNBuckets = roundUp(newNBuckets);
 			if (newNBuckets < 4)
 				newNBuckets = 4;
-			if (size >= (newNBuckets * HASH_UPPER + 0.5))
-				/* requested size is too small */ {
+			if (_size >= (newNBuckets * HASH_UPPER + 0.5))
+				/* requested _size is too small */ {
 				j = 0;
-			} else { /* hash table size to be changed (shrink or expand); rehash */
+			} else { /* hash table _size to be changed (shrink or expand); rehash */
 				var nfSize = flagsSize(newNBuckets);
 				newFlags = new NativeArray(nfSize);
 				for (i in 0...nfSize) {
@@ -338,7 +338,7 @@ import cs.NativeArray;
 
 			this.flags = newFlags;
 			this.nBuckets = newNBuckets;
-			this.nOccupied = size;
+			this.nOccupied = _size;
 			this.upperBound = Std.int(newNBuckets * HASH_UPPER + .5);
 		}
 	}
@@ -382,14 +382,18 @@ import cs.NativeArray;
 		_keys = null;
 		vals = null;
 		nBuckets = 0;
-		size = 0;
+		_size = 0;
 		nOccupied = 0;
 		upperBound = 0;
 		#if !no_map_cache
 		cachedKey = 0;
 		cachedIndex = -1;
 		#end
 	}
+
+	public inline function size():Int {
+		return _size;
+	}
 
 	private static inline function assert(x:Bool):Void {
 		#if debug

std/cs/_std/haxe/ds/ObjectMap.hx

@@ -68,7 +68,7 @@ import cs.NativeArray;
 	public function set(key:K, value:V):Void {
 		var x:Int, k:Int;
 		if (nOccupied >= upperBound) {
-			if (nBuckets > (size << 1))
+			if (nBuckets > (_size << 1))
 				resize(nBuckets - 1); // clear "deleted" elements
 			else
 				resize(nBuckets + 2);
@@ -117,13 +117,13 @@ import cs.NativeArray;
 			keys[x] = key;
 			vals[x] = value;
 			hashes[x] = k;
-			size++;
+			_size++;
 			nOccupied++;
 		} else if (isDel(flag)) {
 			keys[x] = key;
 			vals[x] = value;
 			hashes[x] = k;
-			size++;
+			_size++;
 		} else {
 			assert(_keys[x] == key);
 			vals[x] = value;
@@ -171,10 +171,10 @@ import cs.NativeArray;
 			newNBuckets = roundUp(newNBuckets);
 			if (newNBuckets < 4)
 				newNBuckets = 4;
-			if (size >= (newNBuckets * HASH_UPPER + 0.5))
-				/* requested size is too small */ {
+			if (_size >= (newNBuckets * HASH_UPPER + 0.5))
+				/* requested _size is too small */ {
 				j = 0;
-			} else { /* hash table size to be changed (shrink or expand); rehash */
+			} else { /* hash table _size to be changed (shrink or expand); rehash */
 				var nfSize = newNBuckets;
 				newHash = new NativeArray(nfSize);
 				if (nBuckets < newNBuckets) // expand
@@ -263,7 +263,7 @@ import cs.NativeArray;
 
 			this.hashes = newHash;
 			this.nBuckets = newNBuckets;
-			this.nOccupied = size;
+			this.nOccupied = _size;
 			this.upperBound = Std.int(newNBuckets * HASH_UPPER + .5);
 		}
 	}
@@ -351,7 +351,7 @@ import cs.NativeArray;
 			hashes[idx] = FLAG_DEL;
 			_keys[idx] = null;
 			vals[idx] = null;
-			--size;
+			--_size;
 
 			return true;
 		}
@@ -396,7 +396,7 @@ import cs.NativeArray;
 		_keys = null;
 		vals = null;
 		nBuckets = 0;
-		size = 0;
+		_size = 0;
 		nOccupied = 0;
 		upperBound = 0;
 		#if !no_map_cache
@@ -410,6 +410,10 @@ import cs.NativeArray;
 		maxProbe = 0;
 		#end
 	}
+
+	public inline function size():Int {
+		return _size;
+	}
 
 	extern private static inline function roundUp(x:Int):Int {
 		--x;