Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Map toString brackets #9260

Merged
merged 8 commits into from
Mar 31, 2023
Merged

Map toString brackets #9260

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
79d38b4
Map toString brackets
RblSb Mar 13, 2020
3e1d9a0
azure, please
RblSb Mar 14, 2020
615433b
Fix macro
RblSb Mar 21, 2020
ef3d44c
Revert "azure, please"
RblSb Mar 23, 2020
06d9a44
Merge branch 'development' into map_tostring
RblSb Jan 19, 2021
bdfc295
Merge branch 'development' into map_tostring
Simn Mar 26, 2023
faa9fe8
Run tests on custom hxcpp branch
RblSb Mar 31, 2023
8010812
Revert "Run tests on custom hxcpp branch"
RblSb Mar 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/macro/eval/evalStdLib.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1547,7 +1547,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
)

Expand Down Expand Up @@ -1606,7 +1606,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
)

Expand Down Expand Up @@ -1664,7 +1664,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
)

Expand Down Expand Up @@ -3671,4 +3671,4 @@ let init_standard_library builtins =
"addChar",StdUtf8.addChar;
"toString",StdUtf8.toString;
];
EvalSsl.init_fields init_fields builtins
EvalSsl.init_fields init_fields builtins
4 changes: 2 additions & 2 deletions std/cs/_std/haxe/ds/IntMap.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -373,7 +373,7 @@ import cs.NativeArray;
if (it.hasNext())
s.add(", ");
}
s.add("}");
s.add("]");
return s.toString();
}

Expand Down
4 changes: 2 additions & 2 deletions std/cs/_std/haxe/ds/ObjectMap.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand All @@ -387,7 +387,7 @@ import cs.NativeArray;
if (it.hasNext())
s.add(", ");
}
s.add("}");
s.add("]");
return s.toString();
}

Expand Down
4 changes: 2 additions & 2 deletions std/cs/_std/haxe/ds/StringMap.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -386,7 +386,7 @@ import cs.NativeArray;
if (it.hasNext())
s.add(", ");
}
s.add("}");
s.add("]");
return s.toString();
}

Expand Down
4 changes: 2 additions & 2 deletions std/cs/internal/HxObject.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -244,7 +244,7 @@ class DynamicObject extends HxObject {
}
if (!first)
ret.add(" ");
ret.add("}");
ret.add("]");
return ret.toString();
}
}
Expand Down
4 changes: 2 additions & 2 deletions std/flash/_std/haxe/ds/IntMap.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -78,7 +78,7 @@ package haxe.ds;
if (it.hasNext())
s.add(", ");
}
s.add("}");
s.add("]");
return s.toString();
}

Expand Down
4 changes: 2 additions & 2 deletions std/flash/_std/haxe/ds/ObjectMap.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions std/flash/_std/haxe/ds/StringMap.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -116,7 +116,7 @@ package haxe.ds;
if (it.hasNext())
s.add(", ");
}
s.add("}");
s.add("]");
return s.toString();
}

Expand Down
4 changes: 2 additions & 2 deletions std/flash/_std/haxe/ds/UnsafeStringMap.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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();
}

Expand Down
4 changes: 2 additions & 2 deletions std/flash/_std/haxe/ds/WeakMap.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions std/haxe/ds/BalancedTree.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()}]';
}

/**
Expand Down Expand Up @@ -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());
}
}
4 changes: 2 additions & 2 deletions std/hl/_std/haxe/ds/IntMap.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}

Expand Down
4 changes: 2 additions & 2 deletions std/hl/_std/haxe/ds/ObjectMap.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}

Expand Down
4 changes: 2 additions & 2 deletions std/hl/_std/haxe/ds/StringMap.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(", ");
Expand All @@ -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();
}

Expand Down
4 changes: 2 additions & 2 deletions std/java/_std/haxe/ds/IntMap.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -373,7 +373,7 @@ import java.NativeArray;
if (it.hasNext())
s.add(", ");
}
s.add("}");
s.add("]");
return s.toString();
}

Expand Down
4 changes: 2 additions & 2 deletions std/java/_std/haxe/ds/ObjectMap.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand All @@ -387,7 +387,7 @@ import java.NativeArray;
if (it.hasNext())
s.add(", ");
}
s.add("}");
s.add("]");
return s.toString();
}

Expand Down
4 changes: 2 additions & 2 deletions std/java/_std/haxe/ds/StringMap.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -386,7 +386,7 @@ import java.NativeArray;
if (it.hasNext())
s.add(", ");
}
s.add("}");
s.add("]");
return s.toString();
}

Expand Down
4 changes: 2 additions & 2 deletions std/java/_std/haxe/ds/WeakMap.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand All @@ -413,7 +413,7 @@ import java.lang.ref.ReferenceQueue;
if (it.hasNext())
s.add(", ");
}
s.add("}");
s.add("]");
return s.toString();
}

Expand Down
4 changes: 2 additions & 2 deletions std/java/internal/HxObject.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -207,7 +207,7 @@ class DynamicObject extends HxObject {
}
if (!first)
ret.add(" ");
ret.add("}");
ret.add("]");
return ret.toString();
}
}
Expand Down
4 changes: 2 additions & 2 deletions std/js/_std/haxe/ds/IntMap.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -90,7 +90,7 @@ package haxe.ds;
if (it.hasNext())
s.add(", ");
}
s.add("}");
s.add("]");
return s.toString();
}

Expand Down
4 changes: 2 additions & 2 deletions std/js/_std/haxe/ds/ObjectMap.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,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));
Expand All @@ -122,7 +122,7 @@ class ObjectMap<K:{}, V> implements haxe.Constraints.IMap<K, V> {
if (it.hasNext())
s.add(", ");
}
s.add("}");
s.add("]");
return s.toString();
}

Expand Down