Changeset 1587:def7a1d494fd

Timestamp:

11/06/09 17:58:01 (2 years ago)

Author:

Christian Kamm <kamm incasoftware de>

branch:

default

Message:

Merge DMD 1.051

Files:

• dmd/aggregate.h (modified) (3 diffs)
• dmd/arrayop.c (modified) (7 diffs)
• dmd/attrib.c (modified) (17 diffs)
• dmd/attrib.h (modified) (11 diffs)
• dmd/cast.c (modified) (6 diffs)
• dmd/class.c (modified) (16 diffs)
• dmd/constfold.c (modified) (5 diffs)
• dmd/declaration.c (modified) (28 diffs)
• dmd/declaration.h (modified) (27 diffs)
• dmd/doc.c (modified) (21 diffs)
• dmd/dsymbol.c (modified) (25 diffs)
• dmd/dsymbol.h (modified) (16 diffs)
• dmd/enum.h (modified) (4 diffs)
• dmd/expression.c (modified) (72 diffs)
• dmd/expression.h (modified) (9 diffs)
• dmd/func.c (modified) (46 diffs)
• dmd/idgen.c (modified) (2 diffs)
• dmd/import.c (modified) (9 diffs)
• dmd/import.h (modified) (1 diff)
• dmd/init.c (modified) (5 diffs)
• dmd/inline.c (modified) (6 diffs)
• dmd/interpret.c (modified) (47 diffs)
• dmd/lexer.c (modified) (2 diffs)
• dmd/lexer.h (modified) (2 diffs)
• dmd/mangle.c (modified) (1 diff)
• dmd/mars.c (modified) (7 diffs)
• dmd/mars.h (modified) (8 diffs)
• dmd/module.c (modified) (15 diffs)
• dmd/module.h (modified) (6 diffs)
• dmd/mtype.c (modified) (22 diffs)
• dmd/mtype.h (modified) (1 diff)
• dmd/opover.c (modified) (17 diffs)
• dmd/optimize.c (modified) (2 diffs)
• dmd/parse.c (modified) (3 diffs)
• dmd/root/async.c (modified) (2 diffs)
• dmd/root/man.c (modified) (1 diff)
• dmd/root/root.c (modified) (1 diff)
• dmd/scope.c (modified) (3 diffs)
• dmd/scope.h (modified) (1 diff)
• dmd/statement.c (modified) (63 diffs)
• dmd/statement.h (modified) (11 diffs)
• dmd/struct.c (modified) (3 diffs)
• dmd/template.c (modified) (36 diffs)
• dmd/template.h (modified) (4 diffs)
• gen/classes.cpp (modified) (1 diff)
• gen/main.cpp (modified) (1 diff)

dmd/aggregate.h

@@ -63 +63 @@
-                // 2: cannot determine size; fwd referenced
-    int isdeprecated;       // !=0 if deprecated
-    Scope *scope;       // !=NULL means context to use
-
-    // Special member functions
@@ -69 +68 @@
-    NewDeclaration *aggNew;     // allocator
-    DeleteDeclaration *aggDelete;   // deallocator
+
+#if DMDV2
+    //CtorDeclaration *ctor;
+    Dsymbol *ctor;          // CtorDeclaration or TemplateDeclaration
+    CtorDeclaration *defaultCtor;   // default constructor
+    Dsymbol *aliasthis;         // forward unresolved lookups to aliasthis
+#endif
-
-    FuncDeclarations dtors; // Array of destructors
@@ -89 +95 @@
-
-    void emitComment(Scope *sc);
+    void toJsonBuffer(OutBuffer *buf);
-    void toDocBuffer(OutBuffer *buf);
-

dmd/arrayop.c

@@ -1 +1 @@
-
-8
+9
-// All Rights Reserved
-// written by Walter Bright
@@ -32 +32 @@
-Expression *BinExp::arrayOp(Scope *sc)
-{
+    //printf("BinExp::arrayOp() %s\n", toChars());
+
+    if (type->toBasetype()->nextOf()->toBasetype()->ty == Tvoid)
+    {
+        error("Cannot perform array operations on void[] arrays");
+        return new ErrorExp();
+    }
+
-    Expressions *arguments = new Expressions();
-
@@ -289 +297 @@
-        sc->linkage = LINKd;
-        fd->semantic(sc);
+        fd->semantic2(sc);
+        fd->semantic3(sc);
-        sc->pop();
-//     }
@@ -319 +329 @@
-}
-
+void CastExp::buildArrayIdent(OutBuffer *buf, Expressions *arguments)
+{
+    Type *tb = type->toBasetype();
+    if (tb->ty == Tarray || tb->ty == Tsarray)
+    {
+    e1->buildArrayIdent(buf, arguments);
+    }
+    else
+    Expression::buildArrayIdent(buf, arguments);
+}
+
-void SliceExp::buildArrayIdent(OutBuffer *buf, Expressions *arguments)
-{
@@ -403 +424 @@
-}
-
+Expression *CastExp::buildArrayLoop(Arguments *fparams)
+{
+    Type *tb = type->toBasetype();
+    if (tb->ty == Tarray || tb->ty == Tsarray)
+    {
+    return e1->buildArrayLoop(fparams);
+    }
+    else
+    return Expression::buildArrayLoop(fparams);
+}
+
-Expression *SliceExp::buildArrayLoop(Arguments *fparams)
-{
@@ -421 +453 @@
-     */
-    Expression *ex2 = e2->buildArrayLoop(fparams);
+#if DMDV2
+    /* Need the cast because:
+     *   b = c + p[i];
+     * where b is a byte fails because (c + p[i]) is an int
+     * which cannot be implicitly cast to byte.
+     */
+    ex2 = new CastExp(0, ex2, e1->type->nextOf());
+#endif
-    Expression *ex1 = e1->buildArrayLoop(fparams);
-    Argument *param = (Argument *)fparams->data[0];
@@ -489 +529 @@
-
-
+/***********************************************
+ * Test if operand is a valid array op operand.
+ */
+
+int Expression::isArrayOperand()
+{
+    //printf("Expression::isArrayOperand() %s\n", toChars());
+    if (op == TOKslice)
+    return 1;
+    if (type->toBasetype()->ty == Tarray)
+    {
+    switch (op)
+    {
+        case TOKadd:
+        case TOKmin:
+        case TOKmul:
+        case TOKdiv:
+        case TOKmod:
+        case TOKxor:
+        case TOKand:
+        case TOKor:
+        case TOKneg:
+        case TOKtilde:
+        return 1;
+
+        default:
+        break;
+    }
+    }
+    return 0;
+}

dmd/attrib.c

@@ -27 +27 @@
-#include "parse.h"
-#include "template.h"
+#if TARGET_NET
+ #include "frontend.net/pragma.h"
+#endif
-
-#if IN_LLVM
@@ -73 +76 @@
-    }
-    return m;
+}
+
+void AttribDeclaration::setScopeNewSc(Scope *sc,
+    unsigned stc, enum LINK linkage, enum PROT protection, int explicitProtection,
+    unsigned structalign)
+{
+    if (decl)
+    {
+    Scope *newsc = sc;
+    if (stc != sc->stc ||
+        linkage != sc->linkage ||
+        protection != sc->protection ||
+        explicitProtection != sc->explicitProtection ||
+        structalign != sc->structalign)
+    {
+        // create new one for changes
+        newsc = new Scope(*sc);
+        newsc->flags &= ~SCOPEfree;
+        newsc->stc = stc;
+        newsc->linkage = linkage;
+        newsc->protection = protection;
+        newsc->explicitProtection = explicitProtection;
+        newsc->structalign = structalign;
+    }
+    for (unsigned i = 0; i < decl->dim; i++)
+    {   Dsymbol *s = (Dsymbol *)decl->data[i];
+
+        s->setScope(newsc); // yes, the only difference from semanticNewSc()
+    }
+    if (newsc != sc)
+    {
+        sc->offset = newsc->offset;
+        newsc->pop();
+    }
+    }
+}
+
+void AttribDeclaration::semanticNewSc(Scope *sc,
+    unsigned stc, enum LINK linkage, enum PROT protection, int explicitProtection,
+    unsigned structalign)
+{
+    if (decl)
+    {
+    Scope *newsc = sc;
+    if (stc != sc->stc ||
+        linkage != sc->linkage ||
+        protection != sc->protection ||
+        explicitProtection != sc->explicitProtection ||
+        structalign != sc->structalign)
+    {
+        // create new one for changes
+        newsc = new Scope(*sc);
+        newsc->flags &= ~SCOPEfree;
+        newsc->stc = stc;
+        newsc->linkage = linkage;
+        newsc->protection = protection;
+        newsc->explicitProtection = explicitProtection;
+        newsc->structalign = structalign;
+    }
+    for (unsigned i = 0; i < decl->dim; i++)
+    {   Dsymbol *s = (Dsymbol *)decl->data[i];
+
+        s->semantic(newsc);
+    }
+    if (newsc != sc)
+    {
+        sc->offset = newsc->offset;
+        newsc->pop();
+    }
+    }
-}
-
@@ -303 +376 @@
-}
-
+void StorageClassDeclaration::setScope(Scope *sc)
+{
+    if (decl)
+    {
+    unsigned scstc = sc->stc;
+
+    /* These sets of storage classes are mutually exclusive,
+     * so choose the innermost or most recent one.
+     */
+    if (stc & (STCauto | STCscope | STCstatic | STCextern | STCmanifest))
+        scstc &= ~(STCauto | STCscope | STCstatic | STCextern | STCmanifest);
+    if (stc & (STCauto | STCscope | STCstatic | STCtls | STCmanifest | STCgshared))
+        scstc &= ~(STCauto | STCscope | STCstatic | STCtls | STCmanifest | STCgshared);
+    if (stc & (STCconst | STCimmutable | STCmanifest))
+        scstc &= ~(STCconst | STCimmutable | STCmanifest);
+    if (stc & (STCgshared | STCshared | STCtls))
+        scstc &= ~(STCgshared | STCshared | STCtls);
+    scstc |= stc;
+
+    setScopeNewSc(sc, scstc, sc->linkage, sc->protection, sc->explicitProtection, sc->structalign);
+    }
+}
+
-void StorageClassDeclaration::semantic(Scope *sc)
-{
-    if (decl)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -338 +437 @@
-    { STCextern,       TOKextern },
-    { STCconst,        TOKconst },
-//  { STCinvariant,    TOKimmutable },
-//  { STCshared,       TOKshared },
-    { STCfinal,        TOKfinal },
-    { STCabstract,     TOKabstract },
@@ -345 +442 @@
-    { STCdeprecated,   TOKdeprecated },
-    { STCoverride,     TOKoverride },
-//  { STCnothrow,      TOKnothrow },
-//  { STCpure,         TOKpure },
-//  { STCref,          TOKref },
-//  { STCtls,          TOKtls },
-    };
-
@@ -385 +478 @@
-}
-
+void LinkDeclaration::setScope(Scope *sc)
+{
+    //printf("LinkDeclaration::setScope(linkage = %d, decl = %p)\n", linkage, decl);
+    if (decl)
+    {
+    setScopeNewSc(sc, sc->stc, linkage, sc->protection, sc->explicitProtection, sc->structalign);
+    }
+}
+
-void LinkDeclaration::semantic(Scope *sc)
-{
-    //printf("LinkDeclaration::semantic(linkage = %d, decl = %p)\n", linkage, decl);
-    if (decl)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-    }
-}
@@ -474 +564 @@
-}
-
+void ProtDeclaration::setScope(Scope *sc)
+{
+    if (decl)
+    {
+    setScopeNewSc(sc, sc->stc, sc->linkage, protection, 1, sc->structalign);
+    }
+}
+
+void ProtDeclaration::importAll(Scope *sc)
+{
+    Scope *newsc = sc;
+    if (sc->protection != protection ||
+       sc->explicitProtection != 1)
+    {
+       // create new one for changes
+       newsc = new Scope(*sc);
+       newsc->flags &= ~SCOPEfree;
+       newsc->protection = protection;
+       newsc->explicitProtection = 1;
+    }
+
+    for (int i = 0; i < decl->dim; i++)
+    {
+       Dsymbol *s = (Dsymbol *)decl->data[i];
+       s->importAll(newsc);
+    }
+
+    if (newsc != sc)
+       newsc->pop();
+}
+
-void ProtDeclaration::semantic(Scope *sc)
-{
-    if (decl)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-    switch (protection)
@@ -512 +619 @@
-    }
-    buf->writestring(p);
+    buf->writeByte(' ');
+}
+
+void ProtDeclaration::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
+{
+    protectionToCBuffer(buf, protection);
-    AttribDeclaration::toCBuffer(buf, hgs);
-}
@@ -533 +646 @@
-}
-
+void AlignDeclaration::setScope(Scope *sc)
+{
+    //printf("\tAlignDeclaration::setScope '%s'\n",toChars());
+    if (decl)
+    {
+    setScopeNewSc(sc, sc->stc, sc->linkage, sc->protection, sc->explicitProtection, salign);
+    }
+}
+
-void AlignDeclaration::semantic(Scope *sc)
-{
@@ -538 +660 @@
-// we only support packed structs, as from the spec: align(1) struct Packed { ... }
-// other alignments are simply ignored. my tests show this is what llvm-gcc does too ...
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-}
-
@@ -578 +679 @@
-    this->loc = loc;
-    this->isunion = isunion;
-    this->scope = NULL;
-    this->sem = 0;
-}
@@ -781 +881 @@
-}
-
+void PragmaDeclaration::setScope(Scope *sc)
+{
+#if TARGET_NET
+    if (ident == Lexer::idPool("assembly"))
+    {
+        if (!args || args->dim != 1)
+        {
+            error("pragma has invalid number of arguments");
+        }
+        else
+        {
+            Expression *e = (Expression *)args->data[0];
+            e = e->semantic(sc);
+            e = e->optimize(WANTvalue | WANTinterpret);
+            args->data[0] = (void *)e;
+            if (e->op != TOKstring)
+            {
+                error("string expected, not '%s'", e->toChars());
+            }
+            PragmaScope* pragma = new PragmaScope(this, sc->parent, static_cast<StringExp*>(e));
+
+            assert(sc);
+            pragma->setScope(sc);
+
+            //add to module members
+            assert(sc->module);
+            assert(sc->module->members);
+            sc->module->members->push(pragma);
+        }
+    }
+#endif // TARGET_NET
+}
+
-void PragmaDeclaration::semantic(Scope *sc)
-{   // Should be merged with PragmaStatement
@@ -804 +937 @@
-        {
-            StringExp *se = (StringExp *)e;
-
+ 
-        }
-        else
-error("string expected for message, not '%s'"
+fprintf(stdmsg
-        }
-        fprintf(stdmsg, "\n");
@@ -874 +1007 @@
-    }
-#endif
+#if TARGET_NET
+    else if (ident == Lexer::idPool("assembly"))
+    {
+        if (!args || args->dim != 1)
+            error("pragma has invalid number of arguments");
+        else
+        {
+            Expression *e = (Expression *)args->data[0];
+            e = e->semantic(sc);
+            e = e->optimize(WANTvalue | WANTinterpret);
+            args->data[0] = (void *)e;
+            if (e->op != TOKstring)
+            {
+                error("string expected, not '%s'", e->toChars());
+            }
+            PragmaScope* pragma = new PragmaScope(this, sc->parent, static_cast<StringExp*>(e));
+            decl = new Array;
+            decl->push(pragma);
+        }
+    }
+#endif // TARGET_NET
-
-// LDC
@@ -1001 +1155 @@
-
-#endif // LDC
+
-
-    else if (ignoreUnsupportedPragmas)
@@ -1299 +1454 @@
-}
-
+void ConditionalDeclaration::setScope(Scope *sc)
+{
+    Array *d = include(sc, NULL);
+
+    //printf("\tConditionalDeclaration::setScope '%s', d = %p\n",toChars(), d);
+    if (d)
+    {
+       for (unsigned i = 0; i < d->dim; i++)
+       {
+           Dsymbol *s = (Dsymbol *)d->data[i];
+
+           s->setScope(sc);
+       }
+    }
+}
+
+void ConditionalDeclaration::importAll(Scope *sc)
+{
+    Array *d = include(sc, NULL);
+
+    //printf("\tConditionalDeclaration::importAll '%s', d = %p\n",toChars(), d);
+    if (d)
+    {
+       for (unsigned i = 0; i < d->dim; i++)
+       {
+           Dsymbol *s = (Dsymbol *)d->data[i];
+
+           s->importAll(sc);
+       }
+    }
+}
-
-void ConditionalDeclaration::addComment(unsigned char *comment)
@@ -1419 +1605 @@
-
-
+void StaticIfDeclaration::importAll(Scope *sc)
+{
+    // do not evaluate condition before semantic pass
+}
+
+void StaticIfDeclaration::setScope(Scope *sc)
+{
+    // do not evaluate condition before semantic pass
+}
+
-void StaticIfDeclaration::semantic(Scope *sc)
-{

dmd/attrib.h

@@ -1 +1 @@
-
-// Compiler implementation of the D programming language
-7
+9
-// All Rights Reserved
-// written by Walter Bright
@@ -37 +37 @@
-    virtual Array *include(Scope *sc, ScopeDsymbol *s);
-    int addMember(Scope *sc, ScopeDsymbol *s, int memnum);
+    void setScopeNewSc(Scope *sc,
+    unsigned newstc, enum LINK linkage, enum PROT protection, int explictProtection,
+    unsigned structalign);
+    void semanticNewSc(Scope *sc,
+    unsigned newstc, enum LINK linkage, enum PROT protection, int explictProtection,
+    unsigned structalign);
-    void semantic(Scope *sc);
-    void semantic2(Scope *sc);
@@ -49 +55 @@
-    void addLocalClass(ClassDeclarations *);
-    void toCBuffer(OutBuffer *buf, HdrGenState *hgs);
+    void toJsonBuffer(OutBuffer *buf);
-    AttribDeclaration *isAttribDeclaration() { return this; }
-
@@ -67 +74 @@
-    StorageClassDeclaration(unsigned stc, Array *decl);
-    Dsymbol *syntaxCopy(Dsymbol *s);
+    void setScope(Scope *sc);
-    void semantic(Scope *sc);
-    void toCBuffer(OutBuffer *buf, HdrGenState *hgs);
@@ -79 +87 @@
-    LinkDeclaration(enum LINK p, Array *decl);
-    Dsymbol *syntaxCopy(Dsymbol *s);
+    void setScope(Scope *sc);
-    void semantic(Scope *sc);
-    void semantic3(Scope *sc);
@@ -91 +100 @@
-    ProtDeclaration(enum PROT p, Array *decl);
-    Dsymbol *syntaxCopy(Dsymbol *s);
-
-
+
+
+
+
+
+
-};
-
@@ -101 +114 @@
-    AlignDeclaration(Loc loc, unsigned sa, Array *decl);
-    Dsymbol *syntaxCopy(Dsymbol *s);
+    void setScope(Scope *sc);
-    void semantic(Scope *sc);
-    void toCBuffer(OutBuffer *buf, HdrGenState *hgs);
@@ -108 +122 @@
-{
-    int isunion;
-    Scope *scope;       // !=NULL means context to use
-    int sem;            // 1 if successful semantic()
-
@@ -125 +138 @@
-    Dsymbol *syntaxCopy(Dsymbol *s);
-    void semantic(Scope *sc);
+    void setScope(Scope *sc);
-    int oneMember(Dsymbol **ps);
-    void toCBuffer(OutBuffer *buf, HdrGenState *hgs);
@@ -150 +164 @@
-    void addComment(unsigned char *comment);
-    void toCBuffer(OutBuffer *buf, HdrGenState *hgs);
+    void toJsonBuffer(OutBuffer *buf);
+    void importAll(Scope *sc);
+    void setScope(Scope *sc);
-};
-
@@ -161 +178 @@
-    int addMember(Scope *sc, ScopeDsymbol *s, int memnum);
-    void semantic(Scope *sc);
+    void importAll(Scope *sc);
+    void setScope(Scope *sc);
-    const char *kind();
-};

dmd/cast.c

@@ -1079 +1079 @@
-Expression *SymOffExp::castTo(Scope *sc, Type *t)
-{
-    Type *tb;
-
-#if 0
-    printf("SymOffExp::castTo(this=%s, type=%s, t=%s)\n",
@@ -1087 +1085 @@
-    Expression *e = this;
-
-
-type
-
+Type *
+Type *typeb
+b
-    {
-    // Look for pointers to functions where the functions are overloaded.
-    FuncDeclaration *f;
-
-->ty == Tpointer && type
+b->ty == Tpointer && typeb
-        tb->ty == Tpointer && tb->next->ty == Tfunction)
-    {
@@ -1103 +1101 @@
-        if (f)
-        {
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            return e;
-        }
@@ -1111 +1138 @@
-    e = Expression::castTo(sc, t);
-    }
-
+
+
+
+
-    return e;
-}
@@ -1485 +1515 @@
-    assert(0);
-    }
-op == TOKslice
+isArrayOperand()
-         e2->implicitConvTo(t1->nextOf()))
-    {   // T[] op T
@@ -1491 +1521 @@
-    t = t1->nextOf()->arrayOf();
-    }
-op == TOKslice
+isArrayOperand()
-         e1->implicitConvTo(t2->nextOf()))
-    {   // T op T[]

dmd/class.c

@@ -1 +1 @@
-
-// Compiler implementation of the D programming language
-8
+9
-// All Rights Reserved
-// written by Walter Bright
@@ -162 +162 @@
-        Type::typeinfoinvariant = this;
-        }
+
+        if (id == Id::TypeInfo_Shared)
+        {   if (Type::typeinfoshared)
+            Type::typeinfoshared->error("%s", msg);
+        Type::typeinfoshared = this;
+        }
-#endif
-    }
@@ -227 +233 @@
-
-    if (!ident)     // if anonymous class
-
+onst c
-
-    ident = Identifier::generateId(id);
-    }
-
-ope
-
-   
-    
-
-   
-   handle = handle->semantic(loc, sc)
-
+
+
+    
+
+
+    
+    handle = type
+
-    if (!members)           // if forward reference
-    {   //printf("\tclass '%s' is forward referenced\n", toChars());
@@ -330 +336 @@
-            }
-        }
+        if (!tc->sym->symtab || tc->sym->sizeok == 0)
+        {   // Try to resolve forward reference
+            if (sc->mustsemantic && tc->sym->scope)
+            tc->sym->semantic(NULL);
+        }
-        if (!tc->sym->symtab || tc->sym->scope || tc->sym->sizeok == 0)
-        {
+            //printf("%s: forward reference of base class %s\n", toChars(), tc->sym->toChars());
-            //error("forward reference of base class %s", baseClass->toChars());
-            // Forward reference of base class, try again later
@@ -337 +349 @@
-            scope = scx ? scx : new Scope(*sc);
-            scope->setNoFree();
+            if (tc->sym->scope)
+                tc->sym->scope->module->addDeferredSemantic(tc->sym);
-            scope->module->addDeferredSemantic(this);
-            return;
@@ -390 +404 @@
-        }
-
+        if (!tc->sym->symtab)
+        {   // Try to resolve forward reference
+        if (sc->mustsemantic && tc->sym->scope)
+            tc->sym->semantic(NULL);
+        }
+
-        b->base = tc->sym;
-        if (!b->base->symtab || b->base->scope)
@@ -398 +418 @@
-        scope = scx ? scx : new Scope(*sc);
-        scope->setNoFree();
+        if (tc->sym->scope)
+            tc->sym->scope->module->addDeferredSemantic(tc->sym);
-        scope->module->addDeferredSemantic(this);
-        return;
@@ -501 +523 @@
-        if (s)
-        {
-ClassDeclaration *c
+AggregateDeclaration *a
-        FuncDeclaration *fd = s->isFuncDeclaration();
-
-
-c
+a
-        {   isnested = 1;
-            Type *t;
-c
-cd->typ
+a
+ad->handl
-            else if (fd)
-            {   AggregateDeclaration *ad = fd->isMember2();
@@ -565 +587 @@
-    }
-    else
-vptr[] and 
+__vptr and __
-    alignsize = PTRSIZE;
-    }
@@ -704 +726 @@
-    b->type->toCBuffer(buf, NULL, hgs);
-    }
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    buf->writenl();
-}
@@ -778 +805 @@
-{
-    Dsymbol *s;
-
-    //printf("%s.ClassDeclaration::search('%s')\n", toChars(), ident->toChars());
+
-    if (scope)
-
+
+
+
+
+
-
-    if (!members || !symtab || scope)
-
+
+
-    //*(char*)0=0;
-    return NULL;
@@ -832 +864 @@
-int ClassDeclaration::isFuncHidden(FuncDeclaration *fd)
-{
-%s)\n"
+class = %s, fd = %s)\n", toChars()
-    Dsymbol *s = search(0, fd->ident, 4|2);
-    if (!s)
@@ -917 +949 @@
-}
-
+#if DMDV2
+int ClassDeclaration::isCPPinterface()
+{
+    return 0;
+}
+#endif
+
-
-/****************************************
@@ -1007 +1046 @@
-    if (inuse)
-    return;
-
-
-
-
+
+
+
+
+
+
+
+
+
-    if (!members)           // if forward reference
-    {   //printf("\tinterface '%s' is forward referenced\n", toChars());
@@ -1090 +1134 @@
-        baseclasses.remove(i);
-        continue;
+        }
+        if (!b->base->symtab)
+        {   // Try to resolve forward reference
+        if (sc->mustsemantic && b->base->scope)
+            b->base->semantic(NULL);
-        }
-        if (!b->base->symtab || b->base->scope || b->base->inuse)
@@ -1263 +1312 @@
-}
-
+#if DMDV2
+int InterfaceDeclaration::isCPPinterface()
+{
+    return cpp;
+}
+#endif
+
-/*******************************************
- */

dmd/constfold.c

@@ -71 +71 @@
-
-int ComplexExp::isConst()
+{
+    return 1;
+}
+
+int NullExp::isConst()
-{
-    return 1;
@@ -846 +851 @@
-    cmp = e1->toComplex() == e2->toComplex();
-    }
-
+ || e1->type->toBasetype()->ty == Tpointer
-    {
-    cmp = (e1->toInteger() == e2->toInteger());
@@ -863 +868 @@
-    int cmp;
-
-
-
-
+
+
+
+
+
+
+
-    }
-    else if (e1->op == TOKsymoff && e2->op == TOKsymoff)
@@ -1047 +1056 @@
-
-    Type *tb = to->toBasetype();
-
-
-// LDC: ported from D2 to allow char[] ~ char[n] arguments in CTFE
+
+
+ */
-    if (e1->op == TOKstring)
-    {
+    Type *typeb = type->toBasetype();
-    if (tb->ty == Tarray && typeb->ty == Tarray &&
-        tb->nextOf()->size() == typeb->nextOf()->size())
@@ -1070 +1080 @@
-        real_t r = e1->toReal();
-
-b
+->toBasetype()
-        {
-        case Tint8: result = (d_int8)r; break;

dmd/declaration.c

@@ -68 +68 @@
-
-int Declaration::isDataseg()
+{
+    return FALSE;
+}
+
+int Declaration::isThreadlocal()
-{
-    return FALSE;
@@ -133 +138 @@
-    if (v && v->canassign == 0)
-    {
-
+onst c
-        if (isConst())
-        p = "const";
-        else if (isInvariant())
-nvariant
+mmutable
-        else if (storage_class & STCmanifest)
-manifest constant
+enum
-        else if (!t->isAssignable())
-        p = "struct with immutable members";
-        if (p)
-        {   error(loc, "cannot modify %s", p);
-        halt();
-        }
-    }
@@ -201 +205 @@
-    args->setDim(objects->dim);
-    OutBuffer buf;
+    int hasdeco = 1;
-    for (size_t i = 0; i < objects->dim; i++)
-    {   Type *t = (Type *)objects->data[i];
@@ -214 +219 @@
-#endif
-        args->data[i] = (void *)arg;
+        if (!t->deco)
+        hasdeco = 0;
-    }
-
-    tupletype = new TypeTuple(args);
+    if (hasdeco)
+        return tupletype->semantic(0, NULL);
-    }
-
@@ -457 +466 @@
-     */
-    s = type->toDsymbol(sc);
-
+
+
+
+
+
-    goto L2;            // it's a symbolic alias
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-    if (s)
-    {
@@ -524 +547 @@
-    }
-    }
-
+
+
-    this->inSemantic = 0;
-}
@@ -536 +560 @@
-    //printf("AliasDeclaration::overloadInsert('%s')\n", s->toChars());
-    if (overnext == NULL)
-
+
+
+
+
+
+
-    return TRUE;
-    }
@@ -552 +581 @@
-Type *AliasDeclaration::getType()
-{
+    //printf("AliasDeclaration::getType() %s\n", type->toChars());
+#if 0
+    if (!type->deco && scope)
+    semantic(scope);
+    if (type && !type->deco)
+    error("forward reference to alias %s\n", toChars());
+#endif
-    return type;
-}
@@ -559 +595 @@
-    //printf("AliasDeclaration::toAlias('%s', this = %p, aliassym = %p, kind = '%s')\n", toChars(), this, aliassym, aliassym ? aliassym->kind() : "");
-    assert(this != aliassym);
-10) 
+75) exit(0); //
-    if (inSemantic)
-    {   error("recursive alias declaration");
@@ -621 +657 @@
-    offset = 0;
-    noscope = 0;
+#if DMDV1
-    nestedref = 0;
+#endif
-    ctorinit = 0;
-    aliassym = NULL;
@@ -685 +723 @@
-void VarDeclaration::semantic(Scope *sc)
-{
-
-
-
-
-
+
+
+
+
+
+
-    //if (strcmp(toChars(), "mul") == 0) halt();
+#endif
-
-    storage_class |= sc->stc;
@@ -725 +765 @@
-    //printf("sc->stc = %x\n", sc->stc);
-    //printf("storage_class = x%x\n", storage_class);
+
+#if DMDV2
+    if (storage_class & STCgshared && global.params.safe && !sc->module->safe)
+    {
+    error("__gshared not allowed in safe mode; use shared");
+    }
+#endif
-
-    Dsymbol *parent = toParent();
@@ -833 +880 @@
-    if (aad)
-    {
-
+
+
+
+
+
+
+
+
+
+
+
-    }
-
@@ -865 +922 @@
-    }
-
+#if DMDV2
+    if ((storage_class & (STCref | STCparameter | STCforeach)) == STCref &&
+    ident != Id::This)
+    {
+    error("only parameters or foreach declarations can be ref");
+    }
+#endif
+
-    if (type->isscope() && !noscope)
-    {
@@ -879 +944 @@
-    }
-
+    enum TOK op = TOKconstruct;
-    if (!init && !sc->inunion && !isStatic() && !isConst() && fd &&
-    !(storage_class & (STCfield | STCin | STCforeach)) &&
@@ -897 +963 @@
-        e1 = new VarExp(loc, this);
-        e = new AssignExp(loc, e1, e);
-
-
+
+
+
-        return;
-    }
@@ -917 +984 @@
-        init = getExpInitializer();
-    }
+    // Default initializer is always a blit
+    op = TOKblit;
-    }
-
@@ -922 +991 @@
-    {
-    sc = sc->push();
-const | STCinvariant | STCpure
+_TYPECTOR | STCpure | STCnothrow | STCref
-
-    ArrayInitializer *ai = init->isArrayInitializer();
@@ -933 +1002 @@
-    ExpInitializer *ei = init->isExpInitializer();
-
-we can allocate
+initializer is a NewExp that can be allocated
-    if (ei && isScope() && ei->exp->op == TOKnew)
-    {   NewExp *ne = (NewExp *)ei->exp;
@@ -971 +1040 @@
-
-        Type *t = type->toBasetype();
-
+ && !(storage_class & (STCref | STCout))
-        {
-            ei->exp = ei->exp->semantic(sc);
@@ -992 +1061 @@
-        {
-            ei->exp = ei->exp->semantic(sc);
+            ei->exp = resolveProperties(sc, ei->exp);
+            StructDeclaration *sd = ((TypeStruct *)t)->sym;
+#if DMDV2
+            /* Look to see if initializer is a call to the constructor
+             */
+            if (sd->ctor &&     // there are constructors
+            ei->exp->type->ty == Tstruct && // rvalue is the same struct
+            ((TypeStruct *)ei->exp->type)->sym == sd &&
+            ei->exp->op == TOKstar)
+            {
+            /* Look for form of constructor call which is:
+             *    *__ctmp.ctor(arguments...)
+             */
+            PtrExp *pe = (PtrExp *)ei->exp;
+            if (pe->e1->op == TOKcall)
+            {   CallExp *ce = (CallExp *)pe->e1;
+                if (ce->e1->op == TOKdotvar)
+                {   DotVarExp *dve = (DotVarExp *)ce->e1;
+                if (dve->var->isCtorDeclaration())
+                {   /* It's a constructor call, currently constructing
+                     * a temporary __ctmp.
+                     */
+                    /* Before calling the constructor, initialize
+                     * variable with a bit copy of the default
+                     * initializer
+                     */
+                    Expression *e = new AssignExp(loc, new VarExp(loc, this), t->defaultInit(loc));
+                    e->op = TOKblit;
+                    e->type = t;
+                    ei->exp = new CommaExp(loc, e, ei->exp);
+
+                    /* Replace __ctmp being constructed with e1
+                     */
+                    dve->e1 = e1;
+                    return;
+                }
+                }
+            }
+            }
+#endif
-            if (!ei->exp->implicitConvTo(type))
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-        ei->exp = new AssignExp(loc, e1, ei->exp);
@@ -1011 +1134 @@
-        }
-    }
-
+
+
-    {
-        /* Because we may need the results of a const declaration in a
@@ -1044 +1168 @@
-            if (global.gag == 0)
-            global.errors = errors; // act as if nothing happened
+#if DMDV2
+            /* Save scope for later use, to try again
+             */
+            scope = new Scope(*sc);
+            scope->setNoFree();
+#endif
-        }
-        else if (ei)
-        {
-            e = e->optimize(WANTvalue | WANTinterpret);
-
+ || e->op == TOKfloat64
-            {
-            ei->exp = e;        // no errors, keep result
-            }
+#if DMDV2
+            else
+            {
+            /* Save scope for later use, to try again
+             */
+            scope = new Scope(*sc);
+            scope->setNoFree();
+            }
+#endif
-        }
-        else
@@ -1132 +1271 @@
-    if (init)
-    {   buf->writestring(" = ");
-
+
+
+
+
+
+
+
-    }
-    buf->writeByte(';');
@@ -1211 +1356 @@
-}
-
+/************************************
+ * Does symbol go into thread local storage?
+ */
+
+int VarDeclaration::isThreadlocal()
+{
+    return 0;
+}
+
-int VarDeclaration::hasPointers()
-{
+    //printf("VarDeclaration::hasPointers() %s, ty = %d\n", toChars(), type->ty);
-    return (!isDataseg() && type->hasPointers());
-}
@@ -1229 +1384 @@
- */
-
-
+Scope *sc
-{   Expression *e = NULL;
-
@@ -1342 +1497 @@
-#endif
-
+/***************************** TypeInfoSharedDeclaration **********************/
+
+#if DMDV2
+TypeInfoSharedDeclaration::TypeInfoSharedDeclaration(Type *tinfo)
+    : TypeInfoDeclaration(tinfo, 0)
+{
+}
+#endif
+
-/***************************** TypeInfoStructDeclaration **********************/
-
@@ -1451 +1615 @@
-    storage_class |= STCconst;
-}
-

dmd/declaration.h

@@ -1 +1 @@
-
-// Compiler implementation of the D programming language
-8
+9
-// All Rights Reserved
-// written by Walter Bright
@@ -93 +93 @@
-};
-
-
+
+
-int overloadApply(Module* from, FuncDeclaration *fstart,
-    int (*fp)(void *, FuncDeclaration *),
@@ -116 +117 @@
-
-    void emitComment(Scope *sc);
+    void toJsonBuffer(OutBuffer *buf);
-    void toDocBuffer(OutBuffer *buf);
-
@@ -124 +126 @@
-    virtual int isDelete();
-    virtual int isDataseg();
+    virtual int isThreadlocal();
-    virtual int isCodeseg();
-    int isCtorinit()     { return storage_class & STCctorinit; }
@@ -129 +132 @@
-    int isAbstract()     { return storage_class & STCabstract; }
-    int isConst()        { return storage_class & STCconst; }
-0
+storage_class & STCinvariant
-    int isAuto()         { return storage_class & STCauto; }
-    int isScope()        { return storage_class & STCscope; }
@@ -256 +259 @@
-    unsigned offset;
-    int noscope;        // no scope semantics
+#if DMDV2
+    FuncDeclarations nestedrefs; // referenced by these lexically nested functions
+#else
-    int nestedref;      // referenced by a lexically nested function
+#endif
-    int ctorinit;       // it has been initialized in a ctor
-    int onstack;        // 1: it has been allocated on the stack
@@ -264 +271 @@
-    Expression *value;      // when interpreting, this is the value
-                // (NULL if value not determinable)
-
+
+
+
+
+
-
-    VarDeclaration(Loc loc, Type *t, Identifier *id, Initializer *init);
@@ -279 +290 @@
-    int isImportedSymbol();
-    int isDataseg();
+    int isThreadlocal();
-    int hasPointers();
-
+
+
+
+
+
-    ExpInitializer *getExpInitializer();
+    Expression *getConstInitializer();
-    void checkCtorConstInit();
-    void checkNestedReference(Scope *sc, Loc loc);
@@ -346 +363 @@
-
-    void emitComment(Scope *sc);
+    void toJsonBuffer(OutBuffer *buf);
-
-#if IN_DMD
@@ -363 +381 @@
-
-    void emitComment(Scope *sc);
+    void toJsonBuffer(OutBuffer *buf);
-
-#if IN_DMD
@@ -378 +397 @@
-
-    void emitComment(Scope *sc);
+    void toJsonBuffer(OutBuffer *buf);
-
-#if IN_DMD
@@ -617 +637 @@
-Expression *eval_builtin(enum BUILTIN builtin, Expressions *arguments);
-
+#else
+enum BUILTIN { };
-#endif
-
@@ -625 +647 @@
-    Statement *fensure;
-    Statement *fbody;
+
+    FuncDeclarations foverrides;    // functions this function overrides
+    FuncDeclaration *fdrequire;     // function that does the in contract
+    FuncDeclaration *fdensure;      // function that does the out contract
-
-    Identifier *outId;          // identifier for out statement
@@ -659 +685 @@
-                    // this one is overriding
-    int inferRetType;           // !=0 if return type is to be inferred
-    Scope *scope;           // !=NULL means context to use
-
-    // Things that should really go into Scope
@@ -693 +718 @@
-    void semantic2(Scope *sc);
-    void semantic3(Scope *sc);
+    // called from semantic3
+    void varArgs(Scope *sc, TypeFunction*, VarDeclaration *&, VarDeclaration *&);
+
-    void toCBuffer(OutBuffer *buf, HdrGenState *hgs);
-    void bodyToCBuffer(OutBuffer *buf, HdrGenState *hgs);
@@ -699 +727 @@
-    int overloadInsert(Dsymbol *s);
-    FuncDeclaration *overloadExactMatch(Type *t, Module* from);
-
+
+
-    LabelDsymbol *searchLabel(Identifier *ident);
-    AggregateDeclaration *isThis();
@@ -707 +736 @@
-    void appendState(Statement *s);
-    char *mangle();
+    const char *toPrettyChars();
-    int isMain();
-    int isWinMain();
-    int isDllMain();
+    enum BUILTIN isBuiltin();
-    int isExport();
-    int isImportedSymbol();
-    int isAbstract();
-    int isCodeseg();
+    int isOverloadable();
+    int isPure();
-    virtual int isNested();
-    int needThis();
@@ -720 +753 @@
-    virtual int addPreInvariant();
-    virtual int addPostInvariant();
-
+, Expression *thisexp = NULL
-    void inlineScan();
-    int canInline(int hasthis, int hdrscan = 0);
@@ -726 +759 @@
-    const char *kind();
-    void toDocBuffer(OutBuffer *buf);
+    FuncDeclaration *isUnique();
+    int needsClosure();
+    Statement *mergeFrequire(Statement *);
+    Statement *mergeFensure(Statement *);
-
-// LDC: give argument types to runtime functions
@@ -736 +773 @@
-    void toObjFile(int multiobj);           // compile to .obj file
-    int cvMember(unsigned char *p);
+    void buildClosure(IRState *irs);
-#endif
-
@@ -771 +809 @@
-#endif
-};
+
+#if DMDV2
+FuncDeclaration *resolveFuncCall(Scope *sc, Loc loc, Dsymbol *s,
+    Objects *tiargs,
+    Expression *ethis,
+    Expressions *arguments,
+    int flags);
+#endif
-
-struct FuncAliasDeclaration : FuncDeclaration
@@ -832 +878 @@
-    int overloadInsert(Dsymbol *s);
-    void emitComment(Scope *sc);
+    void toJsonBuffer(OutBuffer *buf);
-
-    PostBlitDeclaration *isPostBlitDeclaration() { return this; }
@@ -844 +891 @@
-    void semantic(Scope *sc);
-    void toCBuffer(OutBuffer *buf, HdrGenState *hgs);
+    const char *kind();
+    char *toChars();
-    int isVirtual();
-    int addPreInvariant();
@@ -849 +898 @@
-    int overloadInsert(Dsymbol *s);
-    void emitComment(Scope *sc);
+    void toJsonBuffer(OutBuffer *buf);
-
-    DtorDeclaration *isDtorDeclaration() { return this; }
@@ -864 +914 @@
-    int addPostInvariant();
-    void emitComment(Scope *sc);
+    void toJsonBuffer(OutBuffer *buf);
-    void toCBuffer(OutBuffer *buf, HdrGenState *hgs);
-
@@ -881 +932 @@
-    int addPostInvariant();
-    void emitComment(Scope *sc);
+    void toJsonBuffer(OutBuffer *buf);
-    void toCBuffer(OutBuffer *buf, HdrGenState *hgs);
-
@@ -895 +947 @@
-    int addPostInvariant();
-    void emitComment(Scope *sc);
+    void toJsonBuffer(OutBuffer *buf);
-    void toCBuffer(OutBuffer *buf, HdrGenState *hgs);
-

dmd/doc.c

@@ -1 +1 @@
-
-// Compiler implementation of the D programming language
-8
+9
-// All Rights Reserved
-// written by Walter Bright
@@ -34 +34 @@
-#include "doc.h"
-#include "mtype.h"
+#include "utf.h"
-
-struct Escape
@@ -90 +91 @@
-int isDitto(unsigned char *comment);
-unsigned char *skipwhitespace(unsigned char *p);
-unsigned
-unsigned
-unsigned
+size_t
+size_t
+size_t
-void highlightText(Scope *sc, Dsymbol *s, OutBuffer *buf, unsigned offset);
-void highlightCode(Scope *sc, Dsymbol *s, OutBuffer *buf, unsigned offset);
-void highlightCode2(Scope *sc, Dsymbol *s, OutBuffer *buf, unsigned offset);
-Argument *isFunctionParameter(Dsymbol *s, unsigned char *p, unsigned len);
+
+int isIdStart(unsigned char *p);
+int isIdTail(unsigned char *p);
+int utfStride(unsigned char *p);
-
-static unsigned char ddoc_default[] = "\
@@ -239 +244 @@
-
-    // Set the title to be the name of the module
-
+onst c
-    Macro::define(&macrotable, (unsigned char *)"TITLE", 5, (unsigned char *)p, strlen(p));
-    }
@@ -675 +680 @@
-#if DMDV2
-    if (d->isInvariant())
-nvariant
+mmutable
-#endif
-    if (d->isFinal())
@@ -949 +954 @@
-    unsigned char *pstart;
-    unsigned char *pend;
-    unsigned char *q;
-    unsigned char *idstart;
-    unsigned idlen;
@@ -964 +968 @@
-
-    /* Find end of section, which is ended by one of:
-
+ (but not inside a code section)
-     *  '\0'
-     */
-    idlen = 0;
+    int inCode = 0;
-    while (1)
-    {
-
+
+
-        {
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        if (*q == ':')  // identifier: ends it
-        {   idlen = q - p;
@@ -1142 +1161 @@
-    {
-    // Skip to start of macro
-for (; 1; p++
+while (1
-    {
-        switch (*p)
@@ -1148 +1167 @@
-        case ' ':
-        case '\t':
+            p++;
-            continue;
-
@@ -1155 +1175 @@
-
-        default:
-
-
-
-
-
-
-
+
+
+
+
+
-        }
-        break;
@@ -1167 +1185 @@
-    tempstart = p;
-
-alnum(*p) || *p == '_'
-++
+IdTail(p)
+ += utfStride(p)
-    templen = p - tempstart;
-
@@ -1270 +1288 @@
-    {
-    // Skip to start of macro
-for (; 1; p++
+while (1
-    {
-        if (p >= pend)
@@ -1278 +1296 @@
-        case ' ':
-        case '\t':
+            p++;
-            continue;
-
@@ -1285 +1304 @@
-
-        default:
-
-
-
-
-
-
-
+
+
+
+
+
-        }
-        break;
@@ -1301 +1318 @@
-        if (p >= pend)
-        goto Ldone;
-(isalnum(*p) || *p == '_'
+isIdTail(p
-        break;
-++
+ += utfStride(p)
-    }
-    templen = p - tempstart;
@@ -1487 +1504 @@
- */
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-        break;
-
-
+
+
+
+
+
+
+
+
+
-    }
-    return i;
@@ -1505 +1531 @@
- */
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-        break;
+    if (c >= 0x80)
+    {
+        if (isUniAlpha(c))
+        continue;
+    }
+    else if (isalnum(c) || c == '_')
+        continue;
+    i = oi;
+    break;
-    }
-    return i;
@@ -1526 +1563 @@
- */
-
-unsigned
+size_t
-{   unsigned length = buf->offset - i;
-    unsigned char *p = &buf->data[i];
@@ -1811 +1848 @@
-        default:
-        leadingBlank = 0;
-(isalpha(c) || c == '_'
+isIdStart(&buf->data[i]
-        {   unsigned j;
-
@@ -1882 +1919 @@
-        i--;        // point to ';'
-    }
-alpha(c) || c == '_'
+IdStart(&buf->data[i])
-    {   unsigned j;
-
@@ -2018 +2055 @@
-}
-
+/****************************************
+ * Determine if p points to the start of an identifier.
+ */
+
+int isIdStart(unsigned char *p)
+{
+    unsigned c = *p;
+    if (isalpha(c) || c == '_')
+    return 1;
+    if (c >= 0x80)
+    {   size_t i = 0;
+    if (utf_decodeChar(p, 4, &i, &c))
+        return 0;   // ignore errors
+    if (isUniAlpha(c))
+        return 1;
+    }
+    return 0;
+}
+
+/****************************************
+ * Determine if p points to the rest of an identifier.
+ */
+
+int isIdTail(unsigned char *p)
+{
+    unsigned c = *p;
+    if (isalnum(c) || c == '_')
+    return 1;
+    if (c >= 0x80)
+    {   size_t i = 0;
+    if (utf_decodeChar(p, 4, &i, &c))
+        return 0;   // ignore errors
+    if (isUniAlpha(c))
+        return 1;
+    }
+    return 0;
+}
+
+/*****************************************
+ * Return number of bytes in UTF character.
+ */
+
+int utfStride(unsigned char *p)
+{
+    unsigned c = *p;
+    if (c < 0x80)
+    return 1;
+    size_t i = 0;
+    utf_decodeChar(p, 4, &i, &c);   // ignore errors, but still consume input
+    return i;
+}

dmd/dsymbol.c

@@ -1 +1 @@
-
-// Compiler implementation of the D programming language
-8
+9
-// All Rights Reserved
-// written by Walter Bright
@@ -29 +29 @@
-#include "import.h"
-#include "template.h"
-
+
-#include "../gen/enums.h"
-
@@ -46 +46 @@
-    this->loc = 0;
-    this->comment = NULL;
-
+
-#if IN_LLVM
-    this->llvmInternal = LLVMnone;
@@ -65 +65 @@
-    this->loc = 0;
-    this->comment = NULL;
-
+
-#if IN_LLVM
-    this->llvmInternal = LLVMnone;
@@ -165 +165 @@
-}
-
-
+onst c
-{   Dsymbol *p;
-    char *s;
@@ -191 +191 @@
-        break;
-    q--;
+#if TARGET_NET
+    if (AggregateDeclaration* ad = p->isAggregateDeclaration())
+    {
+        if (ad->isNested() && p->parent && p->parent->isAggregateDeclaration())
+        {
+            *q = '/';
+            continue;
+        }
+    }
+#endif
-    *q = '.';
-    }
@@ -267 +277 @@
-}
-
+/*************************************
+ * Set scope for future semantic analysis so we can
+ * deal better with forward references.
+ */
+
+void Dsymbol::setScope(Scope *sc)
+{
+    //printf("Dsymbol::setScope() %p %s\n", this, toChars());
+    if (!sc->nofree)
+    sc->setNoFree();        // may need it even after semantic() finishes
+    scope = sc;
+}
+
+void Dsymbol::importAll(Scope *sc)
+{
+}
+
+/*************************************
+ * Does semantic analysis on the public face of declarations.
+ */
+
-void Dsymbol::semantic(Scope *sc)
-{
@@ -272 +303 @@
-}
-
+/*************************************
+ * Does semantic analysis on initializers and members of aggregates.
+ */
+
-void Dsymbol::semantic2(Scope *sc)
-{
@@ -277 +312 @@
-}
-
+/*************************************
+ * Does semantic analysis on function bodies.
+ */
+
-void Dsymbol::semantic3(Scope *sc)
-{
@@ -282 +321 @@
-}
-
+/*************************************
+ * Look for function inlining possibilities.
+ */
+
-void Dsymbol::inlineScan()
-{
-have no further semantic analysis needed
+aren't functions
-}
-
@@ -342 +385 @@
-        }
-        ti->tempdecl = td;
-done
+Run
-        ti->semantic(sc);
-        sm = ti->toAlias();
@@ -408 +451 @@
-    return FALSE;
-}
+
+#if DMDV2
+int Dsymbol::isOverloadable()
+{
+    return 0;
+}
+#endif
-
-LabelDsymbol *Dsymbol::isLabel()        // is this a LabelDsymbol()?
@@ -440 +490 @@
-    if (!isAnonymous())     // no name, so can't add it to symbol table
-    {
-->i
+I
-    {
-        Dsymbol *s2;
@@ -632 +682 @@
-void Dsymbol::addComment(unsigned char *comment)
-{
-//    
-// 
+    //
+   //
-
-    if (!this->comment)
@@ -644 +694 @@
-#endif
-}
+
+/********************************* OverloadSet ****************************/
+
+#if DMDV2
+OverloadSet::OverloadSet()
+    : Dsymbol()
+{
+}
+
+void OverloadSet::push(Dsymbol *s)
+{
+    a.push(s);
+}
+
+const char *OverloadSet::kind()
+{
+    return "overloadset";
+}
+#endif
-
-
@@ -682 +751 @@
-{
-    //printf("%s->ScopeDsymbol::search(ident='%s', flags=x%x)\n", toChars(), ident->toChars(), flags);
+    //if (strcmp(ident->toChars(),"c") == 0) *(char*)0=0;
-
-    // Look in symbols declared in this module
@@ -772 +842 @@
-
-        ss = (ScopeDsymbol *) imports->data[i];
-
+           // if already imported
-        {
-            if (protection > prots[i])
@@ -850 +920 @@
-}
-
+Dsymbol *ScopeDsymbol::symtabInsert(Dsymbol *s)
+{
+    return symtab->insert(s);
+}
+
+/***************************************
+ * Determine number of Dsymbols, folding in AttribDeclaration members.
+ */
+
+#if DMDV2
+size_t ScopeDsymbol::dim(Array *members)
+{
+    size_t n = 0;
+    if (members)
+    {
+    for (size_t i = 0; i < members->dim; i++)
+    {   Dsymbol *s = (Dsymbol *)members->data[i];
+        AttribDeclaration *a = s->isAttribDeclaration();
+
+        if (a)
+        {
+        n += dim(a->decl);
+        }
+        else
+        n++;
+    }
+    }
+    return n;
+}
+#endif
+
+/***************************************
+ * Get nth Dsymbol, folding in AttribDeclaration members.
+ * Returns:
+ *  Dsymbol*    nth Dsymbol
+ *  NULL        not found, *pn gets incremented by the number
+ *          of Dsymbols
+ */
+
+#if DMDV2
+Dsymbol *ScopeDsymbol::getNth(Array *members, size_t nth, size_t *pn)
+{
+    if (!members)
+    return NULL;
+
+    size_t n = 0;
+    for (size_t i = 0; i < members->dim; i++)
+    {   Dsymbol *s = (Dsymbol *)members->data[i];
+    AttribDeclaration *a = s->isAttribDeclaration();
+
+    if (a)
+    {
+        s = getNth(a->decl, nth - n, &n);
+        if (s)
+        return s;
+    }
+    else if (n == nth)
+        return s;
+    else
+        n++;
+    }
+
+    if (pn)
+    *pn += n;
+    return NULL;
+}
+#endif
-
-/*******************************************
@@ -939 +1076 @@
-
-    if (td)
-
+
+
-        VarDeclaration *v = new VarDeclaration(loc, Type::tsize_t, Id::dollar, NULL);
-        Expression *e = new IntegerExp(0, td->objects->dim, Type::tsize_t);
@@ -948 +1086 @@
-
-    if (type)
-
+
+
-        VarDeclaration *v = new VarDeclaration(loc, Type::tsize_t, Id::dollar, NULL);
-        Expression *e = new IntegerExp(0, type->arguments->dim, Type::tsize_t);
@@ -957 +1096 @@
-
-    if (exp->op == TOKindex)
-
+
+
-        IndexExp *ie = (IndexExp *)exp;
-
@@ -964 +1104 @@
-    }
-    else if (exp->op == TOKslice)
-
+
+
-        SliceExp *se = (SliceExp *)exp;
-
@@ -971 +1112 @@
-    }
-    else
+        /* Didn't find $, look in enclosing scope(s).
+         */
-        return NULL;
-
+    /* If we are indexing into an array that is really a type
+     * tuple, rewrite this as an index into a type tuple and
+     * try again.
+     */
-    if (ce->op == TOKtype)
-    {
@@ -982 +1129 @@
-    }
-
-
-
+
+
+
+
+
+
+
-        VarDeclaration *v = new VarDeclaration(loc, Type::tsize_t, Id::dollar, NULL);
-
@@ -1031 +1183 @@
-
-Dsymbol *DsymbolTable::lookup(Identifier *ident)
-
-
+
-#ifdef DEBUG
-    assert(ident);
-    assert(tab);
-#endif
-
+StringValue *
-    return (Dsymbol *)(sv ? sv->ptrvalue : NULL);
-}

dmd/dsymbol.h

@@ -1 +1 @@
-
-// Compiler implementation of the D programming language
-8
+9
-// All Rights Reserved
-// written by Walter Bright
@@ -29 +29 @@
-struct DsymbolTable;
-struct Declaration;
+struct ThisDeclaration;
-struct TupleDeclaration;
-struct TypedefDeclaration;
@@ -42 +43 @@
-struct FuncLiteralDeclaration;
-struct CtorDeclaration;
+struct PostBlitDeclaration;
-struct DtorDeclaration;
-struct StaticCtorDeclaration;
@@ -71 +73 @@
-struct TypeInfoDeclaration;
-struct ClassInfoDeclaration;
-
+
+
+
+
-#if IN_DMD
-struct Symbol;
-#endif
-
-#if IN_GCC
-union tree_node;
@@ -82 +86 @@
-struct TYPE;
-#endif
+
+// Back end
+struct Classsym;
-
-#if IN_LLVM
@@ -115 +122 @@
-    unsigned char *comment; // documentation comment for this Dsymbol
-    Loc loc;            // where defined
+    Scope *scope;       // !=NULL means context to use for semantic()
-
-    Dsymbol();
-    Dsymbol(Identifier *);
-    char *toChars();
-    char *toPrettyChars();
-    char *locToChars();
-    int equals(Object *o);
@@ -137 +144 @@
-    static Array *arraySyntaxCopy(Array *a);
-
+    virtual const char *toPrettyChars();
-    virtual const char *kind();
-    virtual Dsymbol *toAlias();         // resolve real symbol
-    virtual int addMember(Scope *sc, ScopeDsymbol *s, int memnum);
+    virtual void setScope(Scope *sc);
+    virtual void importAll(Scope *sc);
-    virtual void semantic(Scope *sc);
-    virtual void semantic2(Scope *sc);
@@ -153 +163 @@
-    virtual void toCBuffer(OutBuffer *buf, HdrGenState *hgs);
-    virtual void toDocBuffer(OutBuffer *buf);
+    virtual void toJsonBuffer(OutBuffer *buf);
-    virtual unsigned size(Loc loc);
-    virtual int isforwardRef();
@@ -161 +172 @@
-    virtual int isImportedSymbol();     // is Dsymbol imported?
-    virtual int isDeprecated();         // is Dsymbol deprecated?
+#if DMDV2
+    virtual int isOverloadable();
+#endif
-    virtual LabelDsymbol *isLabel();        // is this a LabelDsymbol?
-    virtual AggregateDeclaration *isMember();   // is this symbol a member of an AggregateDeclaration?
@@ -199 +213 @@
-    virtual TemplateMixin *isTemplateMixin() { return NULL; }
-    virtual Declaration *isDeclaration() { return NULL; }
+    virtual ThisDeclaration *isThisDeclaration() { return NULL; }
-    virtual TupleDeclaration *isTupleDeclaration() { return NULL; }
-    virtual TypedefDeclaration *isTypedefDeclaration() { return NULL; }
@@ -207 +222 @@
-    virtual FuncLiteralDeclaration *isFuncLiteralDeclaration() { return NULL; }
-    virtual CtorDeclaration *isCtorDeclaration() { return NULL; }
+    virtual PostBlitDeclaration *isPostBlitDeclaration() { return NULL; }
-    virtual DtorDeclaration *isDtorDeclaration() { return NULL; }
-    virtual StaticCtorDeclaration *isStaticCtorDeclaration() { return NULL; }
@@ -231 +247 @@
-    virtual ClassInfoDeclaration* isClassInfoDeclaration() { return NULL; }
-
+    virtual OverloadSet *isOverloadSet() { return NULL; }
+#if TARGET_NET
+    virtual PragmaScope* isPragmaScope() { return NULL; }
+#endif
+
-#if IN_LLVM
-    /// Codegen traversal
@@ -251 +272 @@
-
-    Array *imports;     // imported ScopeDsymbol's
-PROT
+array of PROT, one
-
-    ScopeDsymbol();
@@ -263 +284 @@
-    Dsymbol *nameCollision(Dsymbol *s);
-    const char *kind();
+    FuncDeclaration *findGetMembers();
+    virtual Dsymbol *symtabInsert(Dsymbol *s);
-
-    void emitMemberComments(Scope *sc);
+
+    static size_t dim(Array *members);
+    static Dsymbol *getNth(Array *members, size_t nth, size_t *pn = NULL);
-
-    ScopeDsymbol *isScopeDsymbol() { return this; }
@@ -288 +314 @@
-    TypeTuple *type;    // for tuple[length]
-    TupleDeclaration *td;   // for tuples of objects
+    Scope *sc;
-
-    ArrayScopeSymbol(Expression *e);
@@ -297 +324 @@
-};
-
+// Overload Sets
+
+#if DMDV2
+struct OverloadSet : Dsymbol
+{
+    Dsymbols a;     // array of Dsymbols
+
+    OverloadSet();
+    void push(Dsymbol *s);
+    OverloadSet *isOverloadSet() { return this; }
+    const char *kind();
+};
+#endif
+
-// Table of Dsymbol's
-

dmd/enum.h

@@ -28 +28 @@
-
-struct EnumDeclaration : ScopeDsymbol
-
+
+
-    Type *type;         // the TypeEnum
-    Type *memtype;      // type of the members
@@ -40 +41 @@
-    Expression *minval;
-    Expression *defaultval; // default initializer
-
-    Scope *scope;       // !=NULL means context to use
-#endif
-    int isdeprecated;
@@ -58 +57 @@
-
-    void emitComment(Scope *sc);
+    void toJsonBuffer(OutBuffer *buf);
-    void toDocBuffer(OutBuffer *buf);
-
@@ -87 +87 @@
-
-    void emitComment(Scope *sc);
+    void toJsonBuffer(OutBuffer *buf);
-    void toDocBuffer(OutBuffer *buf);
-

dmd/expression.c

@@ -36 +36 @@
-
-#include "rmem.h"
-
-
+
+
-#include "mtype.h"
-#include "init.h"
@@ -374 +374 @@
-
-    }
+    else if (e->op == TOKdottd)
+    {
+    e = new CallExp(e->loc, e);
+    e = e->semantic(sc);
+    }
-    return e;
-}
@@ -544 +549 @@
-
-    if (nargs > nparams && tf->varargs == 0)
-", nparams, nargs
+ for non-variadic function type %s", nparams, nargs, tf->toChars()
-
-    n = (nargs > nparams) ? nargs : nparams;    // n = max(nargs, nparams)
@@ -569 +574 @@
-            if (tf->varargs == 2 && i + 1 == nparams)
-            goto L2;
-
+function 
-            break;
-        }
@@ -591 +596 @@
-        {
-            if (nargs != nparams)
-
+function 
-            goto L1;
-        }
@@ -670 +675 @@
-    L1:
-        if (!(p->storageClass & STClazy && p->type->ty == Tvoid))
-
+
+
+
+
+
+
+
+
+
+
-        if (p->storageClass & (STCout | STCref))
-        {
@@ -774 +788 @@
-        arg = callCpCtor(loc, sc, arg);
-        }
+#endif
-
-        // Give error for overloaded function addresses
+#if DMDV2
-        if (arg->op == TOKsymoff)
-        {   SymOffExp *se = (SymOffExp *)arg;
-
+
+
+
-            arg->error("function %s is overloaded", arg->toChars());
-        }
@@ -1215 +1233 @@
-{
-    //printf("Expression::deref()\n");
-if (type->ty == Treference)
-{  Expression *e;
-
-
+// type could be null if forward referencing an 'auto' variable
+if (type && type->ty == Treference)
+
+Expression *
-    e->type = ((TypeReference *)type)->next;
-    return e;
@@ -2156 +2174 @@
-    if (f)
-    {   //printf("'%s' is a function\n", f->toChars());
+    if (!f->type->deco)
+    {
+        error("forward reference to %s", toChars());
+    }
-    return new VarExp(loc, f);
-    }
@@ -2210 +2232 @@
-    TemplateInstance *ti = s->isTemplateInstance();
-    if (ti && !global.errors)
-done
+Run
-        ti->semantic(sc);
-    s = ti->inst->toAlias();
@@ -3167 +3189 @@
-        {   e = v->init->toExpression();
-        if (!e)
-
+
+
+
+
+
+
+
+
+
+
-        }
-        else
@@ -3201 +3232 @@
-    if (e)
-    {
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-    }
@@ -3217 +3266 @@
-    /* Find which field offset is by looking at the field offsets
-     */
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-    }
@@ -3366 +3418 @@
-    if (ti && !global.errors)
-    {   Dsymbol *s;
-done
+Run
-        ti->semantic(sc);
-    s = ti->inst->toAlias();
@@ -3584 +3636 @@
-        error("e.new is only for allocating nested classes");
-        else if (fdn)
-
+ 
-        // make sure the parent context fdn of cd is reachable from sc
-        for (Dsymbol *sp = sc->parent; 1; sp = sp->parent)
@@ -3607 +3659 @@
-    {
-        assert(f);
-
+NULL, 
-        checkDeprecated(sc, f);
-        member = f->isCtorDeclaration();
@@ -3635 +3687 @@
-        newargs->shift(e);
-
-
+NULL, 
-        allocator = f->isNewDeclaration();
-        assert(allocator);
@@ -3668 +3720 @@
-        newargs->shift(e);
-
-
+NULL, 
-        allocator = f->isNewDeclaration();
-        assert(allocator);
@@ -4201 +4253 @@
-    }
-    type = new TypeTuple(exps);
+    type = type->semantic(loc, sc);
-    //printf("-TupleExp::semantic(%s)\n", toChars());
-    return this;
@@ -4264 +4317 @@
-    if (global.errors)
-    {
-        if (!fd->type->next)
-        fd->type->next = Type::terror;
-    }
-    else
-    {
-        fd->semantic2(sc);
-
+
+
+
-        {
-        fd->semantic3(sc);
@@ -4278 +4331 @@
-        }
-    }
+
+    // need to infer return type
+    if (global.errors && fd->type && fd->type->ty == Tfunction && !fd->type->nextOf())
+        ((TypeFunction *)fd->type)->next = Type::terror;
-
-    // Type is a "delegate to" or "pointer to" the function literal
@@ -4378 +4435 @@
-    if (!s->isVarDeclaration())
-    {
-
+
+
+
+
+
+
+
-    s->parent = sc->parent;
-    }
@@ -4921 +4984 @@
-    if (op == TOKmodass && e2->type->iscomplex())
-    {   error("cannot perform modulo complex arithmetic");
-IntegerExp(0
+ErrorExp(
-    }
-    }
@@ -4986 +5049 @@
-}
-
+// generate an error if this is a nonsensical *=,/=, or %=, eg real *= imaginary
+void BinExp::checkComplexMulAssign()
+{
+    // Any multiplication by an imaginary or complex number yields a complex result.
+    // r *= c, i*=c, r*=i, i*=i are all forbidden operations.
+    const char *opstr = Token::toChars(op);
+    if ( e1->type->isreal() && e2->type->iscomplex())
+    {
+        error("%s %s %s is undefined. Did you mean %s %s %s.re ?",
+            e1->type->toChars(), opstr, e2->type->toChars(), 
+            e1->type->toChars(), opstr, e2->type->toChars());
+    }
+    else if (e1->type->isimaginary() && e2->type->iscomplex())
+    {
+        error("%s %s %s is undefined. Did you mean %s %s %s.im ?",
+            e1->type->toChars(), opstr, e2->type->toChars(),
+            e1->type->toChars(), opstr, e2->type->toChars());
+    }
+    else if ((e1->type->isreal() || e1->type->isimaginary()) &&
+    e2->type->isimaginary())
+    {
+        error("%s %s %s is an undefined operation", e1->type->toChars(),
+        opstr, e2->type->toChars());
+    }
+}
+
+// generate an error if this is a nonsensical += or -=, eg real += imaginary
+void BinExp::checkComplexAddAssign()
+{
+    // Addition or subtraction of a real and an imaginary is a complex result.
+    // Thus, r+=i, r+=c, i+=r, i+=c are all forbidden operations.
+    if ( (e1->type->isreal() && (e2->type->isimaginary() || e2->type->iscomplex())) ||
+         (e1->type->isimaginary() && (e2->type->isreal() || e2->type->iscomplex()))        
+        )
+    {
+        error("%s %s %s is undefined (result is complex)",
+        e1->type->toChars(), Token::toChars(op), e2->type->toChars());
+    }
+}
+
-void BinExp::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
-{
@@ -5095 +5198 @@
-
-    if (global.params.verbose)
-
+ 
-
-    {   File f(name);
@@ -5178 +5281 @@
-int AssertExp::canThrow()
-{
-
+
+
+
+
-}
-#endif
@@ -5480 +5586 @@
-         ident != Id::alignof && ident != Id::offsetof &&
-         ident != Id::mangleof && ident != Id::stringof)
-
+
+
+
+
+
-    e = new PtrExp(loc, e1);
-    e->type = ((TypePointer *)e1->type)->next;
@@ -5599 +5709 @@
-    if (!type && global.errors)
-    {   // var is goofed up, just return 0
-IntegerExp(0
+ErrorExp(
-    }
-    assert(type);
@@ -5936 +6046 @@
-{
-    Expressions *arguments = new Expressions();
-
-
-
+
+
+
+
-    this->arguments = arguments;
-}
@@ -6041 +6152 @@
-    {   ScopeExp *se = (ScopeExp *)e1;
-    TemplateInstance *ti = se->sds->isTemplateInstance();
-done
+Run
-    {
-        /* Attempt to instantiate ti. If that works, go with it.
@@ -6068 +6179 @@
-    {   DotTemplateInstanceExp *se = (DotTemplateInstanceExp *)e1;
-    TemplateInstance *ti = se->ti;
-done
+Run
-    {
-        /* Attempt to instantiate ti. If that works, go with it.
@@ -6164 +6275 @@
-    {
-        ad = ((TypeStruct *)t1)->sym;
+#if DMDV2
+        // First look for constructor
+        if (ad->ctor && arguments && arguments->dim)
+        {
+        // Create variable that will get constructed
+        Identifier *idtmp = Lexer::uniqueId("__ctmp");
+        VarDeclaration *tmp = new VarDeclaration(loc, t1, idtmp, NULL);
+        Expression *av = new DeclarationExp(loc, tmp);
+        av = new CommaExp(loc, av, new VarExp(loc, tmp));
+
+        Expression *e;
+        CtorDeclaration *cf = ad->ctor->isCtorDeclaration();
+        if (cf)
+            e = new DotVarExp(loc, av, cf, 1);
+        else
+        {   TemplateDeclaration *td = ad->ctor->isTemplateDeclaration();
+            assert(td);
+            e = new DotTemplateExp(loc, av, td);
+        }
+        e = new CallExp(loc, e, arguments);
+#if !STRUCTTHISREF
+        /* Constructors return a pointer to the instance
+         */
+        e = new PtrExp(loc, e);
+#endif
+        e = e->semantic(sc);
+        return e;
+        }
+#endif
+        // No constructor, look for overload of opCall
-        if (search_function(ad, Id::call))
-        goto L1;    // overload of opCall, therefore it's a call
@@ -6206 +6347 @@
-        f = dve->var->isFuncDeclaration();
-        assert(f);
-
+NULL, 
-
-        ad = f->toParent()->isAggregateDeclaration();
@@ -6307 +6448 @@
-        }
-
-
+NULL, 
-        checkDeprecated(sc, f);
-#if DMDV2
@@ -6347 +6488 @@
-
-        f = cd->ctor;
-
+NULL, 
-        checkDeprecated(sc, f);
-#if DMDV2
@@ -6441 +6582 @@
-    }
-
-
+NULL, 
-    checkDeprecated(sc, f);
-#if DMDV2
@@ -6524 +6665 @@
-int CallExp::canThrow()
-{
+    //printf("CallExp::canThrow() %s\n", toChars());
-    if (e1->canThrow())
-    return 1;
@@ -6532 +6674 @@
-    {   Expression *e = (Expression *)arguments->data[i];
-
-
+ && e
-        return 1;
-    }
+
+    if (global.errors && !e1->type)
+    return 0;           // error recovery
-
-    /* If calling a function or delegate that is typed as nothrow,
@@ -6553 +6698 @@
-int CallExp::isLvalue()
-{
-
-
+//
+//
-    Type *tb = e1->type->toBasetype();
-    if (tb->ty == Tfunction && ((TypeFunction *)tb)->isref)
@@ -6564 +6709 @@
-Expression *CallExp::toLvalue(Scope *sc, Expression *e)
-{
+#if 1
-    if (type->toBasetype()->ty == Tstruct)
-    return this;
-    else
+#endif
-    return Expression::toLvalue(sc, e);
+}
+
+Expression *CallExp::modifiableLvalue(Scope *sc, Expression *e)
+{
+#if 1
+    return Expression::modifiableLvalue(sc, e);
+#else
+    /* Although function return values being usable as "ref" parameters is
+     * unsound, disabling it breaks existing code.
+     * Bugzilla 3167
+     */
+    error("cannot assign to function call");
+    return toLvalue(sc, e);
+#endif
-}
-
@@ -6601 +6762 @@
-    {
-        error("cannot take address of %s", e1->toChars());
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-    type = e1->type->pointerTo();
@@ -6654 +6826 @@
-    : UnaExp(loc, TOKstar, sizeof(PtrExp), e)
-{
-
-
+//
+//
-}
-
@@ -6665 +6837 @@
-
-Expression *PtrExp::semantic(Scope *sc)
-
-
+
-#if LOGSEMANTIC
-    printf("PtrExp::semantic('%s')\n", toChars());
-#endif
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    return this;
-}
@@ -6767 +6931 @@
-
-    e1->checkNoBool();
-e1->op != TOKslice
+!e1->isArrayOperand()
-        e1->checkArithmetic();
-    type = e1->type;
@@ -6817 +6981 @@
-
-    e1->checkNoBool();
-e1->op != TOKslice
+!e1->isArrayOperand()
-        e1 = e1->checkIntegral();
-    type = e1->type;
@@ -7013 +7177 @@
-    }
-
+    if (e1->op == TOKtemplate)
+    {
+        error("cannot cast template %s to type %s", e1->toChars(), to->toChars());
+        return new ErrorExp();
+    }
+
+    Type *t1b = e1->type->toBasetype();
-    Type *tob = to->toBasetype();
-    if (tob->ty == Tstruct &&
-e1->type->toBasetype()
+t1b
-        ((TypeStruct *)to)->sym->search(0, Id::call, 0)
-       )
@@ -7031 +7202 @@
-        e = e->semantic(sc);
-        return e;
+    }
+
+    // Struct casts are possible only when the sizes match
+    if (tob->ty == Tstruct || t1b->ty == Tstruct)
+    {
+        size_t fromsize = t1b->size(loc);
+        size_t tosize = tob->size(loc);
+        if (fromsize != tosize)
+        {
+        error("cannot cast from %s to %s", e1->type->toChars(), to->toChars());
+        return new ErrorExp();
+        }
-    }
-    }
@@ -7738 +7921 @@
-/************************************************************/
-
-Can be TOKconstruct too
+op can be TOKassign, TOKconstruct, or TOKblit
-
-AssignExp::AssignExp(Loc loc, Expression *e1, Expression *e2)
@@ -7747 +7930 @@
-
-Expression *AssignExp::semantic(Scope *sc)
-   Type *t1;
+
-    Expression *e1old = e1;
-
@@ -7754 +7937 @@
-#endif
-    //printf("e1->op = %d, '%s'\n", e1->op, Token::toChars(e1->op));
+    //printf("e2->op = %d, '%s'\n", e2->op, Token::toChars(e2->op));
+
+    if (type)
+    return this;
+
+    if (e2->op == TOKcomma)
+    {   /* Rewrite to get rid of the comma from rvalue
+     */
+    AssignExp *ea = new AssignExp(loc, e1, ((CommaExp *)e2)->e2);
+    ea->op = op;
+    Expression *e = new CommaExp(loc, ((CommaExp *)e2)->e1, ea);
+    return e->semantic(sc);
+    }
-
-    /* Look for operator overloading of a[i]=value.
@@ -7760 +7956 @@
-     */
-    if (e1->op == TOKarray)
-  Type *t1;
+
-    ArrayExp *ae = (ArrayExp *)e1;
-    AggregateDeclaration *ad;
@@ -7766 +7962 @@
-
-    ae->e1 = ae->e1->semantic(sc);
-
+Type *
-    if (t1->ty == Tstruct)
-    {
@@ -7881 +8077 @@
-    }
-
-
+
+
+
+
+
+
+
+
+
+
-
-    if (t1->ty == Tfunction)
-    {   // Rewrite f=value to f(value)
-
-
-
+
-    e = e->semantic(sc);
-    return e;
@@ -7919 +8122 @@
-    {   // Try to do a decent error message with the expression
-    // before it got constant folded
-
+
+
-    }
-
@@ -7931 +8135 @@
-    e2 = e2->implicitCastTo(sc, t1->next);
-    }
-
+ && !refinit
-    {
-    error("cannot assign to static array %s", e1->toChars());
@@ -8062 +8266 @@
-        e1->checkArithmetic();
-        e2->checkArithmetic();
+        checkComplexAddAssign();
-        if (type->isreal() || type->isimaginary())
-        {
@@ -8112 +8317 @@
-    e1 = e1->checkArithmetic();
-    e2 = e2->checkArithmetic();
+    checkComplexAddAssign();
-    type = e1->type;
-    typeCombine(sc);
@@ -8216 +8422 @@
-    e1->checkArithmetic();
-    e2->checkArithmetic();
+    checkComplexMulAssign();
-    if (e2->type->isfloating())
-    {   Type *t1;
@@ -8282 +8489 @@
-    e1->checkArithmetic();
-    e2->checkArithmetic();
+    checkComplexMulAssign();
-    if (e2->type->isimaginary())
-    {   Type *t1;
@@ -8329 +8537 @@
-Expression *ModAssignExp::semantic(Scope *sc)
-{
+    BinExp::semantic(sc);
+    checkComplexMulAssign();
-    return commonSemanticAssign(sc);
-}
@@ -8737 +8947 @@
-
-    typeCombine(sc);
-
-
+
+
+
-    e2->checkArithmetic();
-    }
-    if (type->isfloating())
-    {   Type *t1 = e1->type;
@@ -8803 +9013 @@
-
-    typeCombine(sc);
-
-
+
+
+
-    e2->checkArithmetic();
-    }
-    if (type->isfloating())
-    {   Type *t1 = e1->type;
@@ -8870 +9080 @@
-
-    typeCombine(sc);
-
-
+
+
+
-    e2->checkArithmetic();
-    }
-    if (type->isfloating())
-    {   type = e1->type;
@@ -8984 +9194 @@
-    {
-        typeCombine(sc);
-
-
+
+
+
-        e2->checkIntegral();
-        }
-    }
-    }
@@ -9017 +9227 @@
-    {
-        typeCombine(sc);
-
-
+
+
+
-        e2->checkIntegral();
-        }
-    }
-    }
@@ -9050 +9260 @@
-    {
-        typeCombine(sc);
-
-
+
+
+
-        e2->checkIntegral();
-        }
-    }
-    }
@@ -9255 +9465 @@
-Expression *CmpExp::semantic(Scope *sc)
-{   Expression *e;
-    Type *t1;
-    Type *t2;
-
-#if LOGSEMANTIC
@@ -9266 +9474 @@
-    BinExp::semanticp(sc);
-
-
-
+
+
+
+
-    {
-    error("do not use null when comparing class types");
@@ -9285 +9495 @@
-    }
-    return e;
+    }
+
+    /* Disallow comparing T[]==T and T==T[]
+     */
+    if (e1->op == TOKslice && t1->ty == Tarray && e2->implicitConvTo(t1->nextOf()) ||
+    e2->op == TOKslice && t2->ty == Tarray && e1->implicitConvTo(t2->nextOf()))
+    {
+    incompatibleTypes();
+    return new ErrorExp();
-    }
-
@@ -9338 +9557 @@
-Expression *EqualExp::semantic(Scope *sc)
-{   Expression *e;
-    Type *t1;
-    Type *t2;
-
-    //printf("EqualExp::semantic('%s')\n", toChars());
@@ -9368 +9585 @@
-    }
-
-
-
+
+
+
+
-    {
-    error("use '%s' instead of '%s' when comparing with null",
@@ -9388 +9607 @@
-        return e;
-    }
+    }
+
+    /* Disallow comparing T[]==T and T==T[]
+     */
+    if (e1->op == TOKslice && t1->ty == Tarray && e2->implicitConvTo(t1->nextOf()) ||
+    e2->op == TOKslice && t2->ty == Tarray && e1->implicitConvTo(t2->nextOf()))
+    {
+    incompatibleTypes();
+    return new ErrorExp();
-    }
-

dmd/expression.h

@@ -82 +82 @@
-int arrayExpressionCanThrow(Expressions *exps);
-
+struct IntRange
+{   uinteger_t imin;
+    uinteger_t imax;
+};
+
-struct Expression : Object
-{
@@ -158 +163 @@
-    virtual void buildArrayIdent(OutBuffer *buf, Expressions *arguments);
-    virtual Expression *buildArrayLoop(Arguments *fparams);
+    int isArrayOperand();
-
-#if IN_DMD
@@ -292 +298 @@
-{
-    Dsymbol *s;
+    int hasOverloads;
-
-    DsymbolExp(Loc loc, Dsymbol *s);
@@ -307 +314 @@
-    ThisExp(Loc loc);
-    Expression *semantic(Scope *sc);
+    Expression *interpret(InterState *istate);
-    int isBool(int result);
-    void toCBuffer(OutBuffer *buf, HdrGenState *hgs);
@@ -344 +352 @@
-    Expression *semantic(Scope *sc);
-    int isBool(int result);
+    int isConst();
-    void toCBuffer(OutBuffer *buf, HdrGenState *hgs);
-    void toMangleBuffer(OutBuffer *buf);
@@ -592 +601 @@
-    Expression *syntaxCopy();
-    Expression *semantic(Scope *sc);
+    Expression *optimize(int result);
-#if IN_DMD
-    elem *toElem(IRState *irs);
@@ -843 +853 @@
-    Expression *commonSemanticAssignIntegral(Scope *sc);
-    int checkSideEffect(int flag);
+    void checkComplexMulAssign();
+    void checkComplexAddAssign();
-    void toCBuffer(OutBuffer *buf, HdrGenState *hgs);
-    Expression *scaleFactor(Scope *sc);
@@ -1023 +1035 @@
-    void scanForNestedRef(Scope *sc);
-    Expression *toLvalue(Scope *sc, Expression *e);
+    Expression *modifiableLvalue(Scope *sc, Expression *e);
-
-    int inlineCost(InlineCostState *ics);
@@ -1183 +1196 @@
-    void checkEscape();
-    void toCBuffer(OutBuffer *buf, HdrGenState *hgs);
+    void buildArrayIdent(OutBuffer *buf, Expressions *arguments);
+    Expression *buildArrayLoop(Arguments *fparams);
-#if IN_DMD
-    elem *toElem(IRState *irs);

dmd/func.c

@@ -1 +1 @@
-// Compiler implementation of the D programming language
-8
+9
-// All Rights Reserved
-// written by Walter Bright
@@ -36 +36 @@
-{
-    //printf("FuncDeclaration(id = '%s', type = %p)\n", id->toChars(), type);
+    //printf("storage_class = x%x\n", storage_class);
-    this->storage_class = storage_class;
-    this->type = type;
@@ -42 +43 @@
-    fthrows = NULL;
-    frequire = NULL;
+    fdrequire = NULL;
+    fdensure = NULL;
-    outId = NULL;
-    vresult = NULL;
@@ -64 +67 @@
-    cantInterpret = 0;
-    semanticRun = 0;
+#if DMDV1
-    nestedFrameRef = 0;
+#endif
-    fes = NULL;
-    introducing = 0;
@@ -72 +77 @@
-     */
-    inferRetType = (type && type->nextOf() == NULL);
-    scope = NULL;
-    hasReturnExp = 0;
-    nrvo_can = 1;
@@ -78 +82 @@
-#if IN_DMD
-    shidden = NULL;
+#endif
+
+#if DMDV2
+    builtin = BUILTINunknown;
+    tookAddressOf = 0;
-#endif
-
@@ -143 +152 @@
-    if (isFuncLiteralDeclaration())
-    printf("\tFuncLiteralDeclaration()\n");
-\n", sc->parent->toChars()
+, parent = %s\n", sc->parent->toChars(), parent ? parent->toChars() : ""
-    printf("type: %p, %s\n", type, type->toChars());
-#endif
@@ -159 +168 @@
-    semanticRun = 1;
-
-
+
+
-    type = type->semantic(loc, sc);
+    }
-    //type->print();
-    if (type->ty != Tfunction)
@@ -250 +261 @@
-
-    if (isCtorDeclaration() ||
+#if DMDV2
+        isPostBlitDeclaration() ||
+#endif
-        isDtorDeclaration() ||
-        isInvariantDeclaration() ||
@@ -398 +412 @@
-        vtblIndex = vi;
-
+        /* Remember which functions this overrides
+         */
+        foverrides.push(fdv);
+
-        /* This works by whenever this function is called,
-         * it actually returns tintro, which gets dynamically
@@ -444 +462 @@
-        {   FuncDeclaration *fdv = (FuncDeclaration *)b->base->vtbl.data[vi];
-            Type *ti = NULL;
+
+            /* Remember which functions this overrides
+             */
+            foverrides.push(fdv);
-
-            if (fdv->tintro)
@@ -601 +623 @@
-    }
-
-
+
+
+
-        error("must return int or void, not %s", f->nextOf()->toChars());
-    if (f->varargs)
@@ -636 +660 @@
-    }
-
+    if (isVirtual())
+    {
+    /* Rewrite contracts as nested functions, then call them.
+     * Doing it as nested functions means that overriding functions
+     * can call them.
+     */
+    if (frequire)
+    {   /*   in { ... }
+         * becomes:
+         *   void __require() { ... }
+         *   __require();
+         */
+        Loc loc = frequire->loc;
+        TypeFunction *tf = new TypeFunction(NULL, Type::tvoid, 0, LINKd);
+        FuncDeclaration *fd = new FuncDeclaration(loc, loc,
+        Id::require, STCundefined, tf);
+        fd->fbody = frequire;
+        Statement *s1 = new DeclarationStatement(loc, fd);
+        Expression *e = new CallExp(loc, new VarExp(loc, fd), (Expressions *)NULL);
+        Statement *s2 = new ExpStatement(loc, e);
+        frequire = new CompoundStatement(loc, s1, s2);
+        fdrequire = fd;
+    }
+
+    if (fensure)
+    {   /*   out (result) { ... }
+         * becomes:
+         *   tret __ensure(ref tret result) { ... }
+         *   __ensure(result);
+         */
+        if (!outId && f->nextOf()->toBasetype()->ty != Tvoid)
+        outId = Id::result; // provide a default
+
+        Loc loc = fensure->loc;
+        Arguments *arguments = new Arguments();
+        Argument *a = NULL;
+        if (outId)
+        {   a = new Argument(STCref, f->nextOf(), outId, NULL);
+        arguments->push(a);
+        }
+        TypeFunction *tf = new TypeFunction(arguments, Type::tvoid, 0, LINKd);
+        FuncDeclaration *fd = new FuncDeclaration(loc, loc,
+        Id::ensure, STCundefined, tf);
+        fd->fbody = fensure;
+        Statement *s1 = new DeclarationStatement(loc, fd);
+        Expression *eresult = NULL;
+        if (outId)
+        eresult = new IdentifierExp(loc, outId);
+        Expression *e = new CallExp(loc, new VarExp(loc, fd), eresult);
+        Statement *s2 = new ExpStatement(loc, e);
+        fensure = new CompoundStatement(loc, s1, s2);
+        fdensure = fd;
+    }
+    }
+
-Ldone:
-    /* Save scope for possible later use (if we need the
@@ -656 +735 @@
-void FuncDeclaration::semantic3(Scope *sc)
-{   TypeFunction *f;
-    AggregateDeclaration *ad;
-    VarDeclaration *argptr = NULL;
-    VarDeclaration *_arguments = NULL;
@@ -669 +747 @@
-    //printf("FuncDeclaration::semantic3('%s.%s', sc = %p, loc = %s)\n", parent->toChars(), toChars(), sc, loc.toChars());
-    //fflush(stdout);
+    //printf("storage class = x%x %x\n", sc->stc, storage_class);
-    //{ static int x; if (++x == 2) *(char*)0=0; }
-    //printf("\tlinkage = %d\n", sc->linkage);
@@ -684 +763 @@
-    return;
-    f = (TypeFunction *)(type);
-    size_t nparams = Argument::dim(f->parameters);
-
-    // Check the 'throws' clause
@@ -698 +776 @@
-    }
-    }
+
+    frequire = mergeFrequire(frequire);
+    fensure = mergeFensure(fensure);
-
-    if (fbody || frequire)
@@ -728 +809 @@
-
-    // Declare 'this'
-
+AggregateDeclaration *
-    if (ad)
-    {   VarDeclaration *v;
@@ -767 +848 @@
-    // Declare hidden variable _arguments[] and _argptr
-    if (f->varargs == 1)
-
+
+
+
+
+
-
-        if (f->linkage == LINKd)
@@ -804 +889 @@
-        argptr->parent = this;
-        }
+#endif
-    }
-
@@ -825 +911 @@
-                }
-            }
-            // update nparams to include expanded tuples
-            nparams = Argument::dim(f->parameters);
-        }
-#endif
@@ -836 +920 @@
-        {   Argument *arg = (Argument *)f->parameters->data[i];
-
+        //printf("[%d] arg->type->ty = %d %s\n", i, arg->type->ty, arg->type->toChars());
-        if (arg->type->ty == Ttuple)
-        {   TypeTuple *t = (TypeTuple *)arg->type;
@@ -847 +932 @@
-    }
-
-
+
+
+
+
-    if (nparams)
-    {   /* parameters[] has all the tuples removed, as the back end
@@ -865 +953 @@
-            arg->ident = id = Identifier::generateId("_param_", i);
-        }
-
+
+
-        //printf("declaring parameter %s of type %s\n", v->toChars(), v->type->toChars());
-        v->storage_class |= STCparameter;
@@ -936 +1025 @@
-    {   /* fensure is composed of the [out] contracts
-         */
+        if (!type->nextOf())
+        {   // Have to do semantic() on fbody first
+        error("post conditions are not supported if the return type is inferred");
+        return;
+        }
+
-        ScopeDsymbol *sym = new ScopeDsymbol();
-        sym->parent = sc2->scopesym;
@@ -962 +1057 @@
-        v = new VarDeclaration(loc, type->nextOf(), outId, NULL);
-        v->noscope = 1;
+#if DMDV2
+        if (f->isref)
+        {
+            v->storage_class |= STCref | STCforeach;
+        }
+#endif
-        sc2->incontract--;
-        v->semantic(sc2);
@@ -1012 +1113 @@
-        else
-        {   // Call invariant virtually
-ThisExp
+Expression
-            v->type = vthis->type;
+#if STRUCTTHISREF
+            if (ad->isStructDeclaration())
+            v = v->addressOf(sc);
+#endif
-            e = new AssertExp(0, v);
-        }
@@ -1135 +1240 @@
-        else if (!inlineAsm)
-        {
+#if DMDV2
+        int blockexit = fbody ? fbody->blockExit() : BEfallthru;
+        if (f->isnothrow && blockexit & BEthrow)
+            error("'%s' is nothrow yet may throw", toChars());
+
+        int offend = blockexit & BEfallthru;
+#endif
-        if (type->nextOf()->ty == Tvoid)
-        {
@@ -1147 +1259 @@
-            if (offend)
-            {   Expression *e;
-
-
-
+
+
+
+
+
-            if (global.params.useAssert &&
-                !global.params.useInline)
@@ -1210 +1324 @@
-        else
-            p = v_arguments;        // last parameter is _arguments[]
-
+
+
+
+
+
-        offset = (offset + 3) & ~3; // assume stack aligns on 4
-        e = new SymOffExp(0, p, offset);
@@ -1228 +1346 @@
-        Expression *e1 = new VarExp(0, _arguments);
-        e = new AssignExp(0, e1, e);
-
+
+
-        a->push(new ExpStatement(0, e));
-        }
@@ -1285 +1404 @@
-                    ThisExp* v = new ThisExp(0);
-                    v->type = vthis->type;
+#if STRUCTTHISREF
+            if (ad->isStructDeclaration())
+            v = v->addressOf(sc);
+#endif                    
-                    v->var = vthis;
-
@@ -1333 +1456 @@
-
-        fbody = new CompoundStatement(0, a);
+#if DMDV2
+        /* Append destructor calls for parameters as finally blocks.
+         */
+        if (parameters)
+        {   for (size_t i = 0; i < parameters->dim; i++)
+        {
+            VarDeclaration *v = (VarDeclaration *)parameters->data[i];
+
+            if (v->storage_class & (STCref | STCout))
+            continue;
+
+            /* Don't do this for static arrays, since static
+             * arrays are called by reference. Remove this
+             * when we change them to call by value.
+             */
+            if (v->type->toBasetype()->ty == Tsarray)
+            continue;
+
+            Expression *e = v->callAutoDtor(sc);
+            if (e)
+            {   Statement *s = new ExpStatement(0, e);
+            s = s->semantic(sc);
+            if (fbody->blockExit() == BEfallthru)
+                fbody = new CompoundStatement(0, fbody, s);
+            else
+                fbody = new TryFinallyStatement(0, fbody, s);
+            }
+        }
+        }
+#endif
-
-        // wrap body of synchronized functions in a synchronized statement
@@ -1431 +1584 @@
-
-/****************************************************
+ * Merge into this function the 'in' contracts of all it overrides.
+ * 'in's are OR'd together, i.e. only one of them needs to pass.
+ */
+
+Statement *FuncDeclaration::mergeFrequire(Statement *sf)
+{
+    /* Implementing this is done by having the overriding function call
+     * nested functions (the fdrequire functions) nested inside the overridden
+     * function. This requires that the stack layout of the calling function's
+     * parameters and 'this' pointer be in the same place (as the nested
+     * function refers to them).
+     * This is easy for the parameters, as they are all on the stack in the same
+     * place by definition, since it's an overriding function. The problem is
+     * getting the 'this' pointer in the same place, since it is a local variable.
+     * We did some hacks in the code generator to make this happen:
+     *  1. always generate exception handler frame, or at least leave space for it
+     *     in the frame (Windows 32 SEH only)
+     *  2. always generate an EBP style frame
+     *  3. since 'this' is passed in a register that is subsequently copied into
+     *     a stack local, allocate that local immediately following the exception
+     *     handler block, so it is always at the same offset from EBP.
+     */
+    for (int i = 0; i < foverrides.dim; i++)
+    {
+    FuncDeclaration *fdv = (FuncDeclaration *)foverrides.data[i];
+    sf = fdv->mergeFrequire(sf);
+    if (fdv->fdrequire)
+    {
+        //printf("fdv->frequire: %s\n", fdv->frequire->toChars());
+        /* Make the call:
+         *   try { __require(); }
+         *   catch { frequire; }
+         */
+        Expression *eresult = NULL;
+        Expression *e = new CallExp(loc, new VarExp(loc, fdv->fdrequire), eresult);
+        Statement *s2 = new ExpStatement(loc, e);
+
+        if (sf)
+        {   Catch *c = new Catch(loc, NULL, NULL, sf);
+        Array *catches = new Array();
+        catches->push(c);
+        sf = new TryCatchStatement(loc, s2, catches);
+        }
+        else
+        sf = s2;
+    }
+    }
+    return sf;
+}
+
+/****************************************************
+ * Merge into this function the 'out' contracts of all it overrides.
+ * 'out's are AND'd together, i.e. all of them need to pass.
+ */
+
+Statement *FuncDeclaration::mergeFensure(Statement *sf)
+{
+    /* Same comments as for mergeFrequire(), except that we take care
+     * of generating a consistent reference to the 'result' local by
+     * explicitly passing 'result' to the nested function as a reference
+     * argument.
+     * This won't work for the 'this' parameter as it would require changing
+     * the semantic code for the nested function so that it looks on the parameter
+     * list for the 'this' pointer, something that would need an unknown amount
+     * of tweaking of various parts of the compiler that I'd rather leave alone.
+     */
+    for (int i = 0; i < foverrides.dim; i++)
+    {
+    FuncDeclaration *fdv = (FuncDeclaration *)foverrides.data[i];
+    sf = fdv->mergeFensure(sf);
+    if (fdv->fdensure)
+    {
+        //printf("fdv->fensure: %s\n", fdv->fensure->toChars());
+        // Make the call: __ensure(result)
+        Expression *eresult = NULL;
+        if (outId)
+        eresult = new IdentifierExp(loc, outId);
+        Expression *e = new CallExp(loc, new VarExp(loc, fdv->fdensure), eresult);
+        Statement *s2 = new ExpStatement(loc, e);
+
+        if (sf)
+        {
+        sf = new CompoundStatement(fensure->loc, s2, sf);
+        }
+        else
+        sf = s2;
+    }
+    }
+    return sf;
+}
+
+/****************************************************
- * Determine if 'this' overrides fd.
- * Return !=0 if it does.
@@ -1605 +1850 @@
-
-/********************************************
+ * If there are no overloads of function f, return that function,
+ * otherwise return NULL.
+ */
+
+static int fpunique(void *param, FuncDeclaration *f)
+{   FuncDeclaration **pf = (FuncDeclaration **)param;
+
+    if (*pf)
+    {   *pf = NULL;
+    return 1;       // ambiguous, done
+    }
+    else
+    {   *pf = f;
+    return 0;
+    }
+}
+
+FuncDeclaration *FuncDeclaration::isUnique()
+{   FuncDeclaration *result = NULL;
+
+    overloadApply(getModule(), this, &fpunique, &result);
+    return result;
+}
+
+/********************************************
- * Find function in overload list that exactly matches t.
- */
@@ -1748 +2018 @@
-
-
-
+
+
-{
-    Param2 p;
@@ -1774 +2045 @@
-    if (fa)
-    {
-
+NULL, 
-        next = fa->overnext;
-    }
@@ -1838 +2109 @@
-#endif
-
-s *arguments, Module* from
+ *ethis, Expressions *arguments, Module *from, int flags
-{
-    TypeFunction *tf;
@@ -1861 +2132 @@
-    memset(&m, 0, sizeof(m));
-    m.last = MATCHnomatch;
-
+NULL, 
-
-    if (m.count == 1)       // exactly one match
@@ -2040 +2311 @@
-}
-
+const char *FuncDeclaration::toPrettyChars()
+{
+    if (isMain())
+    return "D main";
+    else
+    return Dsymbol::toPrettyChars();
+}
-
-int FuncDeclaration::isMain()
@@ -2405 +2683 @@
-    tret = cd->type; //->referenceTo();
-    type = new TypeFunction(arguments, tret, varargs, LINKd);
+#if STRUCTTHISREF
+    if (ad && ad->isStructDeclaration())
+    ((TypeFunction *)type)->isref = 1;
+#endif
-    if (!originalType)
-    originalType = type;
@@ -2416 +2698 @@
-    // to the function body
-    if (fbody)
-
-
-
-
-
-
+
+
+
+
-    }
-
@@ -2466 +2746 @@
-}
-
+/********************************* PostBlitDeclaration ****************************/
+
+#if DMDV2
+PostBlitDeclaration::PostBlitDeclaration(Loc loc, Loc endloc)
+    : FuncDeclaration(loc, endloc, Id::_postblit, STCundefined, NULL)
+{
+}
+
+PostBlitDeclaration::PostBlitDeclaration(Loc loc, Loc endloc, Identifier *id)
+    : FuncDeclaration(loc, endloc, id, STCundefined, NULL)
+{
+}
+
+Dsymbol *PostBlitDeclaration::syntaxCopy(Dsymbol *s)
+{
+    assert(!s);
+    PostBlitDeclaration *dd = new PostBlitDeclaration(loc, endloc, ident);
+    return FuncDeclaration::syntaxCopy(dd);
+}
+
+
+void PostBlitDeclaration::semantic(Scope *sc)
+{
+    //printf("PostBlitDeclaration::semantic() %s\n", toChars());
+    //printf("ident: %s, %s, %p, %p\n", ident->toChars(), Id::dtor->toChars(), ident, Id::dtor);
+    parent = sc->parent;
+    Dsymbol *parent = toParent();
+    StructDeclaration *ad = parent->isStructDeclaration();
+    if (!ad)
+    {
+    error("post blits are only for struct/union definitions, not %s %s", parent->kind(), parent->toChars());
+    }
+    else if (ident == Id::_postblit)
+    ad->postblits.push(this);
+    type = new TypeFunction(NULL, Type::tvoid, FALSE, LINKd);
+
+    sc = sc->push();
+    sc->stc &= ~STCstatic;      // not static
+    sc->linkage = LINKd;
+
+    FuncDeclaration::semantic(sc);
+
+    sc->pop();
+}
+
+int PostBlitDeclaration::overloadInsert(Dsymbol *s)
+{
+    return FALSE;   // cannot overload postblits
+}
+
+int PostBlitDeclaration::addPreInvariant()
+{
+    return FALSE;
+}
+
+int PostBlitDeclaration::addPostInvariant()
+{
+    return (isThis() && vthis && global.params.useInvariants);
+}
+
+int PostBlitDeclaration::isVirtual()
+{
+    return FALSE;
+}
+
+void PostBlitDeclaration::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
+{
+    if (hgs->hdrgen)
+    return;
+    buf->writestring("=this()");
+    bodyToCBuffer(buf, hgs);
+}
+#endif
+
-/********************************* DtorDeclaration ****************************/
-
@@ -2488 +2842 @@
-void DtorDeclaration::semantic(Scope *sc)
-{
-ClassDeclaration *cd
-
+//printf("DtorDeclaration::semantic() %s\n", toChars())
+
-    parent = sc->parent;
-    Dsymbol *parent = toParent();
-
+ClassDeclaration *
-    if (!cd)
-    {
-only are for class definitions"
+are only for class/struct/union definitions, not %s %s", parent->kind(), parent->toChars()
-    fatal();
-    }
@@ -2524 +2878 @@
-{
-    return FALSE;
+}
+
+const char *DtorDeclaration::kind()
+{   
+    return "destructor";
+}
+
+char *DtorDeclaration::toChars()
+{
+    return (char *)"~this";
-}
-
@@ -2864 +3228 @@
-    }
-
+#if 0
-    // We're going to need ModuleInfo even if the unit tests are not
-    // compiled in, because other modules may import this module and refer
-    // to this ModuleInfo.
+    // (This doesn't make sense to me?)
-    Module *m = getModule();
-    if (!m)
-    m = sc->module;
-    if (m)
+    {
+    //printf("module3 %s needs moduleinfo\n", m->toChars());
-    m->needmoduleinfo = 1;
+    }
+#endif
-}
-

dmd/idgen.c

@@ -39 +39 @@
-    { "classInvariant", "__invariant" },
-    { "unitTest", "_unitTest" },
+    { "require", "__require" },
+    { "ensure", "__ensure" },
-    { "init" },
-    { "size" },
@@ -208 +210 @@
-    { "aaValues", "_aaValues" },
-    { "aaRehash", "_aaRehash" },
+    { "monitorenter", "_d_monitorenter" },
+    { "monitorexit", "_d_monitorexit" },
+    { "criticalenter", "_d_criticalenter" },
+    { "criticalexit", "_d_criticalexit" },
-
-    // For pragma's

dmd/import.c

@@ -1 +1 @@
-
-// Compiler implementation of the D programming language
-6
+9
-// All Rights Reserved
-// written by Walter Bright
@@ -22 +22 @@
-#include "declaration.h"
-#include "id.h"
+#include "attrib.h"
-
-/********************************* Import ****************************/
@@ -29 +30 @@
-    : Dsymbol(id)
-{
+    assert(id);
-    this->loc = loc;
-    this->packages = packages;
@@ -85 +87 @@
-void Import::load(Scope *sc)
-{
-    DsymbolTable *dst;
-    Dsymbol *s;
-
-    //printf("Import::load('%s')\n", toChars());
-
-    // See if existing module
-
-
-
+DsymbolTable *
+
+Dsymbol *
-    if (s)
-    {
+#if TARGET_NET
+    mod = (Module *)s;
+#else
-    if (s->isModule())
-        mod = (Module *)s;
-    else
-        error("package and module have the same name");
+#endif
-    }
-
@@ -117 +120 @@
-}
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-        case '(':
-        case ')':
-        case '\\':
-
-
-
+
-        default:
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -141 +163 @@
-    //printf("Import::semantic('%s')\n", toChars());
-
-
+
+
+
+
+
-
-    if (mod)
@@ -159 +185 @@
-    sc->module->aimports.push(mod);
-
-    mod->semantic();
-
-    /* Default to private importing
-     */
@@ -172 +196 @@
-    }
-
+    mod->semantic();
+
-    if (mod->needmoduleinfo)
-        sc->module->needmoduleinfo = 1;
@@ -190 +216 @@
-    //printf("-Import::semantic('%s'), pkg = %p\n", toChars(), pkg);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+