Merge pull request #597 from 9rnsr/fix4523

Issue 4523 - [tdpl] .remove method for Associative Arrays returns void in all cases

src/expression.c

@@ -11503,7 +11503,7 @@ int InExp::isBit()
 RemoveExp::RemoveExp(Loc loc, Expression *e1, Expression *e2)
         : BinExp(loc, TOKremove, sizeof(RemoveExp), e1, e2)
 {
-    type = Type::tvoid;
+    type = Type::tboolean;
 }
 
 void RemoveExp::toCBuffer(OutBuffer *buf, HdrGenState *hgs)

src/interpret.c

@@ -5715,7 +5715,7 @@ Expression *RemoveExp::interpret(InterState *istate, CtfeGoal goal)
     }
     valuesx->dim = valuesx->dim - removed;
     keysx->dim = keysx->dim - removed;
-    return EXP_VOID_INTERPRET;
+    return new IntegerExp(loc, removed?1:0, Type::tbool);
 }
 
 

test/runnable/testaa2.d

@@ -2,22 +2,7 @@
 
 extern(C) int printf(const char*, ...);
 
-int main()
-{
-    testaa();
-    bug1899();
-    printf("Success\n");
-    return 0;
-}
-
-void testaa()
-{
-    size_t i = foo("abc");
-    printf("i = %d\n", i);
-    assert(i == 0);
-
-    foo2();
-}
+/************************************************/
 
 int a[string];
 
@@ -81,7 +66,18 @@ void foo2()
     assert(c.length == 0);
 }
 
-void bug1899() 
+void testaa()
+{
+    size_t i = foo("abc");
+    printf("i = %d\n", i);
+    assert(i == 0);
+
+    foo2();
+}
+
+/************************************************/
+
+void test1899()
 {
     int[3][string] AA;
     int[3] x = [5,4,3];
@@ -90,3 +86,33 @@ void bug1899()
     AA["def"] = [1,2,3];
     assert(AA["def"]==[1,2,3]);
 }
+
+/************************************************/
+
+void foo4523()
+{
+   int[string] aa = ["test":0, "test2":1];
+
+   bool found = aa.remove("test");
+   assert(found);
+   bool notfound = aa.remove("nothing");
+   assert(!notfound);
+}
+
+void test4523()
+{
+    foo4523();
+    static assert({ foo4523(); return true; }());
+}
+
+/************************************************/
+
+int main()
+{
+    testaa();
+    test1899();
+    test4523();
+
+    printf("Success\n");
+    return 0;
+}