Map toString brackets (#9260)

* Map toString brackets

* azure, please

* Fix macro

* Revert "azure, please"

This reverts commit 3e1d9a0.

* Run tests on custom hxcpp branch

* Revert "Run tests on custom hxcpp branch"

This reverts commit faa9fe8.

---------

Co-authored-by: Simon Krajewski <simon@haxe.org>

src/macro/eval/evalStdLib.ml

@@ -1543,7 +1543,7 @@ module StdIntMap = struct
 		let l = IntHashtbl.fold (fun key vvalue acc ->
 			(join empty_string [create_ascii (string_of_int key); create_ascii " => "; s_value 0 vvalue]) :: acc) this [] in
 		let s = join rcomma l in
-		let s = join empty_string [rbropen;s;rbrclose] in
+		let s = join empty_string [rbkopen;s;rbkclose] in
 		vstring s
 	)
 
@@ -1602,7 +1602,7 @@ module StdStringMap = struct
 		let l = StringHashtbl.fold (fun _ (key,vvalue) acc ->
 			(join empty_string [key; create_ascii " => "; s_value 0 vvalue]) :: acc) this [] in
 		let s = join rcomma l in
-		let s = join empty_string [rbropen;s;rbrclose] in
+		let s = join empty_string [rbkopen;s;rbkclose] in
 		vstring s
 	)
 
@@ -1660,7 +1660,7 @@ module StdObjectMap = struct
 		let l = ValueHashtbl.fold (fun key vvalue acc ->
 			(join empty_string [s_value 0 key; create_ascii " => "; s_value 0 vvalue]) :: acc) this [] in
 		let s = join rcomma l in
-		let s = join empty_string [rbropen;s;rbrclose] in
+		let s = join empty_string [rbkopen;s;rbkclose] in
 		vstring s
 	)
 
@@ -3840,4 +3840,4 @@ let init_standard_library builtins =
 	init_fields builtins (["eval";"luv";"_Prepare"], "Prepare_Impl_") EvalLuv.prepare_fields [];
 	init_fields builtins (["eval";"luv";"_Check"], "Check_Impl_") EvalLuv.check_fields [];
 	init_fields builtins (["eval";"luv"], "Version") EvalLuv.version_fields [];
-	EvalSsl.init_fields init_fields builtins
+	EvalSsl.init_fields init_fields builtins

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

@@ -364,7 +364,7 @@ import cs.NativeArray;
 
 	public function toString():String {
 		var s = new StringBuf();
-		s.add("{");
+		s.add("[");
 		var it = keys();
 		for (i in it) {
 			s.add(i);
@@ -373,7 +373,7 @@ import cs.NativeArray;
 			if (it.hasNext())
 				s.add(", ");
 		}
-		s.add("}");
+		s.add("]");
 		return s.toString();
 	}
 

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

@@ -378,7 +378,7 @@ import cs.NativeArray;
 
 	public function toString():String {
 		var s = new StringBuf();
-		s.add("{");
+		s.add("[");
 		var it = keys();
 		for (i in it) {
 			s.add(Std.string(i));
@@ -387,7 +387,7 @@ import cs.NativeArray;
 			if (it.hasNext())
 				s.add(", ");
 		}
-		s.add("}");
+		s.add("]");
 		return s.toString();
 	}
 

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

@@ -377,7 +377,7 @@ import cs.NativeArray;
 
 	public function toString():String {
 		var s = new StringBuf();
-		s.add("{");
+		s.add("[");
 		var it = keys();
 		for (i in it) {
 			s.add(i);
@@ -386,7 +386,7 @@ import cs.NativeArray;
 			if (it.hasNext())
 				s.add(", ");
 		}
-		s.add("}");
+		s.add("]");
 		return s.toString();
 	}
 

std/cs/internal/HxObject.hx

@@ -230,7 +230,7 @@ class DynamicObject extends HxObject {
 		if (ts != null)
 			return ts();
 		var ret = new StringBuf();
-		ret.add("{");
+		ret.add("[");
 		var first = true;
 		for (f in Reflect.fields(this)) {
 			if (first)
@@ -244,7 +244,7 @@ class DynamicObject extends HxObject {
 		}
 		if (!first)
 			ret.add(" ");
-		ret.add("}");
+		ret.add("]");
 		return ret.toString();
 	}
 }

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

@@ -69,7 +69,7 @@ package haxe.ds;
 
 	public function toString():String {
 		var s = new StringBuf();
-		s.add("{");
+		s.add("[");
 		var it = keys();
 		for (i in it) {
 			s.add(i);
@@ -78,7 +78,7 @@ package haxe.ds;
 			if (it.hasNext())
 				s.add(", ");
 		}
-		s.add("}");
+		s.add("]");
 		return s.toString();
 	}
 

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

@@ -66,14 +66,14 @@ class ObjectMap<K:{}, V> extends flash.utils.Dictionary implements haxe.Constrai
 	}
 
 	public function toString():String {
-		var s = "";
+		var s = "[";
 		var it = keys();
 		for (i in it) {
 			s += (s == "" ? "" : ",") + Std.string(i);
 			s += " => ";
 			s += Std.string(get(i));
 		}
-		return s + "}";
+		return s + "]";
 	}
 
 	public function clear():Void {

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

@@ -107,7 +107,7 @@ package haxe.ds;
 
 	public function toString():String {
 		var s = new StringBuf();
-		s.add("{");
+		s.add("[");
 		var it = keys();
 		for (i in it) {
 			s.add(i);
@@ -116,7 +116,7 @@ package haxe.ds;
 			if (it.hasNext())
 				s.add(", ");
 		}
-		s.add("}");
+		s.add("]");
 		return s.toString();
 	}
 

std/flash/_std/haxe/ds/UnsafeStringMap.hx

@@ -74,7 +74,7 @@ class UnsafeStringMap<T> implements haxe.Constraints.IMap<String, T> {
 
 	public function toString():String {
 		var s = new StringBuf();
-		s.add("{");
+		s.add("[");
 		var it = keys();
 		for (i in it) {
 			s.add(i);
@@ -83,7 +83,7 @@ class UnsafeStringMap<T> implements haxe.Constraints.IMap<String, T> {
 			if (it.hasNext())
 				s.add(", ");
 		}
-		s.add("}");
+		s.add("]");
 		return s.toString();
 	}
 

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

@@ -66,14 +66,14 @@ class WeakMap<K:{}, V> extends flash.utils.Dictionary implements haxe.Constraint
 	}
 
 	public function toString():String {
-		var s = "";
+		var s = "[";
 		var it = keys();
 		for (i in it) {
 			s += (s == "" ? "" : ",") + Std.string(i);
 			s += " => ";
 			s += Std.string(get(i));
 		}
-		return s + "}";
+		return s + "]";
 	}
 
 	public function clear():Void {

std/haxe/ds/BalancedTree.hx

@@ -227,7 +227,7 @@ class BalancedTree<K, V> implements haxe.Constraints.IMap<K, V> {
 	}
 
 	public function toString() {
-		return root == null ? '{}' : '{${root.toString()}}';
+		return root == null ? "[]" : '[${root.toString()}]';
 	}
 
 	/**
@@ -264,6 +264,6 @@ class TreeNode<K, V> {
 		return this == null ? 0 : _height;
 
 	public function toString() {
-		return (left == null ? "" : left.toString() + ", ") + '$key=$value' + (right == null ? "" : ", " + right.toString());
+		return (left == null ? "" : left.toString() + ", ") + '$key => $value' + (right == null ? "" : ", " + right.toString());
 	}
 }

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

@@ -69,15 +69,15 @@ class IntMap<T> implements haxe.Constraints.IMap<Int, T> {
 		var s = new StringBuf();
 		var keys = h.keysArray();
 		var values = h.valuesArray();
-		s.addChar('{'.code);
+		s.addChar("[".code);
 		for (i in 0...keys.length) {
 			if (i > 0)
 				s.add(", ");
 			s.add(keys[i]);
 			s.add(" => ");
 			s.add(values[i]);
 		}
-		s.addChar('}'.code);
+		s.addChar("]".code);
 		return s.toString();
 	}
 

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

@@ -69,15 +69,15 @@ class ObjectMap<K:{}, T> implements haxe.Constraints.IMap<K, T> {
 		var s = new StringBuf();
 		var keys = h.keysArray();
 		var values = h.valuesArray();
-		s.addChar('{'.code);
+		s.addChar("[".code);
 		for (i in 0...keys.length) {
 			if (i > 0)
 				s.add(", ");
 			s.add(keys[i]);
 			s.add(" => ");
 			s.add(values[i]);
 		}
-		s.addChar('}'.code);
+		s.addChar("]".code);
 		return s.toString();
 	}
 

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

@@ -96,7 +96,7 @@ class StringMap<T> implements haxe.Constraints.IMap<String, T> {
 		var s = new StringBuf();
 		var keys = h.keysArray();
 		var values = h.valuesArray();
-		s.addChar('{'.code);
+		s.addChar("[".code);
 		for (i in 0...keys.length) {
 			if (i > 0)
 				s.add(", ");
@@ -105,7 +105,7 @@ class StringMap<T> implements haxe.Constraints.IMap<String, T> {
 			s.add(" => ");
 			s.add(values[i]);
 		}
-		s.addChar('}'.code);
+		s.addChar("]".code);
 		return s.toString();
 	}
 

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

@@ -364,7 +364,7 @@ import java.NativeArray;
 
 	public function toString():String {
 		var s = new StringBuf();
-		s.add("{");
+		s.add("[");
 		var it = keys();
 		for (i in it) {
 			s.add(i);
@@ -373,7 +373,7 @@ import java.NativeArray;
 			if (it.hasNext())
 				s.add(", ");
 		}
-		s.add("}");
+		s.add("]");
 		return s.toString();
 	}
 

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

@@ -378,7 +378,7 @@ import java.NativeArray;
 
 	public function toString():String {
 		var s = new StringBuf();
-		s.add("{");
+		s.add("[");
 		var it = keys();
 		for (i in it) {
 			s.add(Std.string(i));
@@ -387,7 +387,7 @@ import java.NativeArray;
 			if (it.hasNext())
 				s.add(", ");
 		}
-		s.add("}");
+		s.add("]");
 		return s.toString();
 	}
 

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

@@ -377,7 +377,7 @@ import java.NativeArray;
 
 	public function toString():String {
 		var s = new StringBuf();
-		s.add("{");
+		s.add("[");
 		var it = keys();
 		for (i in it) {
 			s.add(i);
@@ -386,7 +386,7 @@ import java.NativeArray;
 			if (it.hasNext())
 				s.add(", ");
 		}
-		s.add("}");
+		s.add("]");
 		return s.toString();
 	}
 

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

@@ -404,7 +404,7 @@ import java.lang.ref.ReferenceQueue;
 
 	public function toString():String {
 		var s = new StringBuf();
-		s.add("{");
+		s.add("[");
 		var it = keys();
 		for (i in it) {
 			s.add(Std.string(i));
@@ -413,7 +413,7 @@ import java.lang.ref.ReferenceQueue;
 			if (it.hasNext())
 				s.add(", ");
 		}
-		s.add("}");
+		s.add("]");
 		return s.toString();
 	}
 

std/java/internal/HxObject.hx

@@ -193,7 +193,7 @@ class DynamicObject extends HxObject {
 		if (ts != null)
 			return ts();
 		var ret = new StringBuf();
-		ret.add("{");
+		ret.add("[");
 		var first = true;
 		for (f in Reflect.fields(this)) {
 			if (first)
@@ -207,7 +207,7 @@ class DynamicObject extends HxObject {
 		}
 		if (!first)
 			ret.add(" ");
-		ret.add("}");
+		ret.add("]");
 		return ret.toString();
 	}
 }

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

@@ -81,7 +81,7 @@ package haxe.ds;
 
 	public function toString():String {
 		var s = new StringBuf();
-		s.add("{");
+		s.add("[");
 		var it = keys();
 		for (i in it) {
 			s.add(i);
@@ -90,7 +90,7 @@ package haxe.ds;
 			if (it.hasNext())
 				s.add(", ");
 		}
-		s.add("}");
+		s.add("]");
 		return s.toString();
 	}
 

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

@@ -106,7 +106,7 @@ class ObjectMap<K:{}, V> implements haxe.Constraints.IMap<K, V> {
 
 	public function toString():String {
 		var s = new StringBuf();
-		s.add("{");
+		s.add("[");
 		var it = keys();
 		for (i in it) {
 			s.add(Std.string(i));
@@ -115,7 +115,7 @@ class ObjectMap<K:{}, V> implements haxe.Constraints.IMap<K, V> {
 			if (it.hasNext())
 				s.add(", ");
 		}
-		s.add("}");
+		s.add("]");
 		return s.toString();
 	}