Merge pull request #2673 from 9rnsr/rev7444

[REG2.063] Disable enhancement feature 7444
dlang · Oct 20, 2013 · d32f639 · d32f639
1 parent c922dfc
commit d32f639
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 14 deletions.
diff --git a/src/expression.c b/src/expression.c
@@ -11780,7 +11780,7 @@ Expression *AssignExp::semantic(Scope *sc)
                 e2 = new SliceExp(e2->loc, e2, NULL, NULL);
                 e2 = e2->semantic(sc);
             }
-            else if (global.params.warnings && !global.gag && op == TOKassign &&
+            else if (0 && global.params.warnings && !global.gag && op == TOKassign &&
                      e2->op != TOKarrayliteral && e2->op != TOKstring &&
                      !e2->implicitConvTo(t1))
             {   // Disallow sa = da (Converted to sa[] = da[])
@@ -11910,7 +11910,7 @@ Expression *AssignExp::semantic(Scope *sc)
         {
             e2->checkPostblit(sc, t2->nextOf());
         }
-        if (global.params.warnings && !global.gag && op == TOKassign &&
+        if (0 && global.params.warnings && !global.gag && op == TOKassign &&
             e2->op != TOKslice && e2->op != TOKassign &&
             e2->op != TOKarrayliteral && e2->op != TOKstring &&
             !(e2->op == TOKadd || e2->op == TOKmin ||
@@ -11934,7 +11934,7 @@ Expression *AssignExp::semantic(Scope *sc)
     }
     else
     {
-        if (global.params.warnings && !global.gag && op == TOKassign &&
+        if (0 && global.params.warnings && !global.gag && op == TOKassign &&
             t1->ty == Tarray && t2->ty == Tsarray &&
             e2->op != TOKslice && //e2->op != TOKarrayliteral &&
             t2->implicitConvTo(t1))

diff --git a/test/fail_compilation/warn7444.d b/test/fail_compilation/warn7444.d
@@ -4,16 +4,7 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/warn7444.d(30): Warning: explicit element-wise assignment (sa)[] = e is better than sa = e
-fail_compilation/warn7444.d(32): Error: cannot implicitly convert expression (e) of type int to int[]
-fail_compilation/warn7444.d(37): Warning: explicit element-wise assignment (sa)[] = sa[] is better than sa = sa[]
-fail_compilation/warn7444.d(38): Warning: explicit element-wise assignment sa[] = (sa)[] is better than sa[] = sa
-fail_compilation/warn7444.d(41): Warning: explicit element-wise assignment (sa)[] = (da)[] is better than sa = da
-fail_compilation/warn7444.d(42): Warning: explicit element-wise assignment (sa)[] = da[] is better than sa = da[]
-fail_compilation/warn7444.d(43): Warning: explicit element-wise assignment sa[] = (da)[] is better than sa[] = da
-fail_compilation/warn7444.d(47): Warning: explicit slice assignment da = (sa)[] is better than da = sa
-fail_compilation/warn7444.d(49): Warning: explicit element-wise assignment da[] = (sa)[] is better than da[] = sa
-fail_compilation/warn7444.d(54): Warning: explicit element-wise assignment da[] = (da)[] is better than da[] = da
+fail_compilation/warn7444.d(23): Error: cannot implicitly convert expression (e) of type int to int[]
 ---
 */
 
@@ -59,14 +50,15 @@ void test7444()
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/warn7444.d(69): Warning: explicit element-wise assignment (arr)[] = 0 is better than arr = 0
+No warning
 ---
 */
 
 void test10214()
 {
     bool[1] arr;
     arr = 0;
+    pragma(msg, "No warning");
 }
 
 /*