Merge pull request #3274 from 9rnsr/2.065

Pick up changes from master to 2.065 branch
dlang · Feb 16, 2014 · a1ef105 · a1ef105
2 parents b70737a + 79ae211
commit a1ef105
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 0 deletions.
diff --git a/src/struct.c b/src/struct.c
@@ -827,6 +827,29 @@ void StructDeclaration::semantic(Scope *sc)
     aggNew =       (NewDeclaration *)search(Loc(), Id::classNew);
     aggDelete = (DeleteDeclaration *)search(Loc(), Id::classDelete);
 
+    if (ctor)
+    {
+        Dsymbol *scall = search(Loc(), Id::call);
+        if (scall)
+        {
+            unsigned errors = global.startGagging();
+            unsigned oldspec = global.speculativeGag;
+            global.speculativeGag = global.gag;
+            sc = sc->push();
+            sc->speculative = true;
+            FuncDeclaration *fcall = resolveFuncCall(loc, sc, scall, NULL, NULL, NULL, 1);
+            sc = sc->pop();
+            global.speculativeGag = oldspec;
+            global.endGagging(errors);
+
+            if (fcall && fcall->isStatic())
+            {
+                error(fcall->loc, "static opCall is hidden by constructors and can never be called");
+                errorSupplemental(fcall->loc, "Please use a factory method instead, or replace all constructors with static opCall.");
+            }
+        }
+    }
+
     TypeTuple *tup = type->toArgTypes();
     size_t dim = tup->arguments->dim;
     if (dim >= 1)

diff --git a/test/fail_compilation/diag12124.d b/test/fail_compilation/diag12124.d
@@ -0,0 +1,21 @@
+/*
+TEST_OUTPUT:
+---
+fail_compilation/diag12124.d(14): Error: struct diag12124.S1 static opCall is hidden by constructors and can never be called
+fail_compilation/diag12124.d(14):        Please use a factory method instead, or replace all constructors with static opCall.
+fail_compilation/diag12124.d(20): Error: struct diag12124.S2 static opCall is hidden by constructors and can never be called
+fail_compilation/diag12124.d(20):        Please use a factory method instead, or replace all constructors with static opCall.
+---
+*/
+
+struct S1
+{
+    this(int) {}
+    static S1 opCall() { assert(0); }
+}
+
+struct S2
+{
+    this(int) {}
+    static S2 opCall()() { assert(0); }
+}
diff --git a/test/runnable/opover3.d b/test/runnable/opover3.d
@@ -159,6 +159,16 @@ void test12070()
     assert(result == "c1x0x1x2");
 }
 
+/**************************************/
+// 12124
+
+struct S12124
+{
+    this(int) {}
+    S12124 opCall()() { static assert(0); }
+    // speculative opCall instantiation for diagnostic message should not cause false errors
+}
+
 /**************************************/
 
 void main()