Changeset 882

Timestamp:

03/08/08 17:16:54 (6 months ago)

Author:

Gregor

Message:

MERGE: DMD 2.011

Files:

• branches/dmdfe-2.0/Makefile (modified) (1 diff)
• branches/dmdfe-2.0/access.c (modified) (1 diff)
• branches/dmdfe-2.0/aggregate.h (modified) (11 diffs)
• branches/dmdfe-2.0/attrib.c (modified) (3 diffs)
• branches/dmdfe-2.0/cast.c (modified) (2 diffs)
• branches/dmdfe-2.0/class.c (modified) (2 diffs)
• branches/dmdfe-2.0/clone.c (added)
• branches/dmdfe-2.0/declaration.c (modified) (6 diffs)
• branches/dmdfe-2.0/declaration.h (modified) (3 diffs)
• branches/dmdfe-2.0/doc.c (modified) (10 diffs)
• branches/dmdfe-2.0/dsymbol.h (modified) (3 diffs)
• branches/dmdfe-2.0/e2ir.c (added)
• branches/dmdfe-2.0/expression.c (modified) (45 diffs)
• branches/dmdfe-2.0/expression.h (modified) (15 diffs)
• branches/dmdfe-2.0/func.c (modified) (27 diffs)
• branches/dmdfe-2.0/idgen.c (modified) (5 diffs)
• branches/dmdfe-2.0/interpret.c (modified) (3 diffs)
• branches/dmdfe-2.0/lexer.c (modified) (5 diffs)
• branches/dmdfe-2.0/lexer.h (modified) (4 diffs)
• branches/dmdfe-2.0/link.c (modified) (1 diff)
• branches/dmdfe-2.0/mars.c (modified) (2 diffs)
• branches/dmdfe-2.0/mtype.c (modified) (13 diffs)
• branches/dmdfe-2.0/mtype.h (modified) (1 diff)
• branches/dmdfe-2.0/parse.c (modified) (7 diffs)
• branches/dmdfe-2.0/parse.h (modified) (2 diffs)
• branches/dmdfe-2.0/scope.c (modified) (2 diffs)
• branches/dmdfe-2.0/scope.h (modified) (1 diff)
• branches/dmdfe-2.0/statement.c (modified) (54 diffs)
• branches/dmdfe-2.0/statement.h (modified) (35 diffs)
• branches/dmdfe-2.0/struct.c (modified) (4 diffs)
• branches/dmdfe-2.0/template.c (modified) (9 diffs)
• branches/dmdfe-2.0/template.h (modified) (1 diff)
• branches/dmdfe-2.0/tocsym.c (modified) (1 diff)
• branches/dmdfe-2.0/toir.c (modified) (1 diff)
• branches/dmdfe-2.0/toobj.c (modified) (5 diffs)
• branches/dmdfe-2.0/traits.c (modified) (1 diff)
• branches/dmdfe-2.0/typinf.c (modified) (2 diffs)

branches/dmdfe-2.0/Makefile

@@ -14 +14 @@
-  cast.o \
-  class.o \
+  clone.o \
-  cond.o \
-  constfold.o \

branches/dmdfe-2.0/access.c

@@ -254 +254 @@
-    {
-    error(loc, "member %s is not accessible", smember->toChars());
+halt();
-    }
-}

branches/dmdfe-2.0/aggregate.h

@@ -1 +1 @@
-
-// Compiler implementation of the D programming language
-7
+8
-// All Rights Reserved
-// written by Walter Bright
@@ -58 +58 @@
-    DeleteDeclaration *aggDelete;   // deallocator
-
+    FuncDeclarations dtors; // Array of destructors
+    FuncDeclaration *dtor;  // aggregate destructor
+
-#ifdef IN_GCC
-    Array methods;              // flat list of all methods for debug information
@@ -71 +74 @@
-    void addField(Scope *sc, VarDeclaration *v);
-    int isDeprecated();     // is aggregate deprecated?
+    FuncDeclaration *buildDtor(Scope *sc);
-
-    void emitComment(Scope *sc);
@@ -103 +107 @@
-{
-    int zeroInit;       // !=0 if initialize with 0 fill
+    int hasIdentityAssign;  // !=0 if has identity opAssign
+    FuncDeclaration *cpctor;    // generated copy-constructor, if any
+
+    FuncDeclarations postblits; // Array of postblit functions
+    FuncDeclaration *postblit;  // aggregate postblit
-
-    StructDeclaration(Loc loc, Identifier *id);
@@ -110 +119 @@
-    char *mangle();
-    char *kind();
+    int needOpAssign();
+    FuncDeclaration *buildOpAssign(Scope *sc);
+    FuncDeclaration *buildPostBlit(Scope *sc);
+    FuncDeclaration *buildCpCtor(Scope *sc);
-    void toDocBuffer(OutBuffer *buf);
-
@@ -149 +162 @@
-};
-
+#if V2
-#define CLASSINFO_SIZE  (0x3C+16)   // value of ClassInfo.size
+#else
+#define CLASSINFO_SIZE  (0x3C+12)   // value of ClassInfo.size
+#endif
-
-struct ClassDeclaration : AggregateDeclaration
@@ -159 +176 @@
-    CtorDeclaration *ctor;
-    CtorDeclaration *defaultCtor;   // default constructor
-    FuncDeclarations dtors;     // Array of destructors
-    FuncDeclaration *staticCtor;
-    FuncDeclaration *staticDtor;
@@ -194 +210 @@
-
-    Dsymbol *search(Loc, Identifier *ident, int flags);
+#if V2
-    int isFuncHidden(FuncDeclaration *fd);
+#endif
-    FuncDeclaration *findFunc(Identifier *ident, TypeFunction *tf);
-    void interfaceSemantic(Scope *sc);
@@ -200 +218 @@
-    int isCOMclass();
-    virtual int isCOMinterface();
+#if V2
-    virtual int isCPPinterface();
+#endif
-    int isAbstract();
-    virtual int vtblOffset();
@@ -224 +244 @@
-struct InterfaceDeclaration : ClassDeclaration
-{
+#if V2
-    int cpp;                // !=0 if this is a C++ interface
-
+
-    InterfaceDeclaration(Loc loc, Identifier *id, BaseClasses *baseclasses);
-    Dsymbol *syntaxCopy(Dsymbol *s);
@@ -233 +254 @@
-    char *kind();
-    int vtblOffset();
+#if V2
-    int isCPPinterface();
+#endif
-    virtual int isCOMinterface();
-

branches/dmdfe-2.0/attrib.c

@@ -1 +1 @@
-
-// Compiler implementation of the D programming language
-7
+8
-// All Rights Reserved
-// written by Walter Bright
@@ -30 +30 @@
-#include "module.h"
-#include "parse.h"
+#include "template.h"
-
-extern void obj_includelib(char *name);
+void obj_startaddress(Symbol *s);
-
-
@@ -800 +802 @@
-    }
-#endif
+    else if (ident == Id::startaddress)
+    {
+    if (!args || args->dim != 1)
+        error("function name expected for start address");
+    else
+    {
+        Expression *e = (Expression *)args->data[0];
+        e = e->semantic(sc);
+        e = e->optimize(WANTvalue | WANTinterpret);
+        args->data[0] = (void *)e;
+        Dsymbol *sa = getDsymbol(e);
+        if (!sa || !sa->isFuncDeclaration())
+        error("function name expected for start address, not '%s'", e->toChars());
+    }
+    goto Lnodecl;
+    }
-    else
-    error("unrecognized pragma(%s)", ident->toChars());

branches/dmdfe-2.0/cast.c

@@ -342 +342 @@
-    if (this->type->equals(t))
-    return MATCHexact;
+
+    /* Allow implicit conversions from invariant to mutable|const,
+     * and mutable to invariant. It works because, after all, a null
+     * doesn't actually point to anything.
+     */
+    if (t->invariantOf()->equals(type->invariantOf()))
+    return MATCHconst;
+
-    // NULL implicitly converts to any pointer type or dynamic array
-    if (type->ty == Tpointer && type->nextOf()->ty == Tvoid)
@@ -353 +361 @@
-    }
-    return Expression::implicitConvTo(t);
+}
+
+MATCH StructLiteralExp::implicitConvTo(Type *t)
+{
+#if 0
+    printf("StructLiteralExp::implicitConvTo(this=%s, type=%s, t=%s)\n",
+    toChars(), type->toChars(), t->toChars());
+#endif
+    MATCH m = Expression::implicitConvTo(t);
+    if (m != MATCHnomatch)
+    return m;
+    if (type->ty == t->ty && type->ty == Tstruct &&
+    ((TypeStruct *)type)->sym == ((TypeStruct *)t)->sym)
+    {
+    m = MATCHconst;
+    for (int i = 0; i < elements->dim; i++)
+    {   Expression *e = (Expression *)elements->data[i];
+        Type *te = e->type;
+        if (t->mod == 0)
+        te = te->mutableOf();
+        else
+        {   assert(t->mod == MODinvariant);
+        te = te->invariantOf();
+        }
+        MATCH m2 = e->implicitConvTo(te);
+        //printf("\t%s => %s, match = %d\n", e->toChars(), te->toChars(), m2);
+        if (m2 < m)
+        m = m2;
+    }
+    }
+    return m;
-}
-

branches/dmdfe-2.0/class.c

@@ -1 +1 @@
-
-// Compiler implementation of the D programming language
-7
+8
-// All Rights Reserved
-// written by Walter Bright
@@ -653 +653 @@
-    Module::dprogress++;
-
+    dtor = buildDtor(sc);
-
-    sc->pop();

branches/dmdfe-2.0/declaration.c

@@ -689 +689 @@
-    type = type->semantic(loc, sc);
-    }
-
+semantic 
-
-    type->checkDeprecated(loc, sc);
@@ -730 +730 @@
-    Objects *exps = new Objects();
-    exps->setDim(nelems);
+    Expression *ie = init ? init->toExpression() : NULL;
-
-    for (size_t i = 0; i < nelems; i++)
@@ -740 +741 @@
-        Identifier *id = new Identifier(name, TOKidentifier);
-
-
+
+
+
+
+
+
+
+
+
+
-        //printf("declaring field %s of type %s\n", v->toChars(), v->type->toChars());
-        v->semantic(sc);
@@ -1109 +1119 @@
-    if (init)
-    {   buf->writestring(" = ");
-
+
+
+
+
+
-    }
-    buf->writeByte(';');
@@ -1279 +1293 @@
- */
-
-
+Scope *sc
-{   Expression *e = NULL;
-
-    //printf("VarDeclaration::callAutoDtor() %s\n", toChars());
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    {
-    for (ClassDeclaration *cd = type->isClassHandle();
@@ -1293 +1352 @@
-         * could be set.
-         */
-
-
+//
+//
-        if (1 || onstack || cd->dtors.dim)  // if any destructors
-        {

branches/dmdfe-2.0/declaration.h

@@ -66 +66 @@
-    STCinit     = 0x400000,     // has explicit initializer
-    STCmanifest     = 0x800000,     // manifest constant
+    STCnodtor       = 0x1000000,    // don't run destructor
+    STCnothrow      = 0x2000000,    // never throws exceptions
-};
-
@@ -242 +244 @@
-    int hasPointers();
-    int canTakeAddressOf();
-
+Scope *sc
-    ExpInitializer *getExpInitializer();
-    Expression *getConstInitializer();
@@ -565 +567 @@
-};
-
+struct PostBlitDeclaration : FuncDeclaration
+{
+    PostBlitDeclaration(Loc loc, Loc endloc);
+    PostBlitDeclaration(Loc loc, Loc endloc, Identifier *id);
+    Dsymbol *syntaxCopy(Dsymbol *);
+    void semantic(Scope *sc);
+    void toCBuffer(OutBuffer *buf, HdrGenState *hgs);
+    int isVirtual();
+    int addPreInvariant();
+    int addPostInvariant();
+    int overloadInsert(Dsymbol *s);
+    void emitComment(Scope *sc);
+
+    PostBlitDeclaration *isPostBlitDeclaration() { return this; }
+};
+
-struct DtorDeclaration : FuncDeclaration
-{
-    DtorDeclaration(Loc loc, Loc endloc);
+    DtorDeclaration(Loc loc, Loc endloc, Identifier *id);
-    Dsymbol *syntaxCopy(Dsymbol *);
-    void semantic(Scope *sc);

branches/dmdfe-2.0/doc.c

@@ -1 +1 @@
-
-// Compiler implementation of the D programming language
-6
+8
-// All Rights Reserved
-// written by Walter Bright
@@ -103 +103 @@
-unsigned skiptoident(OutBuffer *buf, unsigned i);
-unsigned skippastident(OutBuffer *buf, unsigned i);
+unsigned skippastURL(OutBuffer *buf, unsigned i);
-void highlightText(Scope *sc, Dsymbol *s, OutBuffer *buf, unsigned offset);
-void highlightCode(Scope *sc, Dsymbol *s, OutBuffer *buf, unsigned offset);
@@ -115 +116 @@
-    <h1>$(TITLE)</h1>\n\
-    $(BODY)\n\
-
+2.0/
-    </body></html>\n\
-\n\
@@ -372 +373 @@
-void Dsymbol::emitDitto(Scope *sc)
-{
+    //printf("Dsymbol::emitDitto() %s %s\n", kind(), toChars());
-    OutBuffer *buf = sc->docbuf;
-    unsigned o;
@@ -377 +379 @@
-
-    b.writestring("$(DDOC_DITTO ");
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    b.writeByte(')');
-    buf->spread(sc->lastoffset, b.offset);
@@ -436 +449 @@
-void Dsymbol::emitComment(Scope *sc)           { }
-void InvariantDeclaration::emitComment(Scope *sc)  { }
+void PostBlitDeclaration::emitComment(Scope *sc)   { }
-void DtorDeclaration::emitComment(Scope *sc)       { }
-void StaticCtorDeclaration::emitComment(Scope *sc) { }
@@ -636 +650 @@
-    HdrGenState hgs;
-
+    hgs.ddoc = 1;
-    toCBuffer(buf, &hgs);
-}
@@ -739 +754 @@
-        buf->writestring(ident->toChars());
-        buf->writeByte('(');
-p
+origP
-        {
-p
+origP
-        if (i)
-            buf->writeByte(',');
@@ -1492 +1507 @@
-
-
+/************************************************
+ * Scan forward past URL starting at i.
+ * We don't want to highlight parts of a URL.
+ * Returns:
+ *  i if not a URL
+ *  index just past it if it is a URL
+ */
+
+unsigned skippastURL(OutBuffer *buf, unsigned i)
+{   unsigned length = buf->offset - i;
+    unsigned char *p = &buf->data[i];
+    unsigned j;
+    unsigned sawdot = 0;
+
+    if (length > 7 && memicmp((char *)p, "http://", 7) == 0)
+    {
+    j = 7;
+    }
+    else if (length > 8 && memicmp((char *)p, "https://", 8) == 0)
+    {
+    j = 8;
+    }
+    else
+    goto Lno;
+
+    for (; j < length; j++)
+    {   unsigned char c = p[j];
+    if (isalnum(c))
+        continue;
+        if (c == '-' || c == '_' || c == '?' ||
+            c == '=' || c == '%' || c == '&' ||
+            c == '/' || c == '+' || c == '#' ||
+            c == '~')
+            continue;
+        if (c == '.')
+        {
+            sawdot = 1;
+            continue;
+        }
+        break;
+    }
+    if (sawdot)
+    return i + j;
+
+Lno:
+    return i;
+}
+
+
-/****************************************************
- */
@@ -1736 +1800 @@
-            if (j > i)
-            {
+            unsigned k = skippastURL(buf, i);
+            if (k > i)
+            {   i = k - 1;
+                break;
+            }
+
-            if (buf->data[i] == '_')    // leading '_' means no highlight
-            {

branches/dmdfe-2.0/dsymbol.h

@@ -1 +1 @@
-
-// Compiler implementation of the D programming language
-7
+8
-// All Rights Reserved
-// written by Walter Bright
@@ -39 +39 @@
-struct FuncLiteralDeclaration;
-struct CtorDeclaration;
+struct PostBlitDeclaration;
-struct DtorDeclaration;
-struct StaticCtorDeclaration;
@@ -185 +186 @@
-    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; }

branches/dmdfe-2.0/expression.c

@@ -1 +1 @@
-
-// Compiler implementation of the D programming language
-7
+8
-// All Rights Reserved
-// written by Walter Bright
@@ -177 +177 @@
-
-    precedence[TOKassign] = PREC_assign;
+    precedence[TOKconstruct] = PREC_assign;
+    precedence[TOKblit] = PREC_assign;
-    precedence[TOKaddass] = PREC_assign;
-    precedence[TOKminass] = PREC_assign;
@@ -298 +300 @@
-}
-
+
+/******************************
+ * Perform canThrow() on an array of Expressions.
+ */
+
+int arrayExpressionCanThrow(Expressions *exps)
+{
+    if (exps)
+    {
+    for (size_t i = 0; i < exps->dim; i++)
+    {   Expression *e = (Expression *)exps->data[i];
+        if (e && e->canThrow())
+        return 1;
+    }
+    }
+    return 0;
+}
+
+
-/****************************************
- * Expand tuples.
@@ -382 +403 @@
-}
-
+/*********************************************
+ * Call copy constructor for struct value argument.
+ */
+
+Expression *callCpCtor(Loc loc, Scope *sc, Expression *e)
+{
+    Type *tb = e->type->toBasetype();
+    assert(tb->ty == Tstruct);
+    StructDeclaration *sd = ((TypeStruct *)tb)->sym;
+    if (sd->cpctor)
+    {
+    /* Create a variable tmp, and replace the argument e with:
+     *  (tmp = e),tmp
+     * and let AssignExp() handle the construction.
+     * This is not the most efficent, ideally tmp would be constructed
+     * directly onto the stack.
+     */
+    Identifier *idtmp = Lexer::uniqueId("__tmp");
+    VarDeclaration *tmp = new VarDeclaration(loc, tb, idtmp, new ExpInitializer(0, e));
+    Expression *ae = new DeclarationExp(loc, tmp);
+    e = new CommaExp(loc, ae, new VarExp(loc, tmp));
+    e = e->semantic(sc);
+    }
+    return e;
+}
-
-/****************************************
- * Now that we know the exact type of the function we're calling,
- * the arguments[] need to be adjusted:
-
-
-
-
+
+
+
+
+
- */
-
@@ -395 +442 @@
-{
-    unsigned n;
-    int done;
-    Type *tb;
-
-    //printf("functionArguments()\n");
@@ -408 +453 @@
-    n = (nargs > nparams) ? nargs : nparams;    // n = max(nargs, nparams)
-
-
+int 
-    for (size_t i = 0; i < n; i++)
-    {
@@ -417 +462 @@
-    else
-        arg = NULL;
+    Type *tb;
-
-    if (i < nparams)
@@ -463 +509 @@
-            }
-#endif
-
-
-
-
+
-            Type *t = new TypeSArray(((TypeArray *)tb)->next, new IntegerExp(nargs - i));
-            t = t->semantic(loc, sc);
@@ -545 +588 @@
-        }
-
+        if (tb->ty == Tstruct && !(p->storageClass & (STCref | STCout)))
+        {
+        arg = callCpCtor(loc, sc, arg);
+        }
+
-        // Convert lazy argument to a delegate
-        if (p->storageClass & STClazy)
@@ -586 +634 @@
-        }
-
+        if (tb->ty == Tstruct)
+        {
+        arg = callCpCtor(loc, sc, arg);
+        }
+
-        // Give error for overloaded function addresses
-        if (arg->op == TOKsymoff)
@@ -594 +647 @@
-        arg->rvalue();
-    }
+
-    arg = arg->optimize(WANTvalue);
-    arguments->data[i] = (void *) arg;
@@ -1011 +1065 @@
-    return FALSE;
-}
+
+/********************************
+ * Can this expression throw an exception?
+ * Valid only after semantic() pass.
+ */
+
+int Expression::canThrow()
+{
+    return FALSE;
+}
+
+
-
-Expressions *Expression::arraySyntaxCopy(Expressions *exps)
@@ -2551 +2617 @@
-}
-
+int ArrayLiteralExp::canThrow()
+{
+    return 1;   // because it can fail allocating memory
+}
+
-void ArrayLiteralExp::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
-{
@@ -2667 +2738 @@
-    size_t dim = keys->dim;
-    return result ? (dim != 0) : (dim == 0);
+}
+
+int AssocArrayLiteralExp::canThrow()
+{
+    return 1;
-}
-
@@ -2873 +2949 @@
-    Expression::checkSideEffect(0);
-    return f;
+}
+
+int StructLiteralExp::canThrow()
+{
+    return arrayExpressionCanThrow(elements);
-}
-
@@ -3348 +3429 @@
-}
-
+int NewExp::canThrow()
+{
+    return 1;
+}
+
-void NewExp::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
-{   int i;
@@ -3410 +3496 @@
-
-int NewAnonClassExp::checkSideEffect(int flag)
+{
+    return 1;
+}
+
+int NewAnonClassExp::canThrow()
-{
-    return 1;
@@ -3759 +3850 @@
-}
-
+int TupleExp::canThrow()
+{
+    return arrayExpressionCanThrow(exps);
+}
+
-void TupleExp::checkEscape()
-{
@@ -3882 +3978 @@
-    else if (sc->func)
-    {   VarDeclaration *v = s->isVarDeclaration();
-(s->isFuncDeclaration() /*|| v && v->storage_class & STCstatic*/
+s->isFuncDeclaration(
-        !sc->func->localsymtab->insert(s))
-        error("declaration %s is already defined in another scope in %s", s->toPrettyChars(), sc->func->toChars());
@@ -3925 +4021 @@
-{
-    return 1;
+}
+
+int DeclarationExp::canThrow()
+{
+    VarDeclaration *v = declaration->isVarDeclaration();
+    if (v && v->init)
+    {   ExpInitializer *ie = v->init->isExpInitializer();
+    return ie && ie->exp->canThrow();
+    }
+    return 0;
-}
-
@@ -4370 +4476 @@
-}
-
+int UnaExp::canThrow()
+{
+    return e1->canThrow();
+}
+
-void UnaExp::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
-{
@@ -4491 +4602 @@
-       op == TOKminusminus ||
-       op == TOKassign ||
+       op == TOKconstruct ||
+       op == TOKblit ||
-       op == TOKaddass ||
-       op == TOKminass ||
@@ -4523 +4636 @@
-}
-
+int BinExp::canThrow()
+{
+    return e1->canThrow() || e2->canThrow();
+}
+
-void BinExp::incompatibleTypes()
-{
@@ -4689 +4807 @@
-{
-    return 1;
+}
+
+int AssertExp::canThrow()
+{
+    return (global.params.useAssert != 0);
-}
-
@@ -4789 +4912 @@
-    eleft = NULL;
-    eright = e1;
+    }
+
+    if (e1->op == TOKtuple && ident == Id::offsetof)
+    {   /* 'distribute' the .offsetof to each of the tuple elements.
+     */
+    TupleExp *te = (TupleExp *)e1;
+    Expressions *exps = new Expressions();
+    exps->setDim(te->exps->dim);
+    for (int i = 0; i < exps->dim; i++)
+    {   Expression *e = (Expression *)te->exps->data[i];
+        e = e->semantic(sc);
+        e = new DotIdExp(e->loc, e, Id::offsetof);
+        exps->data[i] = (void *)e;
+    }
+    e = new TupleExp(loc, exps);
+    e = e->semantic(sc);
+    return e;
-    }
-
@@ -5100 +5240 @@
-        }
-        }
-
+
+
-    }
-    }
@@ -5220 +5361 @@
-    t1 = t1->toBasetype();
-    //t1->print();
+
+    /* Extract the following from e1:
+     *  s: the symbol which ti should be a member of
+     *  eleft: if not NULL, it is the 'this' pointer for ti
+     */
+
-    if (e1->op == TOKdotexp)
-    {   DotExp *de = (DotExp *)e1;
@@ -5461 +5608 @@
-    Type *t1;
-    int istemp;
+    Objects *targsi = NULL; // initial list of template arguments
-
-#if LOGSEMANTIC
-    printf("CallExp::semantic() %s\n", toChars());
+e1->dump(0);
-#endif
-    if (type)
@@ -5523 +5672 @@
-    }
-
+    /* This recognizes:
+     *  foo!(tiargs)(funcargs)
+     */
+    if (e1->op == TOKimport && !e1->type)
+    {   ScopeExp *se = (ScopeExp *)e1;
+    TemplateInstance *ti = se->sds->isTemplateInstance();
+    if (ti && !ti->semanticdone)
+    {
+        /* Attempt to instantiate ti. If that works, go with it.
+         * If not, go with partial explicit specialization.
+         */
+        unsigned errors = global.errors;
+        global.gag++;
+        ti->semantic(sc);
+        global.gag--;
+        if (errors != global.errors)
+        {
+        global.errors = errors;
+        targsi = ti->tiargs;
+        e1 = new IdentifierExp(loc, ti->name);
+        }
+    }
+    }
+
+    /* This recognizes:
+     *  expr.foo!(tiargs)(funcargs)
+     */
+    if (e1->op == TOKdotti && !e1->type)
+    {   DotTemplateInstanceExp *se = (DotTemplateInstanceExp *)e1;
+    TemplateInstance *ti = se->ti;
+    if (!ti->semanticdone)
+    {
+        /* Attempt to instantiate ti. If that works, go with it.
+         * If not, go with partial explicit specialization.
+         */
+        Expression *etmp;
+        unsigned errors = global.errors;
+        global.gag++;
+        etmp = e1->semantic(sc);
+        global.gag--;
+        if (errors != global.errors)
+        {
+        global.errors = errors;
+        targsi = ti->tiargs;
+        e1 = new DotIdExp(loc, se->e1, ti->name);
+        }
+        else
+        e1 = etmp;
+    }
+    }
+
-    istemp = 0;
-Lagain:
@@ -5649 +5849 @@
-        // Should fix deduceFunctionTemplate() so it works on NULL argument
-        arguments = new Expressions();
-NULL
+targsi
-        if (!f)
-        {   type = Type::terror;
@@ -5849 +6049 @@
-        {   TemplateDeclaration *td = s->isTemplateDeclaration();
-        assert(td);
-NULL
+targsi
-        }
-        if (f2)
@@ -5895 +6095 @@
-    {
-        TemplateExp *te = (TemplateExp *)e1;
-NULL
+targsi
-        if (!f)
-        {   type = Type::terror;
@@ -5976 +6176 @@
-
-int CallExp::checkSideEffect(int flag)
+{
+    return 1;
+}
+
+int CallExp::canThrow()
-{
-    return 1;
@@ -6308 +6513 @@
-        StructDeclaration *sd = ts->sym;
-        FuncDeclaration *f = sd->aggDelete;
+        FuncDeclaration *fd = sd->dtor;
+
+        if (!f && !fd)
+            break;
+
+        /* Construct:
+         *  ea = copy e1 to a tmp to do side effects only once
+         *  eb = call destructor
+         *  ec = call dealloc