Commit 7cef4f7

authored

Generalize StringMap.opEquals to other values (#378)

* Generalize StringMap.opEquals to other values * Make StringMap.opEquals @safe along with test * Use scalar comparison instead of array comparison in static assert

1 parent 73cbb22 commit 7cef4f7Copy full SHA for 7cef4f7

File tree

1 file changed

+22

-2

lines changed

source/mir
- string_map.d

1 file changed

+22

-2

lines changed

`‎source/mir/string_map.d‎`

Lines changed: 22 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -41,13 +41,16 @@ struct StringMap(T, U = uint)`
`41`	`41`
`42`	`42`	`///`
`43`	`43`	`// current implementation is workaround for linking bugs when used in self referencing algebraic types`
`44`		`- bool opEquals(const StringMap rhs) const`
	`44`	`+ bool opEquals(V)(scopeconst StringMap!(V, U) rhs) const`
`45`	`45`	`{`
	`46`	`+ // NOTE: moving this to template restriction fails with recursive template instanation`
	`47`	`+ static assert(is(typeof(T.init == V.init) : bool),`
	`48`	`+ "Unsupported rhs of type " ~ typeof(rhs).stringof); // TODO:`
`46`	`49`	`if (keys != rhs.keys)`
`47`	`50`	`return false;`
`48`	`51`	`if (implementation)`
`49`	`52`	`foreach (const i; 0 .. implementation._length)`
`50`		`- if (implementation._values[i] != rhs.implementation._values[i])`
	`53`	+ if (implementation.values[i] != rhs.implementation.values[i])// needs `values` instead of `_values` to be @safe
`51`	`54`	`return false;`
`52`	`55`	`return true;`
`53`	`56`	`}`
`@@ -738,6 +741,23 @@ unittest`
`738`	`741`	`assert(table == table);`
`739`	`742`	`}`
`740`	`743`
	`744`	`+version(mir_test)`
	`745`	`+///`
	`746`	`+@safe unittest`
	`747`	`+{`
	`748`	`+ StringMap!int x;`
	`749`	`+ x["L"] = 3;`
	`750`	`+ x["A"] = 2;`
	`751`	`+ x["val"] = 1;`
	`752`	`+`
	`753`	`+ StringMap!uint y;`
	`754`	`+ y["L"] = 3;`
	`755`	`+ y["A"] = 2;`
	`756`	`+ y["val"] = 1;`
	`757`	`+`
	`758`	`+ assert(x == y);`
	`759`	`+}`
	`760`	`+`
`741`	`761`	`private struct StructImpl(T, U = uint)`
`742`	`762`	`if (!__traits(hasMember, T, "opPostMove") && __traits(isUnsigned, U))`
`743`	`763`	`{`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 7cef4f7

File tree

1 file changed

1 file changed

`‎source/mir/string_map.d‎`

0 commit comments