Use pretty-printer in Type::toChars()

dlang · Feb 4, 2015 · 2da20e0 · 2da20e0
1 parent 16a0faa
commit 2da20e0
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 47 deletions.
diff --git a/src/mtype.c b/src/mtype.c
@@ -1492,6 +1492,7 @@ char *Type::toChars()
     OutBuffer buf;
     buf.reserve(16);
     HdrGenState hgs;
+    hgs.fullQual = (ty == Tclass && !mod);
 
     ::toCBuffer(this, &buf, NULL, &hgs);
     return buf.extractString();
@@ -2874,11 +2875,6 @@ Type *TypeBasic::syntaxCopy()
     return this;
 }
 
-char *TypeBasic::toChars()
-{
-    return Type::toChars();
-}
-
 d_uns64 TypeBasic::size(Loc loc)
 {   unsigned size;
 
@@ -3519,11 +3515,6 @@ bool TypeVector::checkBoolean()
     return false;
 }
 
-char *TypeVector::toChars()
-{
-    return Type::toChars();
-}
-
 d_uns64 TypeVector::size(Loc loc)
 {
     return basetype->size();
@@ -7139,13 +7130,6 @@ const char *TypeEnum::kind()
     return "enum";
 }
 
-char *TypeEnum::toChars()
-{
-    if (mod)
-        return Type::toChars();
-    return sym->toChars();
-}
-
 Type *TypeEnum::syntaxCopy()
 {
     return this;
@@ -7378,19 +7362,6 @@ const char *TypeStruct::kind()
     return "struct";
 }
 
-char *TypeStruct::toChars()
-{
-    //printf("sym.parent: %s, deco = %s\n", sym->parent->toChars(), deco);
-    if (mod)
-        return Type::toChars();
-    TemplateInstance *ti = sym->parent->isTemplateInstance();
-    if (ti && ti->aliasdecl == sym)
-    {
-        return ti->toChars();
-    }
-    return sym->toChars();
-}
-
 Type *TypeStruct::syntaxCopy()
 {
     return this;
@@ -7943,13 +7914,6 @@ const char *TypeClass::kind()
     return "class";
 }
 
-char *TypeClass::toChars()
-{
-    if (mod)
-        return Type::toChars();
-    return (char *)sym->toPrettyChars();
-}
-
 Type *TypeClass::syntaxCopy()
 {
     return this;

diff --git a/src/mtype.h b/src/mtype.h
@@ -400,7 +400,6 @@ class TypeBasic : public Type
     unsigned alignsize();
     Expression *getProperty(Loc loc, Identifier *ident, int flag);
     Expression *dotExp(Scope *sc, Expression *e, Identifier *ident, int flag);
-    char *toChars();
     bool isintegral();
     bool isfloating();
     bool isreal();
@@ -430,7 +429,6 @@ class TypeVector : public Type
     unsigned alignsize();
     Expression *getProperty(Loc loc, Identifier *ident, int flag);
     Expression *dotExp(Scope *sc, Expression *e, Identifier *ident, int flag);
-    char *toChars();
     bool isintegral();
     bool isfloating();
     bool isscalar();
@@ -688,7 +686,6 @@ class TypeIdentifier : public TypeQualified
     TypeIdentifier(Loc loc, Identifier *ident);
     const char *kind();
     Type *syntaxCopy();
-    //char *toChars();
     void resolve(Loc loc, Scope *sc, Expression **pe, Type **pt, Dsymbol **ps, bool intypeid = false);
     Dsymbol *toDsymbol(Scope *sc);
     Type *semantic(Loc loc, Scope *sc);
@@ -706,7 +703,6 @@ class TypeInstance : public TypeQualified
     TypeInstance(Loc loc, TemplateInstance *tempinst);
     const char *kind();
     Type *syntaxCopy();
-    //char *toChars();
     void resolve(Loc loc, Scope *sc, Expression **pe, Type **pt, Dsymbol **ps, bool intypeid = false);
     Type *semantic(Loc loc, Scope *sc);
     Dsymbol *toDsymbol(Scope *sc);
@@ -764,7 +760,6 @@ class TypeStruct : public Type
     const char *kind();
     d_uns64 size(Loc loc);
     unsigned alignsize();
-    char *toChars();
     Type *syntaxCopy();
     Type *semantic(Loc loc, Scope *sc);
     Dsymbol *toDsymbol(Scope *sc);
@@ -796,7 +791,6 @@ class TypeEnum : public Type
     Type *syntaxCopy();
     d_uns64 size(Loc loc);
     unsigned alignsize();
-    char *toChars();
     Type *semantic(Loc loc, Scope *sc);
     Dsymbol *toDsymbol(Scope *sc);
     Expression *dotExp(Scope *sc, Expression *e, Identifier *ident, int flag);
@@ -833,7 +827,6 @@ class TypeClass : public Type
     TypeClass(ClassDeclaration *sym);
     const char *kind();
     d_uns64 size(Loc loc);
-    char *toChars();
     Type *syntaxCopy();
     Type *semantic(Loc loc, Scope *sc);
     Dsymbol *toDsymbol(Scope *sc);

diff --git a/test/fail_compilation/fail9.d b/test/fail_compilation/fail9.d
@@ -1,8 +1,8 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/fail9.d(25): Error: no property 'Vector' for type 'fail9.Vector!int.Vector'
-fail_compilation/fail9.d(25): Error: no property 'Vector' for type 'fail9.Vector!int.Vector'
+fail_compilation/fail9.d(25): Error: no property 'Vector' for type 'fail9.Vector!int'
+fail_compilation/fail9.d(25): Error: no property 'Vector' for type 'fail9.Vector!int'
 ---
 */
 

diff --git a/test/fail_compilation/ice8100.d b/test/fail_compilation/ice8100.d
@@ -1,7 +1,7 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/ice8100.d(10): Error: no property 'Q' for type 'ice8100.Bar!bool.Bar'
+fail_compilation/ice8100.d(10): Error: no property 'Q' for type 'ice8100.Bar!bool'
 fail_compilation/ice8100.d(11): Error: template instance ice8100.Foo!(Bar!bool) error instantiating
 fail_compilation/ice8100.d(12):        instantiated from here: Bar!bool
 ---