Merge pull request #1336 from AndrejMitrovic/Fix8928

[diag] Issue 8928 - Improve error message with implicitly generated constructor
dlang · Dec 9, 2012 · 4cc63a0 · 4cc63a0
2 parents ce7f3d8 + 6a48402
commit 4cc63a0
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 1 deletion.
diff --git a/src/class.c b/src/class.c
@@ -735,6 +735,7 @@ void ClassDeclaration::semantic(Scope *sc)
         //printf("Creating default this(){} for class %s\n", toChars());
         Type *tf = new TypeFunction(NULL, NULL, 0, LINKd, 0);
         CtorDeclaration *ctor = new CtorDeclaration(loc, 0, 0, tf);
+        ctor->isImplicit = true;
         ctor->fbody = new CompoundStatement(0, new Statements());
         members->push(ctor);
         ctor->addMember(sc, this, 1);

diff --git a/src/declaration.h b/src/declaration.h
@@ -755,6 +755,7 @@ struct CtorDeclaration : FuncDeclaration
     int isVirtual();
     int addPreInvariant();
     int addPostInvariant();
+    bool isImplicit;  // implicitly generated ctor
 
     CtorDeclaration *isCtorDeclaration() { return this; }
 };

diff --git a/src/func.c b/src/func.c
@@ -1276,7 +1276,10 @@ void FuncDeclaration::semantic3(Scope *sc)
 
                     e = e->trySemantic(sc2);
                     if (!e)
-                        error("no match for implicit super() call in constructor");
+                    {
+                        const char* impGen = ((CtorDeclaration*)this)->isImplicit ? "implicitly generated " : "";
+                        error("no match for implicit super() call in %sconstructor", impGen);
+                    }
                     else
                     {
                         Statement *s = new ExpStatement(0, e);
@@ -3352,6 +3355,7 @@ CtorDeclaration::CtorDeclaration(Loc loc, Loc endloc, StorageClass stc, Type *ty
     : FuncDeclaration(loc, endloc, Id::ctor, stc, type)
 {
     //printf("CtorDeclaration(loc = %s) %s\n", loc.toChars(), toChars());
+    this->isImplicit = false;
 }
 
 Dsymbol *CtorDeclaration::syntaxCopy(Dsymbol *s)

diff --git a/test/fail_compilation/diag8928.d b/test/fail_compilation/diag8928.d
@@ -0,0 +1,21 @@
+/*
+TEST_OUTPUT:
+---
+fail_compilation/diag8928.d(7): Error: constructor diag8928.Y.this no match for implicit super() call in constructor
+fail_compilation/diag8928.d(10): Error: constructor diag8928.Z.this no match for implicit super() call in implicitly generated constructor
+---
+*/
+
+#line 1
+class X {
+   this(int n) {}
+}
+
+class Y : X
+{
+    this() { }
+}
+
+class Z : X
+{
+}