Changeset 225

Timestamp:

10/29/09 19:12:35 (15 years ago)

Author:

walter

Message:

bugzilla 2694

Files:

• trunk/src/declaration.c (modified) (1 diff)
• trunk/src/doc.c (modified) (1 diff)

trunk/src/declaration.c

@@ -444 +444 @@
-    // for a type or an alias for a symbol. It is up to the semantic()
-    // pass to distinguish.
-    // If it is a type, then type is set and getType() will return that
-    // type. If it is a symbol, then aliassym is set and type is NULL -
-    // toAlias() will return aliasssym.
-
-    Dsymbol *s;
-    Type *t;
-    Expression *e;
-
-    /* This section is needed because resolve() will:
-     *   const x = 3;
-     *   alias x y;
-     * try to alias y to 3.
-     */
-    s = type->toDsymbol(sc);
-    if (s && ((s->getType() && type->equals(s->getType())) || s->isEnumMember()))
-    goto L2;            // it's a symbolic alias
-
-#if DMDV2
-STCref
+(STCref | STCnothrow | STCpure)
-    {   // For 'ref' to be attached to function types, and picked
-    // up by Type::resolve(), it has to go into sc.
-    sc = sc->push();
-STCref
+storage_class & (STCref | STCnothrow | STCpure)
-    type->resolve(loc, sc, &e, &t, &s);
-    sc = sc->pop();
-    }
-    else
-#endif
-    type->resolve(loc, sc, &e, &t, &s);
-    if (s)
-    {
-    goto L2;
-    }
-    else if (e)
-    {
-    // Try to convert Expression to Dsymbol
-    s = getDsymbol(e);
-    if (s)
-        goto L2;
-
-    error("cannot alias an expression %s", e->toChars());
-    t = e->type;
-    }

trunk/src/doc.c

@@ -657 +657 @@
-    hgs.ddoc = 1;
-    toCBuffer(buf, &hgs);
-}
-
-void prefix(OutBuffer *buf, Dsymbol *s)
-{
-    if (s->isDeprecated())
-    buf->writestring("deprecated ");
-    Declaration *d = s->isDeclaration();
-    if (d)
-    {
-    emitProtection(buf, d->protection);
-    if (d->isAbstract())
-        buf->writestring("abstract ");
-    if (d->isStatic())
-        buf->writestring("static ");
-    if (d->isConst())
-        buf->writestring("const ");
-#if DMDV2
-    if (d->isInvariant())
-nvariant
+mmutable
-#endif
-    if (d->isFinal())
-        buf->writestring("final ");
-    if (d->isSynchronized())
-        buf->writestring("synchronized ");
-    }
-}
-
-void Declaration::toDocBuffer(OutBuffer *buf)
-{
-    //printf("Declaration::toDocbuffer() %s, originalType = %p\n", toChars(), originalType);
-    if (ident)
-    {
-    prefix(buf, this);
-
-    if (type)
-    {   HdrGenState hgs;
-        hgs.ddoc = 1;
-        if (originalType)
-        {   //originalType->print();