Replace opIn_r with opBinaryRight.

s-ludwig · s-ludwig · commit 8193e0d03f38 · 2021-12-10T11:09:54.000+01:00
diff --git a/engine/source/dmdscript/RandAA.d b/engine/source/dmdscript/RandAA.d
@@ -80,7 +80,8 @@ struct aard (K, V, bool useRandom = false)
         assert(0);
     }
 
-    V* opIn_r(K k)
+
+    V* opBinaryRight(string op : "in")(K k)
     {
         if(imp_ is null)
             return null;
@@ -153,7 +154,7 @@ struct aard (K, V, bool useRandom = false)
 
     V get(K k)
     {
-        V* p = opIn_r(k);
+        V* p = k in this;
         if(p !is null)
         {
             return *p;
@@ -165,7 +166,7 @@ struct aard (K, V, bool useRandom = false)
     {
         if(imp_ !is null)
         {
-            V* p = opIn_r(k);
+            V* p = k in this;
             if(p !is null)
             {
                 val = *p;
@@ -728,7 +729,7 @@ public:
         }
     }
     /**Returns null if index is not found.*/
-    V* opIn_r(K index)
+    V* opBinaryRight(string op : "in")(K index)
     {
         size_t i = findExisting(index);
         if(i == size_t.max)

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,8 @@ struct aard (K, V, bool useRandom = false)`
`80`	`80`	`assert(0);`
`81`	`81`	`}`
`82`	`82`
`83`		`- V* opIn_r(K k)`
	`83`	`+`
	`84`	`+ V* opBinaryRight(string op : "in")(K k)`
`84`	`85`	`{`
`85`	`86`	`if(imp_ is null)`
`86`	`87`	`return null;`
`@@ -153,7 +154,7 @@ struct aard (K, V, bool useRandom = false)`
`153`	`154`
`154`	`155`	`V get(K k)`
`155`	`156`	`{`
`156`		`- V* p = opIn_r(k);`
	`157`	`+ V* p = k in this;`
`157`	`158`	`if(p !is null)`
`158`	`159`	`{`
`159`	`160`	`return *p;`
`@@ -165,7 +166,7 @@ struct aard (K, V, bool useRandom = false)`
`165`	`166`	`{`
`166`	`167`	`if(imp_ !is null)`
`167`	`168`	`{`
`168`		`- V* p = opIn_r(k);`
	`169`	`+ V* p = k in this;`
`169`	`170`	`if(p !is null)`
`170`	`171`	`{`
`171`	`172`	`val = *p;`
`@@ -728,7 +729,7 @@ public:`
`728`	`729`	`}`
`729`	`730`	`}`
`730`	`731`	`/*Returns null if index is not found./`
`731`		`- V* opIn_r(K index)`
	`732`	`+ V* opBinaryRight(string op : "in")(K index)`
`732`	`733`	`{`
`733`	`734`	`size_t i = findExisting(index);`
`734`	`735`	`if(i == size_t.max)`