Commit f4d0a94

authored

Add String.opEquals(AA) (#379)

* Limit imports of emplaceRef * Add String.opEquals(AA) * Make opEquals tests more extensive * Fix syntax error * Adjust logic for computing index in StringMap.opEquals * Improve opEquals test to increase coverage * Add more asserts * Correct comment * Simplify opEquals * Qualify K and V part of opEquals(AA) as const * Simplify StringMap.opEquals to use array comparison * Simplify StringMap.opEquals further

1 parent c72c2d6 commit f4d0a94Copy full SHA for f4d0a94

File tree

1 file changed

+52

-13

lines changed

source/mir
- string_map.d

1 file changed

+52

-13

lines changed

`‎source/mir/string_map.d‎`

Lines changed: 52 additions & 13 deletions

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ struct StringMap(T, U = uint)`
`42`	`42`	`{`
`43`	`43`	`// NOTE: moving this to template restriction fails with recursive template instanation`
`44`	`44`	`static assert(is(typeof(T.init == V.init) : bool),`
`45`		`- "Unsupported rhs of type " ~ typeof(rhs).stringof);// TODO:`
	`45`	`+ "Unsupported rhs of type " ~ typeof(rhs).stringof);`
`46`	`46`	`if (keys != rhs.keys)`
`47`	`47`	`return false;`
`48`	`48`	`if (implementation)`
`@@ -51,6 +51,27 @@ struct StringMap(T, U = uint)`
`51`	`51`	`return false;`
`52`	`52`	`return true;`
`53`	`53`	`}`
	`54`	`+ /// ditto`
	`55`	`+ bool opEquals(K, V)(scope const const(V)[const(K)] rhs) const`
	`56`	`+ if (is(typeof(K.init == string.init) : bool) &&`
	`57`	`+ is(typeof(V.init == T.init) : bool))`
	`58`	`+ {`
	`59`	`+ if (implementation is null)`
	`60`	`+ return rhs.length == 0;`
	`61`	`+ if (implementation._length != rhs.length)`
	`62`	`+ return false;`
	`63`	`+ foreach (const i; 0 .. implementation._length)`
	`64`	`+ {`
	`65`	`+ if (const valuePtr = implementation.keys[i] in rhs)`
	`66`	`+ {`
	`67`	`+ if (*valuePtr != implementation.values[i])`
	`68`	`+ return false;`
	`69`	`+ }`
	`70`	`+ else`
	`71`	`+ return false;`
	`72`	`+ }`
	`73`	`+ return true;`
	`74`	`+ }`
`54`	`75`
`55`	`76`	`// // linking bug`
`56`	`77`	`// version(none)`
`@@ -658,7 +679,7 @@ struct StringMap(T, U = uint)`
`658`	`679`	`}`
`659`	`680`
`660`	`681`	`/++`
`661`		`- Converts the associtave array to a common Dlang associative array.`
	`682`	`+ Converts to a builtin associative array.`
`662`	`683`
`663`	`684`	Complexity: `O(n)`.
`664`	`685`	`+/`
`@@ -711,7 +732,6 @@ struct StringMap(T, U = uint)`
`711`	`732`	`assert(aa["k"] == 1);`
`712`	`733`	`}`
`713`	`734`
`714`		`-`
`715`	`735`	`private static struct Impl`
`716`	`736`	`{`
`717`	`737`	`import core.lifetime: move;`
`@@ -954,17 +974,36 @@ version(mir_test)`
`954`	`974`	`///`
`955`	`975`	`@safe unittest`
`956`	`976`	`{`
`957`		`- StringMap!int x;`
`958`		`- x["L"] = 3;`
`959`		`- x["A"] = 2;`
`960`		`- x["val"] = 1;`
`961`		`-`
`962`		`- StringMap!uint y;`
`963`		`- y["L"] = 3;`
`964`		`- y["A"] = 2;`
`965`		`- y["val"] = 1;`
	`977`	`+ static void testEquals(X, Y)()`
	`978`	`+ {`
	`979`	`+ X x;`
	`980`	`+ Y y;`
	`981`	`+ assert(x == y);`
	`982`	`+`
	`983`	`+ x["L"] = 3;`
	`984`	`+ assert(x != y);`
	`985`	`+ x["A"] = 2;`
	`986`	`+ assert(x != y);`
	`987`	`+ x["val"] = 1;`
	`988`	`+ assert(x != y);`
	`989`	`+`
	`990`	`+ y["L"] = 3;`
	`991`	`+ assert(x != y);`
	`992`	`+ y["A"] = 2;`
	`993`	`+ assert(x != y);`
	`994`	`+ y["val"] = 1;`
	`995`	`+ assert(x == y);`
	`996`	`+`
	`997`	`+ x = X.init;`
	`998`	`+ assert(x != y);`
	`999`	`+`
	`1000`	`+ y = Y.init;`
	`1001`	`+ assert(x == y);`
	`1002`	`+ }`
`966`	`1003`
`967`		`- assert(x == y);`
	`1004`	`+ testEquals!(StringMap!int, StringMap!uint)();`
	`1005`	`+ testEquals!(StringMap!int, uint[string])();`
	`1006`	`+ testEquals!(uint[string], StringMap!int)();`
`968`	`1007`	`}`
`969`	`1008`
`970`	`1009`	`version(mir_test)`

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 f4d0a94

File tree

1 file changed

1 file changed

`‎source/mir/string_map.d‎`

0 commit comments