Changeset 1630:44b145be2ef5

Timestamp:

02/06/10 10:53:52 (2 years ago)

Author:

Robert Clipsham <robert@octarineparrot.com>

branch:

default

Message:

Merge dmd 1.056.

Files:

• dmd/access.c (modified) (1 diff)
• dmd/aggregate.h (modified) (3 diffs)
• dmd/arrayop.c (modified) (1 diff)
• dmd/attrib.c (modified) (8 diffs)
• dmd/class.c (modified) (2 diffs)
• dmd/cond.c (modified) (1 diff)
• dmd/declaration.c (modified) (3 diffs)
• dmd/declaration.h (modified) (1 diff)
• dmd/dsymbol.c (modified) (1 diff)
• dmd/dsymbol.h (modified) (4 diffs)
• dmd/enum.c (modified) (4 diffs)
• dmd/expression.c (modified) (8 diffs)
• dmd/expression.h (modified) (4 diffs)
• dmd/func.c (modified) (41 diffs)
• dmd/identifier.h (modified) (1 diff)
• dmd/inline.c (modified) (1 diff)
• dmd/interpret.c (modified) (24 diffs)
• dmd/mangle.c (modified) (1 diff)
• dmd/mars.c (modified) (5 diffs)
• dmd/mars.h (modified) (5 diffs)
• dmd/module.c (modified) (5 diffs)
• dmd/module.h (modified) (1 diff)
• dmd/mtype.c (modified) (1 diff)
• dmd/optimize.c (modified) (5 diffs)
• dmd/statement.c (modified) (1 diff)
• dmd/statement.h (modified) (4 diffs)
• dmd/struct.c (modified) (3 diffs)
• dmd/template.c (modified) (2 diffs)
• tests/mini/bug372.d (added)

dmd/access.c

@@ -393 +393 @@
-    if (!e)
-    {
-
-
-
-
-
-
+
+
+
+
+
-    }
-    else if (e->type->ty == Tclass)

dmd/aggregate.h

@@ -20 +20 @@
-#include "dsymbol.h"
-
+#if IN_LLVM
-#include <vector>
-#include <set>
-#include <map>
+#endif
-
-struct Identifier;
@@ -39 +41 @@
-struct dt_t;
-
+#if IN_LLVM
-namespace llvm
-{
@@ -47 +50 @@
-    class GlobalVariable;
-}
+#endif
-
-struct AggregateDeclaration : ScopeDsymbol

dmd/arrayop.c

@@ -25 +25 @@
-#include "init.h"
-
+#if IN_DMD
+extern int binary(const char *p , const char **tab, int high);
+
+/**************************************
+ * Hash table of array op functions already generated or known about.
+ */
+
+StringTable arrayfuncs;
+#endif
-
-/***********************************

dmd/attrib.c

@@ -393 +393 @@
-    if (stc & (STCgshared | STCshared | STCtls))
-        scstc &= ~(STCgshared | STCshared | STCtls);
+    if (stc & (STCsafe | STCtrusted | STCsystem))
+        scstc &= ~(STCsafe | STCtrusted | STCsystem);
-    scstc |= stc;
-
@@ -416 +418 @@
-    if (stc & (STCgshared | STCshared | STCtls))
-        scstc &= ~(STCgshared | STCshared | STCtls);
+    if (stc & (STCsafe | STCtrusted | STCsystem))
+        scstc &= ~(STCsafe | STCtrusted | STCsystem);
-    scstc |= stc;
-
@@ -454 +458 @@
-    { STCtls,          TOKtls },
-    { STCgshared,      TOKgshared },
+    { STCproperty,     TOKat },
+    { STCsafe,         TOKat },
+    { STCtrusted,      TOKat },
+    { STCdisable,       TOKat },
-#endif
-    };
@@ -715 +723 @@
-    }
-
+    unsigned dprogress_save = Module::dprogress;
+
-    assert(sc->parent);
-
@@ -744 +754 @@
-    sc = sc->push();
-    sc->anonAgg = &aad;
-
+ | STCgshared
-    sc->inunion = isunion;
-    sc->offset = 0;
@@ -776 +786 @@
-        scope->module->addDeferredSemantic(this);
-        }
+        Module::dprogress = dprogress_save;
-        //printf("\tforward reference %p\n", this);
-        return;
@@ -806 +817 @@
-        VarDeclaration *v = (VarDeclaration *)aad.fields.data[i];
-
-
+
-        v->offset2 = sc->offset;
-
+
-        v->offset += sc->offset;
-
-
+
-        if (!v->anonDecl)
-            v->anonDecl = this;
-
+
-        ad->fields.push(v);
-    }
@@ -1370 +1381 @@
-    memcpy(name, se->string, se->len);
-    name[se->len] = 0;
+#if OMFOBJ
+    /* The OMF format allows library names to be inserted
+     * into the object file. The linker will then automatically
+     * search that library, too.
+     */
-    obj_includelib(name);
+#elif ELFOBJ || MACHOBJ
+    /* The format does not allow embedded library names,
+     * so instead append the library name to the list to be passed
+     * to the linker.
+     */
+    global.params.libfiles->push((void *) name);
+#else
+    error("pragma lib not supported");
+#endif
-    }
-#if DMDV2

dmd/class.c

@@ -265 +265 @@
-    scope = NULL;
-    }
+    unsigned dprogress_save = Module::dprogress;
-#ifdef IN_GCC
-    methods.setDim(0);
@@ -629 +630 @@
-    scope->module->addDeferredSemantic(this);
-
+    Module::dprogress = dprogress_save;
+
-    //printf("\tsemantic('%s') failed due to forward references\n", toChars());
-    return;

dmd/cond.c

@@ -143 +143 @@
-    "none",
-
-
+
-    "LLVM", "LDC", "LLVM64",
-    "PPC", "PPC64",
-    "darwin","solaris","freebsd"
+#endif
-    };
-

dmd/declaration.c

@@ -836 +836 @@
-        v->semantic(sc);
-            
-
+
-// removed for LDC since TupleDeclaration::toObj already creates the fields;
-// adding them to the scope again leads to duplicates
@@ -844 +844 @@
-            sc->scopesym->members->push(v);
-        }
-
+
+
-        Expression *e = new DsymbolExp(loc, v);
-        exps->data[i] = e;
@@ -1491 +1492 @@
-{
-    assert(linkage == LINKc);
-
+
-    if (!global.params.useAvailableExternally)
-        availableExternally = false;
+#endif
-}
-

dmd/declaration.h

@@ -16 +16 @@
-#endif /* __DMC__ */
-
+#if IN_LLVM
-#include <set>
-#include <map>
-#include <string>
+#endif
-
-#include "dsymbol.h"

dmd/dsymbol.c

@@ -30 +30 @@
-#include "template.h"
-#include "attrib.h"
+#if IN_LLVM
-#include "../gen/enums.h"
+#endif
-
-/****************************** Dsymbol ******************************/

dmd/dsymbol.h

@@ -22 +22 @@
-#include "arraytypes.h"
-
-
+
-#include "../ir/irdsymbol.h"
+#endif
-
-struct Identifier;
@@ -52 +53 @@
-struct VarDeclaration;
-struct AttribDeclaration;
+#if IN_DMD
+struct Symbol;
+#endif
-struct Package;
-struct Module;
@@ -77 +81 @@
-struct PragmaScope;
-#endif
-#if IN_DMD
-struct Symbol;
-#endif
-#if IN_GCC
-union tree_node;
@@ -110 +111 @@
-};
-
+/* State of symbol in winding its way through the passes of the compiler
+ */
+enum PASS
+{
+    PASSinit,       // initial state
+    PASSsemantic,   // semantic() started
+    PASSsemanticdone,   // semantic() done
+    PASSsemantic2,  // semantic2() run
+    PASSsemantic3,  // semantic3() started
+    PASSsemantic3done,  // semantic3() done
+    PASSobj,        // toObjFile() run
+};
-
-struct Dsymbol : Object

dmd/enum.c

@@ -1 +1 @@
-
-09
+10
-// All Rights Reserved
-// written by Walter Bright
@@ -15 +15 @@
-#include "mtype.h"
-#include "scope.h"
+#include "module.h"
-#include "declaration.h"
-
@@ -75 +76 @@
-    }
-
+    unsigned dprogress_save = Module::dprogress;
+
-    if (sc->stc & STCdeprecated)
-    isdeprecated = 1;
@@ -98 +101 @@
-
-    isdone = 1;
+    Module::dprogress++;
-
-    t = isAnonymous() ? memtype : type;

dmd/expression.c

@@ -1 +1 @@
-
-// Compiler implementation of the D programming language
-09
+10
-// All Rights Reserved
-// written by Walter Bright
@@ -3711 +3711 @@
-            }
-        }
-        
-        }
-    }
@@ -8778 +8777 @@
-    e1->checkIntegral();
-    e2 = e2->checkIntegral();
-
-
+
+
+
+
+
-    return this;
-}
@@ -8807 +8809 @@
-    e1->checkIntegral();
-    e2 = e2->checkIntegral();
-
-
+
+
+
+
+
-    return this;
-}
@@ -8836 +8841 @@
-    e1->checkIntegral();
-    e2 = e2->checkIntegral();
-
-
+
+
+
+
+
-    return this;
-}
@@ -9324 +9332 @@
-    e2 = e2->checkIntegral();
-    e1 = e1->integralPromotions(sc);
-
-
+
+
+
+
+
-    type = e1->type;
-    }
@@ -9349 +9360 @@
-    e2 = e2->checkIntegral();
-    e1 = e1->integralPromotions(sc);
-
-
+
+
+
+
+
-    type = e1->type;
-    }
@@ -9374 +9388 @@
-    e2 = e2->checkIntegral();
-    e1 = e1->integralPromotions(sc);
-
-
+
+
+
+
+
-    type = e1->type;
-    }

dmd/expression.h

@@ -1 +1 @@
-
-// Compiler implementation of the D programming language
-09
+10
-// All Rights Reserved
-// written by Walter Bright
@@ -646 +646 @@
-    SymOffExp(Loc loc, Declaration *var, unsigned offset);
-    Expression *semantic(Scope *sc);
+    Expression *interpret(InterState *istate);
-    void checkEscape();
-    void toCBuffer(OutBuffer *buf, HdrGenState *hgs);
@@ -723 +724 @@
-    Expression *syntaxCopy();
-    Expression *semantic(Scope *sc);
+    Expression *interpret(InterState *istate);
-    void scanForNestedRef(Scope *sc);
-    char *toChars();
@@ -986 +988 @@
-    DelegateExp(Loc loc, Expression *e, FuncDeclaration *func);
-    Expression *semantic(Scope *sc);
+    Expression *interpret(InterState *istate);
-    MATCH implicitConvTo(Type *t);
-    Expression *castTo(Scope *sc, Type *t);

dmd/func.c

@@ -1 +1 @@
-// Compiler implementation of the D programming language
-09
+10
-// All Rights Reserved
-// written by Walter Bright
@@ -66 +66 @@
-    inlineAsm = 0;
-    cantInterpret = 0;
-0
+PASSinit
-#if DMDV1
-    nestedFrameRef = 0;
@@ -132 +132 @@
-    assert(!fthrows); // deprecated
-
-
+
-    f->intrinsicName = intrinsicName;
+#endif
-
-    return f;
@@ -156 +157 @@
-#endif
-
-
+!= PASSinit 
-    {
-    /* Member functions that have return types that are
@@ -165 +166 @@
-    return;
-    }
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    if (!type->deco)
@@ -182 +199 @@
-
-    linkage = sc->linkage;
-//    if (!parent)
-    {
-    //parent = sc->scopesym;
-    parent = sc->parent;
-    }
-    protection = sc->protection;
-    storage_class |= sc->stc;
-    //printf("function storage_class = x%x\n", storage_class);
-    Dsymbol *parent = toParent();
-
-    if (ident == Id::ctor && !isCtorDeclaration())
@@ -268 +279 @@
-        isUnitTestDeclaration() || isNewDeclaration() || isDelete())
-        error("special function not allowed in interface %s", id->toChars());
-
+ && isVirtual()
-        error("function body is not abstract in interface %s", id->toChars());
-    }
@@ -338 +349 @@
-    }
-
-
-
+
+
+
+
+
+
-    switch (vi)
-    {
@@ -379 +394 @@
-        case -2:    // can't determine because of fwd refs
-        cd->sizeok = 2; // can't finish due to forward reference
+        Module::dprogress = dprogress_save;
-        return;
-
-        default:
-
+baseClass->
-        // This function is covariant with fdv
-        if (fdv->isFinal())
@@ -456 +472 @@
-        case -2:
-            cd->sizeok = 2; // can't finish due to forward reference
+            Module::dprogress = dprogress_save;
-            return;
-
@@ -473 +490 @@
-             * offsets differ
-             */
+            unsigned errors = global.errors;
+            global.gag++;            // suppress printing of error messages
-            int offset;
-
+
+
+
+
+
+
+
+
+
+
+
-            {
-                ti = fdv->type;
-#if 0
-                if (offset)
-                ti = fdv->type;
-                else if (type->nextOf()->ty == Tclass)
-                {   ClassDeclaration *cdn = ((TypeClass *)type->nextOf())->sym;
-                if (cdn && cdn->sizeok != 1)
-                    ti = fdv->type;
-                }
-#endif
-            }
-            }
@@ -597 +617 @@
-    }
-
-
+ && semanticRun != PASSsemanticdone
-    {
-    /* Rewrite contracts as nested functions, then call them.
@@ -653 +673 @@
-
-Ldone:
+    Module::dprogress++;
+    semanticRun = PASSsemanticdone;
+
-    /* Save scope for possible later use (if we need the
-     * function internals)
@@ -689 +712 @@
-
-    //printf(" sc->incontract = %d\n", sc->incontract);
-
+PASSsemantic
-    return;
-
-
-
+PASSsemantic
+
+
-    if (!global.params.useAvailableExternally)
-        availableExternally = false;
-
+
-    if (!type || type->ty != Tfunction)
-    return;
@@ -1467 +1490 @@
-    sc2->pop();
-    }
-4
+PASSsemantic3done
-}
-
@@ -1639 +1662 @@
- * Find index of function in vtbl[0..dim] that
- * this function overrides.
+ * Prefer an exact match to a covariant one.
- * Returns:
- *  -1  didn't find one
@@ -1646 +1670 @@
-int FuncDeclaration::findVtblIndex(Array *vtbl, int dim)
-{
+    FuncDeclaration *mismatch = NULL;
+    int bestvi = -1;
-    for (int vi = 0; vi < dim; vi++)
-    {
@@ -1651 +1677 @@
-    if (fdv && fdv->ident == ident)
-    {
+        if (type->equals(fdv->type))    // if exact match
+            return vi;          // no need to look further
+
-        int cov = type->covariant(fdv->type);
-        //printf("\tbaseclass cov = %d\n", cov);
@@ -1659 +1688 @@
-
-        case 1:
-
+
+
-
-        case 2:
-
-
-
-
-
-
+
+
-
-        case 3:
@@ -1677 +1703 @@
-    }
-    }
-
+
+
+
+
+
+
+
+
+
-}
-
@@ -2555 +2589 @@
-    else
-    id = "__funcliteral";
-Identifier::generat
+Lexer::uniqu
-    this->tok = tok;
-    this->fes = fes;
@@ -2569 +2603 @@
-    f = (FuncLiteralDeclaration *)s;
-    else
-
+
+
+
-    FuncDeclaration::syntaxCopy(f);
-    return f;
@@ -2635 +2671 @@
-void CtorDeclaration::semantic(Scope *sc)
-{
-
-
-
-
-
-
-
+
-    sc = sc->push();
-    sc->stc &= ~STCstatic;      // not a static constructor
@@ -2647 +2677 @@
-    parent = sc->parent;
-    Dsymbol *parent = toParent();
-
+
+
-    if (!cd)
-    {
@@ -2656 +2687 @@
-    else
-    tret = cd->type; //->referenceTo();
-
+
+
-#if STRUCTTHISREF
-    if (ad && ad->isStructDeclaration())
@@ -2671 +2703 @@
-    //  return this;
-    // to the function body
-
+ && semanticRun < PASSsemantic
-    {
-    Expression *e = new ThisExp(loc);
@@ -2745 +2777 @@
-    //printf("PostBlitDeclaration::semantic() %s\n", toChars());
-    //printf("ident: %s, %s, %p, %p\n", ident->toChars(), Id::dtor->toChars(), ident, Id::dtor);
+    //printf("stc = x%llx\n", sc->stc);
-    parent = sc->parent;
-    Dsymbol *parent = toParent();
@@ -2752 +2785 @@
-    error("post blits are only for struct/union definitions, not %s %s", parent->kind(), parent->toChars());
-    }
-
+ && semanticRun < PASSsemantic
-    ad->postblits.push(this);
-
+
+
+
-
-    sc = sc->push();
@@ -2787 +2822 @@
-void PostBlitDeclaration::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
-{
-
-
-
+
-    bodyToCBuffer(buf, hgs);
-}
@@ -2826 +2859 @@
-    fatal();
-    }
-
+ if (semanticRun < PASSsemantic)
-    cd->dtors.push(this);
-
+
+
+
-
-    sc = sc->push();
@@ -2894 +2929 @@
-Dsymbol *StaticCtorDeclaration::syntaxCopy(Dsymbol *s)
-{
-    StaticCtorDeclaration *scd;
-
-    assert(!s);
-
+StaticCtorDeclaration *
-    return FuncDeclaration::syntaxCopy(scd);
-}
@@ -2906 +2939 @@
-    //printf("StaticCtorDeclaration::semantic()\n");
-
-
+
+
-
-    /* If the static ctor appears within a template instantiation,
@@ -2912 +2946 @@
-     * for different modules. Thus, protect it with a gate.
-     */
-
+ && semanticRun < PASSsemantic
-    {
-    /* Add this prefix to the function:
@@ -2944 +2978 @@
-    if (m)
-    {   m->needmoduleinfo = 1;
+    //printf("module1 %s needs moduleinfo\n", m->toChars());
-#ifdef IN_GCC
-    m->strictlyneedmoduleinfo = 1;
@@ -3006 +3041 @@
-void StaticDtorDeclaration::semantic(Scope *sc)
-{
-
-
-
-
-
-
-
-
+
+
+
+
-
-    /* If the static ctor appears within a template instantiation,
@@ -3019 +3050 @@
-     * for different modules. Thus, protect it with a gate.
-     */
-
+ && semanticRun < PASSsemantic
-    {
-    /* Add this prefix to the function:
@@ -3113 +3144 @@
-void InvariantDeclaration::semantic(Scope *sc)
-{
-    AggregateDeclaration *ad;
-    Type *tret;
-
-    parent = sc->parent;
-    Dsymbol *parent = toParent();
-
+AggregateDeclaration *
-    if (!ad)
-    {
@@ -3124 +3152 @@
-    return;
-    }
-
+ && semanticRun < PASSsemantic
-    {
-    error("more than one invariant for %s", ad->toChars());
-    }
-    ad->inv = this;
-
+
+
-
-    sc = sc->push();
@@ -3196 +3225 @@
-    if (global.params.useUnitTests)
-    {
-
+
+
-    Scope *sc2 = sc->push();
-    sc2->linkage = LINKd;
@@ -3272 +3302 @@
-void NewDeclaration::semantic(Scope *sc)
-{
-    ClassDeclaration *cd;
-    Type *tret;
-
-    //printf("NewDeclaration::semantic()\n");
-
-    parent = sc->parent;
-    Dsymbol *parent = toParent();
-
+ClassDeclaration *
-    if (!cd && !parent->isStructDeclaration())
-    {
-    error("new allocators only are for class or struct definitions");
-    }
-
-
+
+
+
-
-    type = type->semantic(loc, sc);
@@ -3358 +3386 @@
-void DeleteDeclaration::semantic(Scope *sc)
-{
-    ClassDeclaration *cd;
-
-    //printf("DeleteDeclaration::semantic()\n");
-
-    parent = sc->parent;
-    Dsymbol *parent = toParent();
-
+ClassDeclaration *
-    if (!cd && !parent->isStructDeclaration())
-    {
-    error("new allocators only are for class or struct definitions");
-    }
-
+
+
-
-    type = type->semantic(loc, sc);

dmd/identifier.h

@@ -17 +17 @@
-
-#include "root.h"
-
+
-namespace llvm
-{
-    class Value;
-}
+#endif
-
-struct Identifier : Object

dmd/inline.c

@@ -1282 +1282 @@
-    return 0;
-
-
+PASSsemantic
-    {
-#if CANINLINE_LOG

dmd/interpret.c

@@ -1 +1 @@
-
-// Compiler implementation of the D programming language
-09
+10
-// All Rights Reserved
-// written by Walter Bright
@@ -53 +53 @@
-Expression *interpret_values(InterState *istate, Expression *earg, FuncDeclaration *fd);
-
+ArrayLiteralExp *createBlockDuplicatedArrayLiteral(Type *type, Expression *elem, size_t dim);
+
-/*************************************
- * Attempt to interpret a function given the arguments.
@@ -93 +95 @@
-#endif
-
-
+PASSsemantic
-    return NULL;
-
@@ -101 +103 @@
-    }
-
-
+PASSsemantic
-    {
-    semantic3(scope);
@@ -107 +109 @@
-        return NULL;
-    }
-4
+PASSsemantic3done
-    return NULL;
-
@@ -161 +163 @@
-        Parameter *arg = Parameter::getNth(tf->parameters, i);
-
-
+ | STClazy
-        {
-        }
@@ -1006 +1008 @@
-}
-
+Expression *FuncExp::interpret(InterState *istate)
+{
+#if LOG
+    printf("FuncExp::interpret() %s\n", toChars());
+#endif
+    return this;
+}
+
+Expression *SymOffExp::interpret(InterState *istate)
+{
+#if LOG
+    printf("SymOffExp::interpret() %s\n", toChars());
+#endif
+    if (var->isFuncDeclaration() && offset == 0)
+    {
+    return this;
+    }
+    error("Cannot interpret %s at compile time", toChars());
+    return EXP_CANT_INTERPRET;
+}
+
+Expression *DelegateExp::interpret(InterState *istate)
+{
+#if LOG
+    printf("DelegateExp::interpret() %s\n", toChars());
+#endif
+    return this;
+}
+
-Expression *getVarExp(Loc loc, InterState *istate, Declaration *d)
-{
@@ -1014 +1045 @@
-    {
-#if DMDV2
+    /* Magic variable __ctfe always returns true when interpreting
+     */
+    if (v->ident == Id::ctfe)
+        return new IntegerExp(loc, 1, Type::tbool);
+
-    if ((v->isConst() || v->isImmutable() || v->storage_class & STCmanifest) && v->init && !v->value)
-#else
@@ -1021 +1057 @@
-        if (e && !e->type)
-        e->type = v->type;
+    }
+    else if (v->isCTFE() && !v->value)
+    {
+        if (v->init)
+        {
+        e = v->init->toExpression();
+        e = e->interpret(istate);
+        }
+        else // This should never happen
+        e = v->type->defaultInitLiteral();
-    }
-    else
@@ -1483 +1529 @@
-
-/***************************************
-
++newelems.length
- */
-Expressions *spliceElements(Expressions *oldelems,
@@ -1498 +1544 @@
-    }
-    return expsx;
+}
+
+/***************************************
+ * Returns oldstr[0..insertpoint] ~ newstr ~ oldstr[insertpoint+newlen..$]
+ */
+StringExp *spliceStringExp(StringExp *oldstr, StringExp *newstr, size_t insertpoint)
+{
+    assert(oldstr->sz==newstr->sz);
+    unsigned char *s;
+    size_t oldlen = oldstr->len;
+    size_t newlen = newstr->len;
+    size_t sz = oldstr->sz;
+    s = (unsigned char *)mem.calloc(oldlen + 1, sz);
+    memcpy(s, oldstr->string, oldlen * sz);
+    memcpy(s + insertpoint * sz, newstr->string, newlen * sz);
+    StringExp *se2 = new StringExp(oldstr->loc, s, oldlen);
+    se2->committed = oldstr->committed;
+    se2->postfix = oldstr->postfix;
+    se2->type = oldstr->type;
+    return se2;
-}
-
@@ -1515 +1581 @@
-}
-
+/******************************
+ * Create a string literal consisting of 'value' duplicated 'dim' times.
+ */
+StringExp *createBlockDuplicatedStringLiteral(Type *type,
+    unsigned value, size_t dim, int sz)
+{
+    unsigned char *s;
+    s = (unsigned char *)mem.calloc(dim + 1, sz);
+    for (int elemi=0; elemi<dim; ++elemi)
+    {
+        switch (sz)
+    {
+        case 1: s[elemi] = value; break;
+        case 2: ((unsigned short *)s)[elemi] = value; break;
+        case 4: ((unsigned *)s)[elemi] = value; break;
+        default:    assert(0);
+    }
+    }
+    StringExp *se = new StringExp(0, s, dim);
+    se->type = type;
+    return se;
+}
-
-/********************************
@@ -1583 +1671 @@
-    // extract the aggregate now.
-    Expression *aggregate;
-
+
+
-        aggregate = ((DotVarExp *)e1)->e1;
-    // Get rid of 'this'.
-        if (aggregate->op == TOKthis && istate->localThis)
-
-
-
+
+
+
+
+
-    /* Assignment to variable of the form:
-     *  v = e2
@@ -1624 +1715 @@
-        return e2;
-
-
+
+
-        v->value = e2;
-        e = Cast(type, type, post ? ev : e2);
@@ -1669 +1761 @@
-         * That's probably a good enhancement idea.
-         */
-
+Literal
-    }
-    Expression *vie = v->value;
+    assert(vie != EXP_CANT_INTERPRET);
+
-    if (vie->op == TOKvar)
-    {
@@ -1678 +1772 @@
-    }
-    if (vie->op != TOKstructliteral)
+    {
+        error("Cannot assign %s=%s in CTFE", v->toChars(), vie->toChars());
-        return EXP_CANT_INTERPRET;
+    }
-    StructLiteralExp *se = (StructLiteralExp *)vie;
-    VarDeclaration *vf = ((DotVarExp *)e1)->var->isVarDeclaration();
@@ -2016 +2113 @@
-        return EXP_CANT_INTERPRET;
-    }
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-    
-   
-    
+   
+    
+    
+    
+    
+    
+
+
+    
+    
+
+    
+
-    /* Set the $ variable
-     */
@@ -2063 +2160 @@
-        dim = ((ArrayLiteralExp *)v->value)->elements->dim;
-        else if (v->value->op ==TOKstring)
-
-
-
-
+
-    }
-    else
@@ -2076 +2170 @@
-    int lowerbound = lower ? lower->toInteger() : 0;
-
-    ArrayLiteralExp *existing;
-    if (((int)lowerbound < 0) || (upperbound > dim))
-    {
-
+
+
-        return EXP_CANT_INTERPRET;
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    if (e2->op == TOKarrayliteral)
-    {
-        // Static array assignment from literal
-        ArrayLiteralExp *ae = (ArrayLiteralExp *)e2;                
-        if (ae->elements->dim != (upperbound - lowerbound))
-        {
-        error("Array length mismatch assigning [0..%d] to [%d..%d]", ae->elements->dim, lowerbound, upperbound);
-        return e;
-        }
-        if (upperbound - lowerbound == dim)
-        v->value = ae;
-        else
-        {
+        ArrayLiteralExp *existing;
+        // Only modifying part of the array. Must create a new array literal.
+        // If the existing array is uninitialized (this can only happen
+        // with static arrays), create it.
+        if (v->value && v->value->op == TOKarrayliteral)
+            existing = (ArrayLiteralExp *)v->value;
+        else // this can only happen with static arrays
+            existing = createBlockDuplicatedArrayLiteral(v->type, v->type->defaultInit(), dim);
-        // value[] = value[0..lower] ~ ae ~ value[upper..$]
-        existing->elements = spliceElements(existing->elements, ae->elements, lowerbound);
@@ -2115 +2213 @@
-        return e2;
-    }
+    else if (e2->op == TOKstring)
+    {
+        StringExp *se = (StringExp *)e2;
+        if (upperbound-lowerbound == dim)
+            v->value = e2;      
+        else
+        {
+        if (!v->value)
+            v->value = createBlockDuplicatedStringLiteral(se->type,
+            se->type->defaultInit()->toInteger(), dim, se->sz);
+        if (v->value->op==TOKstring)
+                v->value = spliceStringExp((StringExp *)v->value, se, lowerbound);
+        else
+                error("String slice assignment is not yet supported in CTFE");
+        }
+        return e2;
+    }
-    else if (t->nextOf()->ty == e2->type->ty)
-    {
- 
--lowerbound ==
+
+ - lowerbound == 
-        v->value = createBlockDuplicatedArrayLiteral(v->type, e2, dim);
-        else
-        {
+        ArrayLiteralExp *existing;
+        // Only modifying part of the array. Must create a new array literal.
+        // If the existing array is uninitialized (this can only happen
+        // with static arrays), create it.
+        if (v->value && v->value->op == TOKarrayliteral)
+            existing = (ArrayLiteralExp *)v->value;
+        else // this can only happen with static arrays
+            existing = createBlockDuplicatedArrayLiteral(v->type, v->type->defaultInit(), dim);
-        // value[] = value[0..lower] ~ ae ~ value[upper..$]
-
+
+
+
-        v->value = existing;
-        }               
-        return e2;
-    }
-    else if (e2->op == TOKstring)
-    {
-        StringExp *se = (StringExp *)e2;
-        // This is problematic. char[8] should be storing
-        // values as a string literal, not
-        // as an array literal. Then, for static arrays, we
-        // could do modifications
-        // in-place, with a dramatic memory and speed improvement.
-        error("String slice assignment is not yet supported in CTFE");
-        return e2;
-    }
@@ -2261 +2375 @@
-    printf("CallExp::interpret() %s\n", toChars());
-#endif
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        if (eresult)
-        e = eresult;
@@ -2277 +2479 @@
-        else
-        error("cannot evaluate %s at compile time", toChars());
-
-
+
+
+
+
-    error("cannot evaluate %s at compile time", toChars());
-        return EXP_CANT_INTERPRET;
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-}
-
@@ -2336 +2494 @@
-    printf("CommaExp::interpret() %s\n", toChars());
-#endif
+    // If the comma returns a temporary variable, it needs to be an lvalue
+    // (this is particularly important for struct constructors)
+    if (e1->op == TOKdeclaration && e2->op == TOKvar 
+       && ((DeclarationExp *)e1)->declaration == ((VarExp*)e2)->var)
+    {
+    VarExp* ve = (VarExp *)e2;
+    VarDeclaration *v = ve->var->isVarDeclaration();
+    if (!v->init && !v->value)
+        v->value = v->type->defaultInitLiteral();
+    if (!v->value)
+        v->value = v->init->toExpression();
+    v->value = v->value->interpret(istate); 
+    return e2;
+    }
+
-    Expression *e = e1->interpret(istate);
-    if (e != EXP_CANT_INTERPRET)
@@ -2517 +2690 @@
-    {   // Special case: deal with compiler-inserted assert(&this, "null this") 
-    AddrExp *ade = (AddrExp *)this->e1;
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-    e1 = this->e1->interpret(istate);
-    if (e1 == EXP_CANT_INTERPRET)

dmd/mangle.c

@@ -114 +114 @@
-            break;
-
-
+
-        case LINKintrinsic:
-
+
-        case LINKc:
-        case LINKwindows:

dmd/mars.c

@@ -1 +1 @@
-
-// Compiler implementation of the D programming language
-09
+10
-// All Rights Reserved
-// written by Walter Bright
@@ -14 +14 @@
-#include <assert.h>
-#include <limits.h>
+#if IN_LLVM
-#include <string>
-#include <cstdarg>
+#endif
-
-#if POSIX
@@ -35 +37 @@
-#include "json.h"
-
+#if IN_LLVM
-#include "gen/revisions.h"
+#endif
-
-Global global;
@@ -47 +51 @@
-    ddoc_ext = "ddoc";
-    json_ext = "json";
+    map_ext  = "map";
-
-// LDC
@@ -59 +64 @@
-    copyright = "Copyright (c) 1999-2009 by Digital Mars and Tomas Lindquist Olsen";
-    written = "written by Walter Bright and Tomas Lindquist Olsen";
-5
+6
-    ldc_version = LDC_REV;
-    llvm_version = LLVM_REV_STR;

dmd/mars.h

@@ -1 +1 @@
-
-// Compiler implementation of the D programming language
-09
+10
-// All Rights Reserved
-// written by Walter Bright
@@ -236 +236 @@
-    char *resfile;
-    char *exefile;
-
+
+
+
-    // LDC stuff
-    OUTPUTFLAG output_ll;
@@ -251 +253 @@
-    const char *targetTriple;
-    const char *dataLayout;
+#endif
-};
-
@@ -269 +272 @@
-    const char *hdr_ext;    // for D 'header' import files
-    const char *json_ext;   // for JSON files
+    const char *map_ext;    // for .map files
-    const char *copyright;
-    const char *written;
@@ -394 +398 @@
-    LINKpascal,
-
-
+
-    LINKintrinsic,
+#endif
-};
-

dmd/module.c

@@ -1 +1 @@
-
-// Compiler implementation of the D programming language
-09
+10
-// All Rights Reserved
-// written by Walter Bright
@@ -45 +45 @@
-#endif
-
-
+
-#include "llvm/Support/CommandLine.h"
-#include <map>
@@ -56 +56 @@
-    llvm::cl::desc("Write object files with fully qualified names"),
-    llvm::cl::ZeroOrMore);
-
-
+
-
-ClassDeclaration *Module::moduleinfo;
@@ -972 +971 @@
-void Module::runDeferredSemantic()
-{
-
+
+
-
-    static int nested;
@@ -980 +980 @@
-    nested++;
-
+    size_t len;
-    do
-    {

dmd/module.h

@@ -154 +154 @@
-    void deleteObjFile();
-    void addDeferredSemantic(Dsymbol *s);
-
+static 
-    int imports(Module *m);
-

dmd/mtype.c

@@ -4062 +4062 @@
-{
-    if (sym->scope)
-
-
+
+
+
+
+
+
+
+
+
-    }
-    if (!sym->memtype)

dmd/optimize.c

@@ -1 +1 @@
-
-// Compiler implementation of the D programming language
-09
+10
-// All Rights Reserved
-// written by Walter Bright
@@ -345 +345 @@
-
-Expression *CallExp::optimize(int result)
-
+
+
+
-
-    // Optimize parameters
@@ -359 +361 @@
-
-    e1 = e1->optimize(result);
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-    }
-    return e;
@@ -625 +625 @@
-
-    //printf("CommaExp::optimize(result = %d) %s\n", result, toChars());
+    // Comma needs special treatment, because it may
+    // contain compiler-generated declarations. We can interpret them, but
+    // otherwise we must NOT attempt to constant-fold them.
+    // In particular, if the comma returns a temporary variable, it needs
+    // to be an lvalue (this is particularly important for struct constructors)
+
+    if (result & WANTinterpret)
+    {   // Interpreting comma needs special treatment, because it may
+        // contain compiler-generated declarations.
+    e = interpret(NULL);
+    return (e == EXP_CANT_INTERPRET) ?  this : e;
+    }
+    // Don't constant fold if it is a compiler-generated temporary.
+    if (e1->op == TOKdeclaration)
+       return this;
+
-    e1 = e1->optimize(result & WANTinterpret);
-    e2 = e2->optimize(result);
@@ -710 +726 @@
-    {   // Convert slice of string literal into dynamic array
-        Type *t = e1->type->toBasetype();
-
-
+Of()
+Of()
-    }
-    return e;

dmd/statement.c

@@ -2484 +2484 @@
-
-                e = e->semantic(sc);
+#if 1
-        e = e->optimize(WANTvalue | WANTinterpret);
+#else
+            e = e->interpret(NULL);
+        if (e == EXP_CANT_INTERPRET)
+            fprintf(stdmsg, ((Expression *)args->data[i])->toChars());
+                else
+#endif
-                if (e->op == TOKstring)
-                {

dmd/statement.h

@@ -55 +55 @@
-
-enum TOK;
-
+
-namespace llvm
-{
@@ -62 +62 @@
-    class ConstantInt;
-}
+#endif
-
-// Back end
@@ -142 +143 @@
-    virtual CaseStatement* isCaseStatement() { return NULL; }
-
-
+
-    virtual void toNakedIR(IRState *irs);
-    virtual AsmBlockStatement* endsWithAsm();
+#endif
-};
-
@@ -173 +175 @@
-    void toIR(IRState *irs);
-
-
+
-    void toNakedIR(IRState *irs);
+#endif
-};
-

dmd/struct.c

@@ -20 +20 @@
-#include "id.h"
-#include "statement.h"
+#include "template.h"
-
-/********************************* AggregateDeclaration ****************************/
@@ -269 +270 @@
-        scope = NULL;
-    }
+
+    unsigned dprogress_save = Module::dprogress;
-
-    parent = sc->parent;
@@ -418 +421 @@
-    scope->setNoFree();
-    scope->module->addDeferredSemantic(this);
+
+    Module::dprogress = dprogress_save;
-    //printf("\tdeferring %s\n", toChars());
-    return;

dmd/template.c

@@ -1 +1 @@
-
-// Compiler implementation of the D programming language
-09
+10
-// All Rights Reserved
-// written by Walter Bright
@@ -3540 +3540 @@
-    if (tinst)
-    {   tinst->printInstantiationTrace();
-
+
+
-    }
-    errors = 1;