Ticket #229: d2.diff

a/.hgignore

@@ -14 +14 @@
-CMakeCache.txt
-cmake_install.cmake
-.DS_Store
+.svn
-
-syntax: regexp
-^obj/
-^tests/dstress/
-^tests/reference/
-^tango/
-^druntime/
-^import/
-^bin/ldc2?$
-^bin/ldc2?\.conf$

a/CMakeLists.txt

@@ -140 +140 @@
-    -DIN_LLVM
-    -D_DH
-    -DOPAQUE_VTBLS
+    -D__STDC_LIMIT_MACROS
+    -D__STDC_CONSTANT_MACROS
-)
-
-if(UNIX)

a/dmd/mars.h

@@ -67 +67 @@
-};
-
-// make it easier to test new linkage types
-
-
+Any
+Any
-
-// Put command line switches in here
-struct Param

a/dmd2/access.c

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

a/dmd2/aggregate.h

@@ -64 +64 @@
-    int isdeprecated;       // !=0 if deprecated
-    Scope *scope;       // !=NULL means context to use
-
+    int isnested;       // !=0 if is nested
+    VarDeclaration *vthis;  // 'this' parameter if this aggregate is nested
+
-    // Special member functions
-    InvariantDeclaration *inv;      // invariant
-    NewDeclaration *aggNew;     // allocator
@@ -91 +94 @@
-    void addField(Scope *sc, VarDeclaration *v);
-    int isDeprecated();     // is aggregate deprecated?
-    FuncDeclaration *buildDtor(Scope *sc);
+    int isNested();
-
-    void emitComment(Scope *sc);
-    void toDocBuffer(OutBuffer *buf);
@@ -216 +220 @@
-    int isauto;             // !=0 if this is an auto class
-    int isabstract;         // !=0 if abstract class
-
-    int isnested;           // !=0 if is nested
-    VarDeclaration *vthis;      // 'this' parameter if this class is nested
-
-    int inuse;              // to prevent recursive attempts
-
-    ClassDeclaration(Loc loc, Identifier *id, BaseClasses *baseclasses);
@@ -236 +237 @@
-#endif
-    FuncDeclaration *findFunc(Identifier *ident, TypeFunction *tf);
-    void interfaceSemantic(Scope *sc);
-    int isNested();
-    int isCOMclass();
-    virtual int isCOMinterface();
-#if DMDV2

a/dmd2/arrayop.c

@@ -11 +11 @@
-#include <string.h>
-#include <assert.h>
-
-#if _WIN32 || IN_GCC  || IN_LLVM
-#include "mem.h"
-#else
-#include "../root/mem.h"
-#endif
-
-#include "stringtable.h"
-

a/dmd2/attrib.c

@@ -12 +12 @@
-#include <stdlib.h>
-#include <assert.h>
-
-#if _WIN32 || IN_GCC || IN_LLVM
-#include "mem.h"
-#elif POSIX
-#include "../root/mem.h"
-#endif
-
-#include "init.h"
-#include "declaration.h"
@@ -151 +147 @@
-{
-    //printf("AttribDeclaration::emitComment(sc = %p)\n", sc);
-
-
-
+
+
+
+
+
+
-     */
-//    if (sc->docbuf)
-//  return;
-
-    Array *d = include(NULL, NULL);
-
@@ -771 +769 @@
-
-Dsymbol *PragmaDeclaration::syntaxCopy(Dsymbol *s)
-{
+    //printf("PragmaDeclaration::syntaxCopy(%s)\n", toChars());
-    PragmaDeclaration *pd;
-
-    assert(!s);
@@ -1248 +1247 @@
-    {
-    AttribDeclaration::emitComment(sc);
-    }
+    else if (sc->docbuf)
+    {
+    /* If generating doc comment, be careful because if we're inside
+     * a template, then include(NULL, NULL) will fail.
+     */
+    Array *d = decl ? decl : elsedecl;
+    for (unsigned i = 0; i < d->dim; i++)
+    {   Dsymbol *s = (Dsymbol *)d->data[i];
+        s->emitComment(sc);
+    }
+    }
-}
-
-// Decide if 'then' or 'else' code should be included

a/dmd2/builtin.c

@@ -1 +1 @@
-
-// Compiler implementation of the D programming language
-7
+9
-// All Rights Reserved
-// written by Walter Bright
-// http://www.digitalmars.com
@@ -23 +23 @@
-#include "id.h"
-#include "module.h"
-
+#if DMDV2
+
-/**********************************
- * Determine if function is a builtin one.
- */
-enum BUILTIN FuncDeclaration::isBuiltin()
-{
-eZe"; //
+NaNbeZe"; // pure nothrow
-
-    //printf("FuncDeclaration::isBuiltin() %s\n", toChars());
-    if (builtin == BUILTINunknown)
@@ -40 +42 @@
-        parent->parent && parent->parent->ident == Id::std &&
-        !parent->parent->parent)
-        {
+        //printf("deco = %s\n", type->deco);
-        if (strcmp(type->deco, FeZe) == 0)
-        {
-            if (ident == Id::sin)
@@ -54 +57 @@
-            builtin = BUILTINfabs;
-            //printf("builtin = %d\n", builtin);
-        }
+        else if (strcmp(type->deco, "FNaNbdZd") == 0 ||
+             strcmp(type->deco, "FNaNbfZf") == 0)
+            builtin = BUILTINsqrt;
-        }
-    }
-    }
@@ -100 +106 @@
-    }
-    return e;
-}
+
+#endif

a/dmd2/cast.c

@@ -10 +10 @@
-#include <stdio.h>
-#include <assert.h>
-
-#if _WIN32 || IN_GCC || IN_LLVM
-#include "mem.h"
-#else
-#include "../root/mem.h"
-#endif
-
-#include "expression.h"
-#include "mtype.h"
@@ -109 +105 @@
-    return castTo(sc, t);
-}
-
+Expression *StringExp::implicitCastTo(Scope *sc, Type *t)
+{
+    //printf("StringExp::implicitCastTo(%s of type %s) => %s\n", toChars(), type->toChars(), t->toChars());
+    unsigned char committed = this->committed;
+    Expression *e = Expression::implicitCastTo(sc, t);
+    if (e->op == TOKstring)
+    {
+    // Retain polysemous nature if it started out that way
+    ((StringExp *)e)->committed = committed;
+    }
+    return e;
+}
+
-/*******************************************
- * Return !=0 if we can implicitly convert this to type t.
- * Don't do the actual cast.
@@ -446 +455 @@
-            if (tynto == Tchar || tynto == Twchar || tynto == Tdchar)
-                return MATCHexact;
-            }
+            else if (type->ty == Tarray)
+            {
+            if (length() >
+                ((TypeSArray *)t)->dim->toInteger())
+                return MATCHnomatch;
+            TY tynto = t->nextOf()->ty;
+            if (tynto == Tchar || tynto == Twchar || tynto == Tdchar)
+                return MATCHexact;
+            }
-        case Tarray:
-        case Tpointer:
-            tn = t->nextOf();
@@ -851 +869 @@
-    return se;
-    }
-
+    if (committed && tb->ty == Tsarray && typeb->ty == Tarray)
+    {
+    se = (StringExp *)copy();
+    se->sz = tb->nextOf()->size();
+    se->len = (len * sz) / se->sz;
+    se->committed = 1;
+    se->type = t;
+    return se;
+    }
+
-    if (tb->ty != Tsarray && tb->ty != Tarray && tb->ty != Tpointer)
-    {   if (!copied)
-    {   se = (StringExp *)copy();
@@ -1703 +1731 @@
-    return e;
-}
-
+/***********************************
+ * See if both types are arrays that can be compared
+ * for equality. Return !=0 if so.
+ * If they are arrays, but incompatible, issue error.
+ * This is to enable comparing things like an immutable
+ * array with a mutable one.
+ */
+
+int arrayTypeCompatible(Loc loc, Type *t1, Type *t2)
+{
+    t1 = t1->toBasetype();
+    t2 = t2->toBasetype();
+
+    if ((t1->ty == Tarray || t1->ty == Tsarray || t1->ty == Tpointer) &&
+    (t2->ty == Tarray || t2->ty == Tsarray || t2->ty == Tpointer))
+    {
+    if (t1->nextOf()->implicitConvTo(t2->nextOf()) < MATCHconst &&
+        t2->nextOf()->implicitConvTo(t1->nextOf()) < MATCHconst &&
+        (t1->nextOf()->ty != Tvoid && t2->nextOf()->ty != Tvoid))
+    {
+        error("array equality comparison type mismatch, %s vs %s", t1->toChars(), t2->toChars());
+    }
+    return 1;
+    }
+    return 0;
+}

a/dmd2/class.c

@@ -157 +157 @@
-            Type::typeinfoinvariant->error("%s", msg);
-        Type::typeinfoinvariant = this;
-        }
+
+        if (id == Id::TypeInfo_Shared)
+        {   if (Type::typeinfoshared)
+            Type::typeinfoshared->error("%s", msg);
+        Type::typeinfoshared = this;
+        }
-#endif
-    }
-
@@ -182 +188 @@
-    com = 0;
-    isauto = 0;
-    isabstract = 0;
-    isnested = 0;
-    vthis = NULL;
-    inuse = 0;
-}
-
@@ -500 +504 @@
-    {   Dsymbol *s = toParent2();
-        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();
-            if (ad)
-                t = ad->handle;
-            else
-            {
-
-
+
-            }
-            }
-            else
-            assert(0);
+            if (t->ty == Tstruct)   // ref to struct
+            t = Type::tvoidptr;
-            assert(!vthis);
-            vthis = new ThisDeclaration(t);
-            members->push(vthis);
@@ -546 +551 @@
-    sc->inunion = 0;
-
-    if (isCOMclass())
+    {
+#if _WIN32
-    sc->linkage = LINKwindows;
+#else
+    /* This enables us to use COM objects under Linux and
+     * work with things like XPCOM
+     */
+    sc->linkage = LINKc;
+#endif
+    }
-    sc->protection = PROTpublic;
-    sc->explicitProtection = 0;
-    sc->structalign = 8;
@@ -870 +884 @@
-    {
-    for (size_t i = 0; i < vtbl->dim; i++)
-    {
-
+
+
+
-
-        //printf("\t[%d] = %s\n", i, fd->toChars());
-        if (ident == fd->ident &&
@@ -957 +973 @@
-
-
-/****************************************
- * Returns !=0 if there's an extra member which is the 'this'
- * pointer to the enclosing context (enclosing class or function)
- */
-
-int ClassDeclaration::isNested()
-{
-    return isnested;
-}
-
-/****************************************
- * Determine if slot 0 of the vtbl[] is reserved for something else.
- * For class objects, yes, this is where the classinfo ptr goes.
- * For COM interfaces, no.

a/dmd2/clone.c

@@ -47 +47 @@
-    Dsymbol *s = (Dsymbol *)fields.data[i];
-    VarDeclaration *v = s->isVarDeclaration();
-    assert(v && v->storage_class & STCfield);
+    if (v->storage_class & STCref)
+        continue;
-    Type *tv = v->type->toBasetype();
-    while (tv->ty == Tsarray)
-    {   TypeSArray *ta = (TypeSArray *)tv;
@@ -264 +266 @@
-    Dsymbol *s = (Dsymbol *)fields.data[i];
-    VarDeclaration *v = s->isVarDeclaration();
-    assert(v && v->storage_class & STCfield);
+    if (v->storage_class & STCref)
+        continue;
-    Type *tv = v->type->toBasetype();
-    size_t dim = 1;
-    while (tv->ty == Tsarray)
@@ -359 +363 @@
-    Dsymbol *s = (Dsymbol *)fields.data[i];
-    VarDeclaration *v = s->isVarDeclaration();
-    assert(v && v->storage_class & STCfield);
+    if (v->storage_class & STCref)
+        continue;
-    Type *tv = v->type->toBasetype();
-    size_t dim = 1;
-    while (tv->ty == Tsarray)

a/dmd2/declaration.c

@@ -135 +135 @@
-        if (isConst())
-        p = "const";
-        else if (isInvariant())
-invariant
+mutable
-        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();
-        }
-    }
-    }
@@ -456 +455 @@
-    if (s && ((s->getType() && type->equals(s->getType())) || s->isEnumMember()))
-    goto L2;            // it's a symbolic alias
-
-
-
+
+
+
+
+
+
+
+
+
+
-    if (s)
-    {
-    goto L2;
@@ -780 +787 @@
-    }
-
-Lagain:
-
-
-
+
+
+
+
+
+
+
+
+
+
-    }
-    else if (storage_class & (STCconst | STCin))
-    {
-    if (!type->isInvariant())
-        type = type->constOf();
-    }
-    else if (type->isConst())
-    storage_class |= STCconst;
-    else if (type->isInvariant())
-    storage_class |= STCinvariant;
+    else if (type->isShared())
+    storage_class |= STCshared;
-
-    if (isSynchronized())
-    {
@@ -860 +869 @@
-    }
-    }
-
-
+
+
+
-    error("only parameters or foreach declarations can be ref");
+    }
-
-    if (type->isauto() && !noauto)
-    {
-    if (storage_class & (STCfield | STCout | STCref | STCstatic | STCmanifest | STCtls) || !fd)
-    {
-auto
+scope
-    }
-
-    if (!(storage_class & (STCauto | STCscope)))
@@ -906 +918 @@
-        Expression *e1;
-        e1 = new VarExp(loc, this);
-        e = new AssignExp(loc, e1, e);
+        e->op = TOKconstruct;
-        e->type = e1->type;     // don't type check this, it would fail
-        init = new ExpInitializer(loc, e);
-        return;
@@ -1171 +1184 @@
-    buf->writestring("auto ");
-#if DMDV2
-    if (storage_class & STCmanifest)
-manifest
+enum
-    if (storage_class & STCinvariant)
-
+
+
+
-    if (storage_class & STCtls)
-    buf->writestring("__thread ");
-#endif
@@ -1548 +1563 @@
-}
-#endif
-
+/***************************** TypeInfoSharedDeclaration **********************/
+
+#if DMDV2
+TypeInfoSharedDeclaration::TypeInfoSharedDeclaration(Type *tinfo)
+    : TypeInfoDeclaration(tinfo, 0)
+{
+}
+#endif
+
-/***************************** TypeInfoStructDeclaration **********************/
-
-TypeInfoStructDeclaration::TypeInfoStructDeclaration(Type *tinfo)

a/dmd2/declaration.h

@@ -502 +502 @@
-    void llvmDeclare();
-    void llvmDefine();
-};
+
+struct TypeInfoSharedDeclaration : TypeInfoDeclaration
+{
+    TypeInfoSharedDeclaration(Type *tinfo);
+
+    void toDt(dt_t **pdt);
+};
-#endif
-
-/**************************************************************/
@@ -510 +517 @@
-{
-    ThisDeclaration(Type *t);
-    Dsymbol *syntaxCopy(Dsymbol *);
+    ThisDeclaration *isThisDeclaration() { return this; }
-};
-
-enum ILS
@@ -629 +637 @@
-    int isAbstract();
-    int isCodeseg();
-    int isOverloadable();
+    int isPure();
-    virtual int isNested();
-    int needThis();
-    virtual int isVirtual();

a/dmd2/doc.c

@@ -16 +16 @@
-#include <ctype.h>
-#include <assert.h>
-
-#if IN_GCC || IN_LLVM
-#include "mem.h"
-#else
-#if _WIN32
-#include "..\root\mem.h"
-#elif POSIX
-#include "../root/mem.h"
-#else
-#error "fix this"
-#endif
-#endif
-
-#include "root.h"
-
-#include "mars.h"
@@ -857 +846 @@
-    }
-    else
-    {
+        if (isAbstract())
+        buf->writestring("abstract ");
-        buf->printf("%s $(DDOC_PSYMBOL %s)", kind(), toChars());
-    }
-    int any = 0;

a/dmd2/dsymbol.c

@@ -867 +867 @@
-        s2->toPrettyChars(),
-        s2->locToChars());
-    }
-halt();
-}
-
-Dsymbol *ScopeDsymbol::nameCollision(Dsymbol *s)
@@ -1048 +1047 @@
-    L1:
-
-    if (td)
-
+
+
-        VarDeclaration *v = new VarDeclaration(loc, Type::tsize_t, Id::dollar, NULL);
-        Expression *e = new IntegerExp(0, td->objects->dim, Type::tsize_t);
-        v->init = new ExpInitializer(0, e);
@@ -1058 +1058 @@
-    }
-
-    if (type)
-
+
+
-        VarDeclaration *v = new VarDeclaration(loc, Type::tsize_t, Id::dollar, NULL);
-        Expression *e = new IntegerExp(0, type->arguments->dim, Type::tsize_t);
-        v->init = new ExpInitializer(0, e);
@@ -1068 +1069 @@
-    }
-
-    if (exp->op == TOKindex)
-
+
+
-        IndexExp *ie = (IndexExp *)exp;
-
-        pvar = &ie->lengthVar;
-        ce = ie->e1;
-    }
-    else if (exp->op == TOKslice)
-
+
+
-        SliceExp *se = (SliceExp *)exp;
-
-        pvar = &se->lengthVar;
-        ce = se->e1;
-    }
-    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)
-    {
-        Type *t = ((TypeExp *)ce)->type;
@@ -1093 +1102 @@
-        }
-    }
-
-
-
+
+
+
+
+
+
+
-        VarDeclaration *v = new VarDeclaration(loc, Type::tsize_t, Id::dollar, NULL);
-
-        if (ce->op == TOKvar)

a/dmd2/dsymbol.h

@@ -28 +28 @@
-struct Scope;
-struct DsymbolTable;
-struct Declaration;
+struct ThisDeclaration;
-struct TupleDeclaration;
-struct TypedefDeclaration;
-struct AliasDeclaration;
@@ -192 +193 @@
-    virtual TemplateInstance *isTemplateInstance() { return NULL; }
-    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; }
-    virtual AliasDeclaration *isAliasDeclaration() { return NULL; }

a/dmd2/entity.c

@@ -1 +1 @@
-
-8
+9
-// All Rights Reserved
-// written by Walter Bright
-// http://www.digitalmars.com

a/dmd2/expression.c

@@ -1 +1 @@
-
-// Compiler implementation of the D programming language
-8
+9
-// All Rights Reserved
-// written by Walter Bright
-// http://www.digitalmars.com
@@ -11 +11 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <ctype.h>
+#include <math.h>
-#include <assert.h>
-#if _MSC_VER
-#include <complex>
-#else
-#endif
-#include <math.h>
-
-#if _WIN32 && __DMC__
-extern "C" char * __cdecl __locale_decpoint;
@@ -43 +43 @@
-#define integer_t dmd_integer_t
-#endif
-
-#if IN_GCC || IN_LLVM
-#include "mem.h"
-#elif _WIN32
-#include "..\root\mem.h"
-#elif POSIX
-#include "../root/mem.h"
-#endif
-
-//#include "port.h"
-#include "mtype.h"
@@ -172 +166 @@
-    precedence[TOKue] = PREC_rel;
-    precedence[TOKin] = PREC_rel;
-
+#if 0
-    precedence[TOKequal] = PREC_equal;
-    precedence[TOKnotequal] = PREC_equal;
-    precedence[TOKidentity] = PREC_equal;
-    precedence[TOKnotidentity] = PREC_equal;
+#else
+    /* Note that we changed precedence, so that < and != have the same
+     * precedence. This change is in the parser, too.
+     */
+    precedence[TOKequal] = PREC_rel;
+    precedence[TOKnotequal] = PREC_rel;
+    precedence[TOKidentity] = PREC_rel;
+    precedence[TOKnotidentity] = PREC_rel;
+#endif
-
-    precedence[TOKand] = PREC_and;
-
@@ -642 +646 @@
-                Expression *e = new VarExp(loc, v);
-                e = new IndexExp(loc, e, new IntegerExp(u + 1 - nparams));
-                AssignExp *ae = new AssignExp(loc, e, a);
+#if DMDV2
-                ae->op = TOKconstruct;
+#endif
-                if (c)
-                c = new CommaExp(loc, c, ae);
-                else
@@ -698 +704 @@
-
-        tb = arg->type->toBasetype();
-
-
-
-
-
-
-
-
-
-
+
-
-        if (tb->ty == Tstruct && !(p->storageClass & (STCref | STCout)))
-        {
-        arg = callCpCtor(loc, sc, arg);
-        }
+#endif
-
-        // Convert lazy argument to a delegate
-        if (p->storageClass & STClazy)
-        {
-        arg = arg->toDelegate(sc, p->type);
-        }
-
+
-        /* Look for arguments that cannot 'escape' from the called
-         * function.
-         */
@@ -748 +747 @@
-            }
-        }
-        }
+#endif
-    }
-    else
-    {
@@ -826 +826 @@
-void expToCBuffer(OutBuffer *buf, HdrGenState *hgs, Expression *e, enum PREC pr)
-{
-    //if (precedence[e->op] == 0) e->dump(0);
-
+
+
+
+
+
-    {
-    buf->writeByte('(');
-    e->toCBuffer(buf, hgs);
@@ -958 +962 @@
-    va_end( ap );
-}
-
+void Expression::warning(const char *format, ...)
+{
+    if (global.params.warnings && !global.gag)
+    {
+    fprintf(stdmsg, "warning - ");
+    va_list ap;
+    va_start(ap, format);
+    ::verror(loc, format, ap);
+    va_end( ap );
+    }
+}
+
-void Expression::rvalue()
-{
-    if (type && type->toBasetype()->ty == Tvoid)
@@ -1033 +1049 @@
-/***************************************
- * Return !=0 if expression is an lvalue.
- */
-
+
-int Expression::isLvalue()
-{
-    return 0;
-}
+#endif
-
-/*******************************
- * Give error if we're not an lvalue.
@@ -1059 +1076 @@
-    //printf("Expression::modifiableLvalue() %s, type = %s\n", toChars(), type->toChars());
-
-    // See if this expression is a modifiable lvalue (i.e. not const)
+#if DMDV2
-    if (type && (!type->isMutable() || !type->isAssignable()))
-    error("%s is not mutable", e->toChars());
-
+
-    return toLvalue(sc, e);
-}
-
@@ -1109 +1127 @@
-    s->checkDeprecated(loc, sc);
-}
-
+#if DMDV2
+void Expression::checkPurity(Scope *sc, FuncDeclaration *f)
+{
+    if (sc->func && sc->func->isPure() && !sc->intypeof && !f->isPure())
+    error("pure function '%s' cannot call impure function '%s'\n",
+        sc->func->toChars(), f->toChars());
+}
+#endif
+
-/********************************
- * Check for expressions that have no use.
- * Input:
@@ -1235 +1262 @@
-
-int Expression::canThrow()
-{
+#if DMDV2
-    return FALSE;
+#else
+    return TRUE;
+#endif
-}
-
-
@@ -1701 +1732 @@
-     * 0X1.9P+2         => 19P2
-     */
-
+#if __APPLE__
+    if (__inline_isnan(value))
+#else
-    if (isnan(value))
+#endif
-    buf->writestring("NAN");    // no -NAN bugs
-    else
-    {
@@ -1949 +1984 @@
-    buf->writestring(ident->toChars());
-}
-
+#if DMDV2
-int IdentifierExp::isLvalue()
-{
-    return 1;
-}
+#endif
-
-Expression *IdentifierExp::toLvalue(Scope *sc, Expression *e)
-{
@@ -2019 +2056 @@
-    // BUG: This should happen after overload resolution for functions, not before
-    if (s->needThis())
-    {
-
+
+
+
+
+
-    {
-        // Supply an implicit 'this', as in
-        //    this.ident
@@ -2154 +2195 @@
-    buf->writestring(s->toChars());
-}
-
+#if DMDV2
-int DsymbolExp::isLvalue()
-{
-    return 1;
-}
+#endif
-
-Expression *DsymbolExp::toLvalue(Scope *sc, Expression *e)
-{
@@ -2220 +2263 @@
-#if STRUCTTHISREF
-        type = sd->type;
-#else
+        assert(0);
-        type = sd->type->pointerTo();
-#endif
-        return this;
@@ -2257 +2301 @@
-    buf->writestring("this");
-}
-
+#if DMDV2
-int ThisExp::isLvalue()
-{
-    return 1;
-}
+#endif
-
-Expression *ThisExp::toLvalue(Scope *sc, Expression *e)
-{
@@ -2494 +2540 @@
-        string = buffer.extractData();
-        len = newlen;
-        sz = 4;
-
+
+
-        committed = 1;
-        break;
-
@@ -2517 +2564 @@
-        string = buffer.extractData();
-        len = newlen;
-        sz = 2;
-
+
+
-        committed = 1;
-        break;
-
-        case 'c':
-        committed = 1;
-        default:
-
+
+
-        break;
-    }
-    type = type->semantic(loc, sc);
-
+//
-    //printf("type = %s\n", type->toChars());
-    }
-    return this;
-}
-
+/**********************************
+ * Return length of string.
+ */
+
+size_t StringExp::length()
+{
+    size_t result = 0;
+    dchar_t c;
+    const char *p;
+
+    switch (sz)
+    {
+    case 1:
+        for (size_t u = 0; u < len;)
+        {
+        p = utf_decodeChar((unsigned char *)string, len, &u, &c);
+        if (p)
+        {   error("%s", p);
+            break;
+        }
+        else
+            result++;
+        }
+        break;
+
+    case 2:
+        for (size_t u = 0; u < len;)
+        {
+        p = utf_decodeWchar((unsigned short *)string, len, &u, &c);
+        if (p)
+        {   error("%s", p);
+            break;
+        }
+        else
+            result++;
+        }
+        break;
+
+    case 4:
+        result = len;
+        break;
+
+    default:
+        assert(0);
+    }
+    return result;
+}
+
-/****************************************
- * Convert string to char[].
- */
@@ -2814 +2911 @@
-    return result ? (dim != 0) : (dim == 0);
-}
-
+#if DMDV2
-int ArrayLiteralExp::canThrow()
-{
-    return 1;   // because it can fail allocating memory
-}
+#endif
-
-void ArrayLiteralExp::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
-{
@@ -2937 +3036 @@
-    return result ? (dim != 0) : (dim == 0);
-}
-
+#if DMDV2
-int AssocArrayLiteralExp::canThrow()
-{
-    return 1;
-}
+#endif
-
-void AssocArrayLiteralExp::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
-{
@@ -2992 +3093 @@
-
-Expression *StructLiteralExp::semantic(Scope *sc)
-{   Expression *e;
+    int nfields = sd->fields.dim - sd->isnested;
-
-#if LOGSEMANTIC
-    printf("StructLiteralExp::semantic('%s')\n", toChars());
@@ -3017 +3119 @@
-    if (!e->type)
-        error("%s has no value", e->toChars());
-    e = resolveProperties(sc, e);
-sd->fields.dim
+nfields
-    {   error("more initializers than fields of %s", sd->toChars());
-        break;
-    }
@@ -3043 +3145 @@
-
-    /* Fill out remainder of elements[] with default initializers for fields[]
-     */
-sd->fields.dim
+nfields
-    {   Dsymbol *s = (Dsymbol *)sd->fields.data[i];
-    VarDeclaration *v = s->isVarDeclaration();
-    assert(v);
+    assert(!v->isThisDeclaration());
-
-    if (v->offset < offset)
-    {   e = NULL;
@@ -3126 +3229 @@
-    return -1;
-}
-
+#if DMDV2
-int StructLiteralExp::isLvalue()
-{
-    return 1;
-}
+#endif
-
-Expression *StructLiteralExp::toLvalue(Scope *sc, Expression *e)
-{
@@ -3152 +3257 @@
-    return f;
-}
-
+#if DMDV2
-int StructLiteralExp::canThrow()
-{
-    return arrayExpressionCanThrow(elements);
-}
+#endif
-
-void StructLiteralExp::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
-{
@@ -3231 +3338 @@
-    this->type = type;
-}
-
+Expression *TypeExp::syntaxCopy()
+{
+    //printf("TypeExp::syntaxCopy()\n");
+    return new TypeExp(loc, type->syntaxCopy());
+}
+
-Expression *TypeExp::semantic(Scope *sc)
-{
-    //printf("TypeExp::semantic(%s)\n", type->toChars());
@@ -3661 +3774 @@
-    return 1;
-}
-
+#if DMDV2
-int NewExp::canThrow()
-{
-    return 1;
-}
+#endif
-
-void NewExp::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
-{   int i;
@@ -3733 +3848 @@
-    return 1;
-}
-
+#if DMDV2
-int NewAnonClassExp::canThrow()
-{
-    return 1;
-}
+#endif
-
-void NewAnonClassExp::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
-{   int i;
@@ -3768 +3885 @@
-
-/********************** SymbolExp **************************************/
-
+#if DMDV2
-SymbolExp::SymbolExp(Loc loc, enum TOK op, int size, Declaration *var, int hasOverloads)
-    : Expression(loc, op, size)
-{
@@ -3775 +3893 @@
-    this->var = var;
-    this->hasOverloads = hasOverloads;
-}
+#endif
-
-/********************** SymOffExp **************************************/
-
@@ -3865 +3984 @@
-    }
-#endif
-    }
+    /* Fix for 1161 doesn't work because it causes protection
+     * problems when instantiating imported templates passing private
+     * variables as alias template parameters.
+     */
+    //accessCheck(loc, sc, NULL, var);
-
-    VarDeclaration *v = var->isVarDeclaration();
-    if (v)
@@ -3882 +4006 @@
-    }
-#endif
-    v->checkNestedReference(sc, loc);
+#if DMDV2
+    if (sc->func && sc->func->isPure() && !sc->intypeof)
+    {
+        if (v->isDataseg() && !v->isInvariant())
+        error("pure function '%s' cannot access mutable static data '%s'", sc->func->toChars(), v->toChars());
+    }
+#endif
-    }
-#if 0
-    else if ((fd = var->isFuncLiteralDeclaration()) != NULL)
@@ -3913 +4044 @@
-    if (tb->ty == Tarray || tb->ty == Tsarray || tb->ty == Tclass)
-    {
-        if ((v->isAuto() || v->isScope()) && !v->noauto)
-auto
+scope
-        else if (v->storage_class & STCvariadic)
-        error("escaping reference to variadic parameter %s", v->toChars());
-    }
-    }
-}
-
+#if DMDV2
-int VarExp::isLvalue()
-{
-    if (var->storage_class & STClazy)
-    return 0;
-    return 1;
-}
+#endif
-
-Expression *VarExp::toLvalue(Scope *sc, Expression *e)
-{
@@ -4099 +4232 @@
-    return f;
-}
-
+#if DMDV2
-int TupleExp::canThrow()
-{
-    return arrayExpressionCanThrow(exps);
-}
+#endif
-
-void TupleExp::checkEscape()
-{
@@ -4272 +4407 @@
-    return 1;
-}
-
+#if DMDV2
-int DeclarationExp::canThrow()
-{
-    VarDeclaration *v = declaration->isVarDeclaration();
@@ -4281 +4417 @@
-    }
-    return 0;
-}
+#endif
-
-void DeclarationExp::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
-{
@@ -4595 +4732 @@
-    m = targ->deduceType(NULL, tspec, parameters, &dedtypes);
-    if (m == MATCHnomatch ||
-        (m != MATCHexact && tok == TOKequal))
+    {
-        goto Lno;
+    }
-    else
-    {
-        tded = (Type *)dedtypes.data[0];
@@ -4637 +4776 @@
-    else if (tspec)
-    {
-    /* Evaluate to TRUE if targ matches tspec
+     * is(targ == tspec)
+     * is(targ : tspec)
-     */
-    tspec = tspec->semantic(loc, sc);
-    //printf("targ  = %s\n", targ->toChars());
@@ -4732 +4873 @@
-    return this;
-}
-
+#if DMDV2
-int UnaExp::canThrow()
-{
-    return e1->canThrow();
-}
+#endif
-
-void UnaExp::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
-{
@@ -4906 +5049 @@
-    return e1->type->isunsigned() || e2->type->isunsigned();
-}
-
+#if DMDV2
-int BinExp::canThrow()
-{
-    return e1->canThrow() || e2->canThrow();
-}
+#endif
-
-void BinExp::incompatibleTypes()
-{
@@ -5079 +5224 @@
-    return 1;
-}
-
+#if DMDV2
-int AssertExp::canThrow()
-{
-    return (global.params.useAssert != 0);
-}
+#endif
-
-void AssertExp::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
-{
@@ -5310 +5457 @@
-        }
-        return e;
-        }
-
+
-        OverloadSet *o = s->isOverloadSet();
-        if (o)
-        {   //printf("'%s' is an overload set\n", o->toChars());
-        return new OverExp(o);
-        }
+#endif
-
-        Type *t = s->getType();
-        if (t)
@@ -5382 +5530 @@
-    e->type = ((TypePointer *)t1b)->next;
-    return e->type->dotExp(sc, e, ident);
-    }
+#if DMDV2
-    else if (t1b->ty == Tarray ||
-             t1b->ty == Tsarray ||
-         t1b->ty == Taarray)
@@ -5403 +5552 @@
-    e = e->semantic(sc);
-    return e;
-    }
+#endif
-    else
-    {
-    e = e1->type->dotExp(sc, e1, ident);
@@ -5504 +5654 @@
-        Type *t1 = e1->type;
-        if (t1->ty == Tpointer)
-        t1 = t1->nextOf();
-
-
-
-
+
+
-
-        AggregateDeclaration *ad = var->toParent()->isAggregateDeclaration();
-        e1 = getRightThis(loc, sc, ad, e1, var);
@@ -5524 +5672 @@
-    return this;
-}
-
+#if DMDV2
-int DotVarExp::isLvalue()
-{
-    return 1;
-}
+#endif
-
-Expression *DotVarExp::toLvalue(Scope *sc, Expression *e)
-{
@@ -5579 +5729 @@
-        break;
-    }
-    }
+#if DMDV2
-    else
-    {
-    Type *t1 = e1->type->toBasetype();
@@ -5589 +5740 @@
-        !var->type->isAssignable() ||
-        var->storage_class & STCmanifest
-       )
-
-
+
+
+
-    return this;
-}
-
@@ -5856 +6008 @@
-    Type *t1;
-    int istemp;
-    Objects *targsi = NULL; // initial list of template arguments
+    TemplateInstance *tierror = NULL;
-
-#if LOGSEMANTIC
-    printf("CallExp::semantic() %s\n", toChars());
@@ -5913 +6066 @@
-        if (!arguments)
-            arguments = new Expressions();
-        arguments->shift(dotid->e1);
+#if DMDV2
-        e1 = new DotIdExp(dotid->loc, new IdentifierExp(dotid->loc, Id::empty), dotid->ident);
+#else
+        e1 = new IdentifierExp(dotid->loc, dotid->ident);
+#endif
-        }
-    }
-    }
@@ -5941 +6098 @@
-         */
-        global.errors = errors;
-        targsi = ti->tiargs;
+        tierror = ti;           // for error reporting
-        e1 = new IdentifierExp(loc, ti->name);
-        }
-    }
@@ -5967 +6125 @@
-        {
-        global.errors = errors;
-        targsi = ti->tiargs;
+        tierror = ti;       // for error reporting
-        e1 = new DotIdExp(loc, se->e1, ti->name);
-        }
-        else
@@ -6065 +6224 @@
-         */
-        e = new PtrExp(loc, e);
-#endif
+        assert(0);
-        e = e->semantic(sc);
-        return e;
-        }
@@ -6143 +6303 @@
-        f->addPostInvariant()
-       )
-    {
-nvariant
+mmutable
-    }
-
-    checkDeprecated(sc, f);
+#if DMDV2
+    checkPurity(sc, f);
+#endif
-    accessCheck(loc, sc, ue->e1, f);
-    if (!f->needThis())
-    {
@@ -6168 +6331 @@
-        printf("e1 = %s\n", e1->toChars());
-        printf("e1->type = %s\n", e1->type->toChars());
-#endif
-nvariant
+mmutable
-        if (!(f->type->isConst()))
-        {
-nvariant
+mmutable
-        Type *tthis = ue->e1->type->toBasetype();
-        if (tthis->ty == Tpointer)
-            tthis = tthis->nextOf()->toBasetype();
@@ -6248 +6411 @@
-
-        f = f->overloadResolve(loc, NULL, arguments);
-        checkDeprecated(sc, f);
+#if DMDV2
+        checkPurity(sc, f);
+#endif
-        e1 = new DotVarExp(e1->loc, e1, f);
-        e1 = e1->semantic(sc);
-        t1 = e1->type;
@@ -6285 +6451 @@
-        f = cd->ctor;
-        f = f->overloadResolve(loc, NULL, arguments);
-        checkDeprecated(sc, f);
+#if DMDV2
+        checkPurity(sc, f);
+#endif
-        e1 = new DotVarExp(e1->loc, e1, f);
-        e1 = e1->semantic(sc);
-        t1 = e1->type;
@@ -6357 +6526 @@
-        TemplateExp *te = (TemplateExp *)e1;
-        f = te->td->deduceFunctionTemplate(sc, loc, targsi, NULL, arguments);
-        if (!f)
-
+
+
+
-        return this;
-        }
-        if (f->needThis() && hasThis(sc))
@@ -6389 +6560 @@
-    if (ve->hasOverloads)
-        f = f->overloadResolve(loc, NULL, arguments);
-    checkDeprecated(sc, f);
+#if DMDV2
+    checkPurity(sc, f);
+#endif
-
-    if (f->needThis() && hasThis(sc))
-    {
@@ -6437 +6611 @@
-
-int CallExp::checkSideEffect(int flag)
-{
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-int CallExp::canThrow()
-{
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-int CallExp::isLvalue()
-{
-
-
+//
+//
-    Type *tb = e1->type->toBasetype();
-    if (tb->ty == Tfunction && ((TypeFunction *)tb)->isref)
-    return 1;       // function returns a reference
-    return 0;
-}
+#endif
-
-Expression *CallExp::toLvalue(Scope *sc, Expression *e)
-{
@@ -6614 +6839 @@
-    return this;
-}
-
+#if DMDV2
-int PtrExp::isLvalue()
-{
-    return 1;
-}
+#endif
-
-Expression *PtrExp::toLvalue(Scope *sc, Expression *e)
-{
@@ -6631 +6858 @@
-    return this;
-}
-
+#if DMDV2
-Expression *PtrExp::modifiableLvalue(Scope *sc, Expression *e)
-{
-    //printf("PtrExp::modifiableLvalue() %s, type %s\n", toChars(), type->toChars());
@@ -6643 +6871 @@
-
-    return Expression::modifiableLvalue(sc, e);
-}
-
+
-
-void PtrExp::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
-{
@@ -6909 +7137 @@
-    : UnaExp(loc, TOKcast, sizeof(CastExp), e)
-{
-    to = t;
-
-
-
-
-
-
+
+
+
+
+
+
+
-    : UnaExp(loc, TOKcast, sizeof(CastExp), e)
-{
-    to = NULL;
-
-
+
+
+
-
-Expression *CastExp::syntaxCopy()
-{
-    return to ? new CastExp(loc, e1->syntaxCopy(), to->syntaxCopy())
-tok
+mod
-}
-
-
@@ -6946 +7176 @@
-    {
-    e1 = resolveProperties(sc, e1);
-
-    /* Handle cast(const) and cast(invariant)
-     */
-    if (!to)
-
-
-
-
-
-
+
+
+
+
-    }
-    else
-        to = to->semantic(loc, sc);
@@ -6989 +7215 @@
-    {   error("cannot cast tuple");
-    to = Type::terror;
-    }
+
+    if (global.params.safe && !sc->module->safe && !sc->intypeof)
+    {   // Disallow unsafe casts
+    Type *tob = to->toBasetype();
+    Type *t1b = e1->type->toBasetype();
+    if (!t1b->isMutable() && tob->isMutable())
+    {   // Cast not mutable to mutable
+      Lunsafe:
+        error("cast from %s to %s not allowed in safe mode", e1->type->toChars(), to->toChars());
+    }
+    else if (t1b->isShared() && !tob->isShared())
+        // Cast away shared
+        goto Lunsafe;
+    else if (tob->ty == Tpointer)
+    {   if (t1b->ty != Tpointer)
+        goto Lunsafe;
+        Type *tobn = tob->nextOf()->toBasetype();
+        Type *t1bn = t1b->nextOf()->toBasetype();
+
+        if (!t1bn->isMutable() && tobn->isMutable())
+        // Cast away pointer to not mutable
+        goto Lunsafe;
+
+        if (t1bn->isShared() && !tobn->isShared())
+        // Cast away pointer to shared
+        goto Lunsafe;
+
+        if (tobn->isTypeBasic() && tobn->size() < t1bn->size())
+        // Allow things like casting a long* to an int*
+        ;
+        else if (tobn->ty != Tvoid)
+        // Cast to a pointer other than void*
+        goto Lunsafe;
+    }
+
+    // BUG: Check for casting array types, such as void[] to int*[]
+    }
+
-    e = e1->castTo(sc, to);
-    return e;
-}
@@ -7022 +7286 @@
-void CastExp::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
-{
-    buf->writestring("cast(");
+#if V1
+    to->toCBuffer(buf, NULL, hgs);
+#else
-    if (to)
-    to->toCBuffer(buf, NULL, hgs);
-    else
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    buf->writeByte(')');
-    expToCBuffer(buf, hgs, e1, precedence[op]);
-}
@@ -7200 +7489 @@
-    return e;
-    }
-
-
+
+
+
+
+
+
-    return e;
-
-Lerror:
@@ -7210 +7504 @@
-    else
-    s = t->toChars();
-    error("%s cannot be sliced with []", s);
-type = Type::terror
+e = new IntegerExp(0)
-    return e;
-}
-
@@ -7219 +7513 @@
-    e1->checkEscape();
-}
-
+#if DMDV2
-int SliceExp::isLvalue()
-{
-    return 1;
-}
+#endif
-
-Expression *SliceExp::toLvalue(Scope *sc, Expression *e)
-{
@@ -7338 +7634 @@
-    return e;
-}
-
-
+
-int ArrayExp::isLvalue()
-{
-    if (type && type->toBasetype()->ty == Tvoid)
-    return 0;
-    return 1;
-}
+#endif
-
-Expression *ArrayExp::toLvalue(Scope *sc, Expression *e)
-{
@@ -7415 +7712 @@
-    e2->checkEscape();
-}
-
+#if DMDV2
-int CommaExp::isLvalue()
-{
-    return e2->isLvalue();
-}
+#endif
-
-Expression *CommaExp::toLvalue(Scope *sc, Expression *e)
-{
@@ -7532 +7831 @@
-
-    case Taarray:
-    {   TypeAArray *taa = (TypeAArray *)t1;
-
-
+
+
+
+
-        type = taa->next;
-        break;
-    }
@@ -7585 +7886 @@
-    return e;
-}
-
+#if DMDV2
-int IndexExp::isLvalue()
-{
-    return 1;
-}
+#endif
-
-Expression *IndexExp::toLvalue(Scope *sc, Expression *e)
-{
@@ -9116 +9419 @@
-    e2 = e2->checkToPointer();
-
-    type = Type::tboolean;
-1
+2
-    type = Type::tvoid;
-    if (e2->op == TOKtype || e2->op == TOKimport)
-    error("%s is not an expression", e2->toChars());
@@ -9181 +9484 @@
-    e2 = e2->checkToPointer();
-
-    type = Type::tboolean;
-1
+2
-    type = Type::tvoid;
-    if (e2->op == TOKtype || e2->op == TOKimport)
-    error("%s is not an expression", e2->toChars());
@@ -9241 +9544 @@
-    {
-    TypeAArray *ta = (TypeAArray *)t2b;
-
-
-
+
+
+
+
+
+
-
-    // Return type is pointer to value
-    type = ta->nextOf()->pointerTo();
@@ -9410 +9717 @@
-    type = Type::tboolean;
-
-    // Special handling for array comparisons
-
-
-
-
-
-
-
-
-
-
-
-
+
-    {
-    if (e1->type != e2->type && e1->type->isfloating() && e2->type->isfloating())
-    {
@@ -9575 +9871 @@
-    return this;
-}
-
+#if DMDV2
-int CondExp::isLvalue()
-{
-    return e1->isLvalue() && e2->isLvalue();
-}
+#endif
-
-Expression *CondExp::toLvalue(Scope *sc, Expression *ex)
-{
@@ -9635 +9933 @@
-    }
-}
-
+#if DMDV2
-int CondExp::canThrow()
-{
-    return econd->canThrow() || e1->canThrow() || e2->canThrow();
-}
-
+
-
-void CondExp::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
-{

a/dmd2/expression.h

@@ -99 +99 @@
-    char *toChars();
-    virtual void dump(int indent);
-    void error(const char *format, ...);
+    void warning(const char *format, ...);
-    virtual void rvalue();
-
-    static Expression *combine(Expression *e1, Expression *e2);
@@ -114 +115 @@
-    virtual int isLvalue();
-    virtual Expression *toLvalue(Scope *sc, Expression *e);
-    virtual Expression *modifiableLvalue(Scope *sc, Expression *e);
-
+virtual 
-    virtual MATCH implicitConvTo(Type *t);
-    virtual Expression *castTo(Scope *sc, Type *t);
-    virtual void checkEscape();
@@ -123 +124 @@
-    Expression *checkIntegral();
-    Expression *checkArithmetic();
-    void checkDeprecated(Scope *sc, Dsymbol *s);
+    void checkPurity(Scope *sc, FuncDeclaration *f);
-    virtual Expression *checkToBoolean();
-    Expression *checkToPointer();
-    Expression *addressOf(Scope *sc);
@@ -344 +346 @@
-    char *toChars();
-    Expression *semantic(Scope *sc);
-    Expression *interpret(InterState *istate);
+    size_t length();
-    StringExp *toUTF8(Scope *sc);
+    Expression *implicitCastTo(Scope *sc, Type *t);
-    MATCH implicitConvTo(Type *t);
-    Expression *castTo(Scope *sc, Type *t);
-    int compare(Object *obj);
@@ -491 +495 @@
-struct TypeExp : Expression
-{
-    TypeExp(Loc loc, Type *type);
+    Expression *syntaxCopy();
-    Expression *semantic(Scope *sc);
-    void toCBuffer(OutBuffer *buf, HdrGenState *hgs);
-    Expression *optimize(int result);
@@ -858 +863 @@
-    int isLvalue();
-    Expression *toLvalue(Scope *sc, Expression *e);
-    Expression *modifiableLvalue(Scope *sc, Expression *e);
+    Expression *optimize(int result);
+    Expression *interpret(InterState *istate);
-    void toCBuffer(OutBuffer *buf, HdrGenState *hgs);
-    void dump(int indent);
-    elem *toElem(IRState *irs);
-
-    //LDC: since we don't convert abc.def -> *(&abc + ABC.def.offsetof)
-    // these are needed
-    Expression *optimize(int result);
-    Expression *interpret(InterState *istate);
-};
-
-struct DotTemplateInstanceExp : UnaExp
@@ -1034 +1036 @@
-{
-    // Possible to cast to one type while painting to another type
-    Type *to;           // type to cast to
-enum TOK tok;      // TOKconst or TOKinvariant
+unsigned mod;      // MODxxxxx
-
-    CastExp(Loc loc, Expression *e, Type *t);
-enum TOK tok
+unsigned mod
-    Expression *syntaxCopy();
-    Expression *semantic(Scope *sc);
-    Expression *optimize(int result);

a/dmd2/func.c

@@ -129 +129 @@
-    originalType = type;
-    if (!type->deco && type->nextOf())
-    {
-#if 1
-    /* Apply const and invariant storage class
-     * to the function type
-     */
@@ -147 +146 @@
-        type->deco = type->merge()->deco;
-        }
-    }
-#else
-    if (storage_class & (STCconst | STCinvariant))
-    {
-        /* Apply const and invariant storage class
-         * to the function's return type
-         */
-        Type *tn = type->nextOf();
-        if (storage_class & STCconst)
-        tn = tn->makeConst();
-        if (storage_class & STCinvariant)
-        tn = tn->makeInvariant();
-        ((TypeNext *)type)->next = tn;
-    }
-
-    type = type->semantic(loc, sc);
-#endif
-    }
-    //type->print();
-    if (type->ty != Tfunction)
@@ -190 +173 @@
-    error("non-virtual functions cannot be abstract");
-
-    if ((f->isConst() || f->isInvariant()) && !isThis())
-nvariant
+mmutable
-
-    if (isAbstract() && isFinal())
-    error("cannot be both final and abstract");
-#if 0
-    if (isAbstract() && fbody)
-    error("abstract functions cannot have bodies");
-#endif
-
-#if 0
-    if (isStaticConstructor() || isStaticDestructor())
-    {
-    if (!isStatic() || type->nextOf()->ty != Tvoid)
-        error("static constructors / destructors must be static void");
-    if (f->arguments && f->arguments->dim)
-        error("static constructors / destructors must have empty parameter list");
-    // BUG: check for invalid storage classes
-    }
-#endif
-
-#ifdef IN_GCC
-    AggregateDeclaration *ad;
-
-    ad = parent->isAggregateDeclaration();
-    if (ad)
-    ad->methods.push(this);
-#endif
-    sd = parent->isStructDeclaration();
-    if (sd)
-    {
@@ -224 +185 @@
-    {
-        return;
-    }
-#if 0
-    // Verify no constructors, destructors, etc.
-    if (isCtorDeclaration()
-        //||isDtorDeclaration()
-        //|| isInvariantDeclaration()
-        //|| isUnitTestDeclaration()
-       )
-    {
-        error("special member functions not allowed for %ss", sd->kind());
-    }
-
-    if (!sd->inv)
-        sd->inv = isInvariantDeclaration();
-
-    if (!sd->aggNew)
-        sd->aggNew = isNewDeclaration();
-
-    if (isDelete())
-    {
-        if (sd->aggDelete)
-        error("multiple delete's for struct %s", sd->toChars());
-        sd->aggDelete = (DeleteDeclaration *)(this);
-    }
-#endif
-    }
-
-    id = parent->isInterfaceDeclaration();
@@ -292 +229 @@
-        return;
-    }
-
-#if 0
-    dtor = isDtorDeclaration();
-    if (dtor)
-    {
-        if (cd->dtor)
-        error("multiple destructors for class %s", cd->toChars());
-        cd->dtor = dtor;
-    }
-
-    inv = isInvariantDeclaration();
-    if (inv)
-    {
-        cd->inv = inv;
-    }
-
-    if (isNewDeclaration())
-    {
-        if (!cd->aggNew)
-        cd->aggNew = (NewDeclaration *)(this);
-    }
-
-    if (isDelete())
-    {
-        if (cd->aggDelete)
-        error("multiple delete's for class %s", cd->toChars());
-        cd->aggDelete = (DeleteDeclaration *)(this);
-    }
-#endif
-
-    if (storage_class & STCabstract)
-        cd->isabstract = 1;
-
@@ -355 +263 @@
-
-        if (isFinal())
-        {
+            if (isOverride())
+            error("does not override any function");
-            cd->vtblFinal.push(this);
-        }
-        else
@@ -379 +289 @@
-            error("cannot override final function %s", fdv->toPrettyChars());
-
-#if DMDV2
- && global.params.warnings
+
-            warning("%s: overrides base class function %s, but is not marked with 'override'", locToChars(), fdv->toPrettyChars());
-#endif
-
@@ -460 +370 @@
-            if (fdv->type->nextOf()->isBaseOf(type->nextOf(), &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
-            }
-            }
-            if (ti)
@@ -616 +517 @@
-    }
-    //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);
-
@@ -660 +562 @@
-    sc2->sw = NULL;
-    sc2->fes = fes;
-    sc2->linkage = LINKd;
-
+ | STCref
-    sc2->protection = PROTpublic;
-    sc2->explicitProtection = 0;
-    sc2->structalign = 8;
@@ -684 +586 @@
-        assert(!isNested());    // can't be both member and nested
-        assert(ad->handle);
-        Type *thandle = ad->handle;
+#if STRUCTTHISREF
+        thandle = thandle->addMod(type->mod);
+        thandle = thandle->addStorageClass(storage_class);
+        if (isPure())
+            thandle = thandle->addMod(MODconst);
+#else
+        assert(0);
-        if (storage_class & STCconst || type->isConst())
-        {
-
-
-
+
-            if (thandle->ty == Tclass)
-            thandle = thandle->constOf();
-            else
-            {   assert(thandle->ty == Tpointer);
-            thandle = thandle->nextOf()->constOf()->pointerTo();
-            }
-#endif
-        }
-        else if (storage_class & STCinvariant || type->isInvariant())
-        {
-#if STRUCTTHISREF
-            thandle = thandle->invariantOf();
-#else
-            if (thandle->ty == Tclass)
-            thandle = thandle->invariantOf();
-            else
-            {   assert(thandle->ty == Tpointer);
-            thandle = thandle->nextOf()->invariantOf()->pointerTo();
-            }
+        }
+        else if (storage_class & STCshared || type->isShared())
+        {
+            assert(0);  // not implemented
+        }
-#endif
-        }
-        v = new ThisDeclaration(thandle);
-        v->storage_class |= STCparameter;
-#if STRUCTTHISREF
@@ -818 +725 @@
-             */
-            arg->ident = id = Identifier::generateId("_param_", i);
-        }
-
+
+
+
+
-        //printf("declaring parameter %s of type %s\n", v->toChars(), v->type->toChars());
-        v->storage_class |= STCparameter;
-        if (f->varargs == 2 && i + 1 == nparams)
@@ -1088 +998 @@
-        error("expected to return a value of type %s", type->nextOf()->toChars());
-        else if (!inlineAsm)
-        {
-
-
+
+
+
+
+
-
-        if (type->nextOf()->ty == Tvoid)
-        {
@@ -1104 +1017 @@
-            if (offend)
-            {   Expression *e;
-
-if (global.params.warnings)
+warning(loc, "no return at end of function");
-            {   warning("%s: no return at end of function", locToChars());
-            }
-
-            if (global.params.useAssert &&
-                !global.params.useInline)
@@ -1129 +1041 @@
-        }
-        }
-    }
+    }
-
-    {
-        Statements *a = new Statements();
@@ -1148 +1061 @@
-        }
-        }
-
-// we'll handle variadics ourselves
-#if !IN_LLVM
-        if (argptr)
-        {   // Initialize _argptr to point past non-variadic arg
-#if IN_GCC
-        // Handled in FuncDeclaration::toObjFile
-        v_argptr = argptr;
-        v_argptr->init = new VoidInitializer(loc);
-#else
-        Expression *e1;
-        Expression *e;
-        Type *t = argptr->type;
-        VarDeclaration *p;
-        unsigned offset;
-
-        e1 = new VarExp(0, argptr);
-        if (parameters && parameters->dim)
-            p = (VarDeclaration *)parameters->data[parameters->dim - 1];
-        else
-            p = v_arguments;        // last parameter is _arguments[]
-        offset = p->type->size();
-        offset = (offset + 3) & ~3; // assume stack aligns on 4
-        e = new SymOffExp(0, p, offset);
-        e = new AssignExp(0, e1, e);
-        e->type = t;
-        a->push(new ExpStatement(0, e));
-#endif // IN_GCC
-        }
-
-        if (_arguments)
-        {
-        /* Advance to elements[] member of TypeInfo_Tuple with:
-         *  _arguments = v_arguments.elements;
-         */
-        Expression *e = new VarExp(0, v_arguments);
-        e = new DotIdExp(0, e, Id::elements);
-        Expression *e1 = new VarExp(0, _arguments);
-        e = new AssignExp(0, e1, e);
-        e->op = TOKconstruct;
-        e = e->semantic(sc);
-        a->push(new ExpStatement(0, e));
-        }
-
-#endif // !IN_LLVM
-
-        // Merge contracts together with body into one compound statement
-
-#ifdef _DH
@@ -1940 +1808 @@
-    }
-    else
-    {
-ClassDeclaration *thiscd = s->isClass
+AggregateDeclaration *thiscd = s->isAggregate
-        if (thiscd)
-        {   if (!thiscd->isNested())
-            goto Lerr;
@@ -2068 +1936 @@
-    return 1;           // functions can be overloaded
-}
-
+int FuncDeclaration::isPure()
+{
+    //printf("FuncDeclaration::isPure() '%s'\n", toChars());
+    assert(type->ty == Tfunction);
+    return ((TypeFunction *)this->type)->ispure;
+}
+
-// Determine if function needs
-// a static frame pointer to its lexically enclosing function
-
@@ -2808 +2683 @@
-    ad = parent->isAggregateDeclaration();
-    if (!ad)
-    {
-only are
+are only
-    return;
-    }
-    else if (ad->inv && ad->inv != this)

a/dmd2/hdrgen.c

@@ -24 +24 @@
-#include <complex.h>
-#endif
-
-#if IN_GCC || IN_LLVM
-#include "mem.h"
-#else
-#if _WIN32
-#include "..\root\mem.h"
-#elif POSIX
-#include "../root/mem.h"
-#else
-#error "fix this"
-#endif
-#endif
-
-#include "id.h"
-#include "init.h"

a/dmd2/html.c

@@ -1 +1 @@
-
-6
+9
-// All Rights Reserved
-// written by Walter Bright
-// http://www.digitalmars.com
@@ -18 +18 @@
-#include <errno.h>
-#include <wchar.h>
-
-#include "mars.h"
-#include "html.h"
-
-#include <assert.h>
-#include "root.h"
-
+#if __GNUC__
+int memicmp(const char *s1, const char *s2, int n);
+#if 0
+{
+    int result = 0;
+
+    for (int i = 0; i < n; i++)
+    {   char c1 = s1[i];
+    char c2 = s2[i];
+
+    result = c1 - c2;
+    if (result)
+    {
+        if ('A' <= c1 && c1 <= 'Z')
+        c1 += 'a' - 'A';
+        if ('A' <= c2 && c2 <= 'Z')
+        c2 += 'a' - 'A';
+        result = c1 - c2;
+        if (result)
+        break;
+    }
+    }
+    return result;
+}
+#endif
+#endif
+
-extern int HtmlNamedEntity(unsigned char *p, int length);
-
-static int isLineSeparator(const unsigned char* p);
@@ -64 +89 @@
-
-void Html::error(const char *format, ...)
-{
-
-
-
+
-
-    va_list ap;
-    va_start(ap, format);
-    vprintf(format, ap);
-    va_end(ap);
-
-
-
-
+
+
-
-global.errors++
+exit(EXIT_FAILURE)
-}
-
-/**********************************************
@@ -156 +178 @@
-    break;
-    }
-    buf->writeByte(0);              // ending sentinel
+#if SCPP
+    //printf("Code is: '%s'\n", buf->toString() + 3);
+#endif
+#if MARS
-    //printf("D code is: '%s'\n", (char *)buf->data);
+#endif
-}
-
-/***********************************************
@@ -530 +557 @@
-         * right.
-         */
-        linnum++;
-UTF8
+Byte
-        p += lineSepLength;
-        continue;
-        }
@@ -550 +577 @@
-    }
-}
-
+
-/********************************************
- * Convert an HTML character entity into a character.
- * Forms are:
@@ -716 +744 @@
-    return 0;
-}
-
+

a/dmd2/html.h

@@ -1 +1 @@
-
-// Compiler implementation of the D programming language
-// Copyright (c) 1999-2006 by Digital Mars
-// All Rights Reserved
-// written by Walter Bright
-http://
+
-// License for redistribution is by either the Artistic License
-// in artistic.txt, or the GNU General Public License in gnu.txt.
-// See the included readme.txt for details.
-
-#ifndef DMD_HTML_H
-#define DMD_HTML_H 1
-
-struct OutBuffer;
-
-struct Html
@@ -39 +35 @@
-    int charEntity();
-    static int namedEntity(unsigned char *p, int length);
-};
-
-#endif

a/dmd2/idgen.c

@@ -60 +60 @@
-    { "typeinfo" },
-    { "outer" },
-    { "Exception" },
+    { "Throwable" },
-    { "withSym", "__withSym" },
-    { "result", "__result" },
-    { "returnLabel", "__returnLabel" },
@@ -87 +88 @@
-    { "TypeInfo_Tuple" },
-    { "TypeInfo_Const" },
-    { "TypeInfo_Invariant" },
+    { "TypeInfo_Shared" },
-    { "elements" },
-    { "_arguments_typeinfo" },
-    { "_arguments" },
@@ -252 +254 @@
-    { "main" },
-    { "WinMain" },
-    { "DllMain" },
+    { "tls_get_addr", "___tls_get_addr" },
-
-    // Builtin functions
-    { "std" },

a/dmd2/import.c

@@ -112 +112 @@
-    }
-    if (!pkg)
-    pkg = mod;
-    mod->semantic();
-
-    //printf("-Import::load('%s'), pkg = %p\n", toChars(), pkg);
-}
@@ -136 +135 @@
-    }
-#endif
-
+    // Modules need a list of each imported module
+    //printf("%s imports %s\n", sc->module->toChars(), mod->toChars());
+    sc->module->aimports.push(mod);
+
+    mod->semantic();
+
-    /* Default to private importing
-     */
-    protection = sc->protection;
@@ -147 +152 @@
-        sc->scopesym->importScope(mod, protection);
-    }
-
-    // Modules need a list of each imported module
-    sc->module->aimports.push(mod);
-
-    if (mod->needmoduleinfo)
-        sc->module->needmoduleinfo = 1;
-
@@ -224 +226 @@
-    //printf("%s.Import::search(ident = '%s', flags = x%x)\n", toChars(), ident->toChars(), flags);
-
-    if (!pkg)
-
+
+
+
-
-    // Forward it to the package/module
-    return pkg->search(loc, ident, flags);

a/dmd2/inifile.c

@@ -1 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

a/dmd2/inline.c

@@ -1382 +1382 @@
-    else
-        vthis->storage_class = STCin;
-#else
+    assert(0);
-    if (ethis->type->ty != Tclass && ethis->type->ty != Tpointer)
-    {
-        ethis = ethis->addressOf(NULL);

a/dmd2/interpret.c

@@ -1513 +1513 @@
-    }
-    }
-    /* Assignment to struct member of the form:
+     *   v.var = e2
+     */
+    else if (e1->op == TOKdotvar && ((DotVarExp *)e1)->e1->op == TOKvar)
+    {   VarExp *ve = (VarExp *)((DotVarExp *)e1)->e1;
+    VarDeclaration *v = ve->var->isVarDeclaration();
+
+    if (v->isDataseg())
+        return EXP_CANT_INTERPRET;
+    if (fp && !v->value)
+    {   error("variable %s is used before initialization", v->toChars());
+        return e;
+    }
+    Expression *vie = v->value;
+    if (vie->op == TOKvar)
+    {
+        Declaration *d = ((VarExp *)vie)->var;
+        vie = getVarExp(e1->loc, istate, d);
+    }
+    if (vie->op != TOKstructliteral)
+        return EXP_CANT_INTERPRET;
+    StructLiteralExp *se = (StructLiteralExp *)vie;
+    VarDeclaration *vf = ((DotVarExp *)e1)->var->isVarDeclaration();
+    if (!vf)
+        return EXP_CANT_INTERPRET;
+    int fieldi = se->getFieldIndex(type, vf->offset);
+    if (fieldi == -1)
+        return EXP_CANT_INTERPRET;
+    Expression *ev = se->getField(type, vf->offset);
+    if (fp)
+        e2 = (*fp)(type, ev, e2);
+    else
+        e2 = Cast(type, type, e2);
+    if (e2 == EXP_CANT_INTERPRET)
+        return e2;
+
+    if (!v->isParameter())
+    {
+        for (size_t i = 0; 1; i++)
+        {
+        if (i == istate->vars.dim)
+        {   istate->vars.push(v);
+            break;
+        }
+        if (v == (VarDeclaration *)istate->vars.data[i])
+            break;
+        }
+    }
+
+    /* Create new struct literal reflecting updated fieldi
+     */
+    Expressions *expsx = new Expressions();
+    expsx->setDim(se->elements->dim);
+    for (size_t j = 0; j < expsx->dim; j++)
+    {
+        if (j == fieldi)
+        expsx->data[j] = (void *)e2;
+        else
+        expsx->data[j] = se->elements->data[j];
+    }
+    v->value = new StructLiteralExp(se->loc, se->sd, expsx);
+    v->value->type = se->type;
+
+    e = Cast(type, type, post ? ev : e2);
+    }
+    /* Assignment to struct member of the form:
-     *   *(symoffexp) = e2
-     */
-    else if (e1->op == TOKstar && ((PtrExp *)e1)->e1->op == TOKsymoff)

a/dmd2/lexer.c

@@ -18 +18 @@
-#include <wchar.h>
-#include <stdlib.h>
-#include <assert.h>
+#if _MSC_VER
+#include <time.h>
+#else
-#include <sys/time.h>
+#endif
-#include <math.h>
-
-fdef IN_GCC
+nclude <time.h>
-
-
+
-#include "mem.h"
-
-#else
-
-#if __GNUC__
-#include <time.h>
-#endif
-
-#if IN_LLVM
-#include "mem.h"
-#elif _WIN32
-#include "..\root\mem.h"
-#else
-#include "../root/mem.h"
-#endif
-#endif
-
-#include "stringtable.h"
-
-#include "lexer.h"
@@ -54 +43 @@
-extern "C" char * __cdecl __locale_decpoint;
-#endif
-
+#if _MSC_VER // workaround VC++ bug, labels and types should be in separate namespaces
+#define Lstring Lstr
+#endif
+
-extern int HtmlNamedEntity(unsigned char *p, int length);
-
-#define LS 0x2028   // UTF line separator
@@ -403 +396 @@
-    return peek(&token)->value;
-}
-
+/***********************
+ * Look 2 tokens ahead at value.
+ */
+
+TOK Lexer::peekNext2()
+{
+    Token *t = peek(&token);
+    return peek(t)->value;
+}
+
-/*********************************
- * tk is on the opening (.
- * Look ahead and return token that is past the closing ).
@@ -599 +602 @@
-        case '"':
-        t->value = escapeStringConstant(t,0);
-        return;
-
+
-        case '\\':          // escaped string literal
-        {   unsigned c;
+        unsigned char *pstart = p;
-
-        stringbuffer.reset();
-        do
@@ -628 +632 @@
-        memcpy(t->ustring, stringbuffer.data, stringbuffer.offset);
-        t->postfix = 0;
-        t->value = TOKstring;
+        if (!global.params.useDeprecated)
+            error("Escape String literal %.*s is deprecated, use double quoted string literal \"%.*s\" instead", p - pstart, pstart, p - pstart, pstart);
-        return;
-        }
-
+
-        case 'l':
-        case 'L':
-#endif
@@ -1228 +1234 @@
- */
-
-unsigned Lexer::escapeSequence()
-
+
+
+
+
+
-    int n;
-    int ndigits;
-
-    c = *p;
-    switch (c)
-    {
-    case '\'':
@@ -1587 +1596 @@
-        else
-        {   delimright = c;
-        nest = 0;
+        if (isspace(c))
+            error("delimiter cannot be whitespace");
-        }
-    }
-    else
@@ -1608 +1619 @@
-        }
-        else if (c == delimright)
-        goto Ldone;
-
+ && hereid
-        {   Token t;
-        unsigned char *psave = p;
-        p--;
@@ -1717 +1728 @@
-    c = *p++;
-    switch (c)
-    {
+#if !( TEXTUAL_ASSEMBLY_OUT )
-        case '\\':
-        switch (*p)
-        {
@@ -1732 +1744 @@
-            break;
-        }
-        break;
-
+
-        case '\n':
-        loc.linnum++;
-        break;
@@ -1793 +1805 @@
-    c = *p++;
-    switch (c)
-    {
+#if ! TEXTUAL_ASSEMBLY_OUT
-    case '\\':
-        switch (*p)
-        {
@@ -1812 +1825 @@
-            break;
-        }
-        break;
-
+
-    case '\n':
-    L1:
-        loc.linnum++;

a/dmd2/lexer.h

@@ -278 +278 @@
-
-    TOK nextToken();
-    TOK peekNext();
+    TOK peekNext2();
-    void scan(Token *t);
-    Token *peek(Token *t);
-    Token *peekPastParen(Token *t);

a/dmd2/macro.c

@@ -16 +16 @@
-#include <ctype.h>
-#include <assert.h>
-
-#if IN_GCC || IN_LLVM
-#include "mem.h"
-
-
-
-
-
-
-
-
-
+
-
-#include "root.h"
-#include "macro.h"
-
-#define isidstart(c) (isalpha(c) || (c) == '_')

a/dmd2/man.c

@@ -1 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

a/dmd2/mangle.c

@@ -24 +24 @@
-#include "id.h"
-#include "module.h"
-
-
+ || TARGET_OSX
-char *cpp_mangle(Dsymbol *s);
-#endif
-
@@ -117 +117 @@
-            return ident->toChars();
-
-        case LINKcpp:
-TARGET_LINUX
+DMDV2 && (TARGET_LINUX || TARGET_OSX)
-            return cpp_mangle(this);
-#else
-            // Windows C++ mangling is done by C++ back end

a/dmd2/mars.c

@@ -59 +59 @@
-
-    copyright = "Copyright (c) 1999-2009 by Digital Mars and Tomas Lindquist Olsen";
-    written = "written by Walter Bright and Tomas Lindquist Olsen";
-1
+6
-    ldc_version = LDC_REV;
-    llvm_version = LLVM_REV;
-    global.structalign = 8;
@@ -105 +105 @@
-    va_end( ap );
-}
-
+void warning(Loc loc, const char *format, ...)
+{
+    if (global.params.warnings && !global.gag)
+    {
+    fprintf(stdmsg, "warning - ");
+    va_list ap;
+    va_start(ap, format);
+    verror(loc, format, ap);
+    va_end( ap );
+    }
+}
+
-void verror(Loc loc, const char *format, va_list ap)
-{
-    if (!global.gag)
@@ -116 +128 @@
-    mem.free(p);
-
-    fprintf(stdmsg, "Error: ");
+#if _MSC_VER
+    // MS doesn't recognize %zu format
+    OutBuffer tmp;
+    tmp.vprintf(format, ap);
+    fprintf(stdmsg, "%s", tmp.toChars());
+#else
-    vfprintf(stdmsg, format, ap);
+#endif
-    fprintf(stdmsg, "\n");
-    fflush(stdmsg);
-    }
@@ -136 +155 @@
-    exit(EXIT_FAILURE);
-}
-
-/**************************************
- * Try to stop forgetting to remove the breakpoints from
- * release builds.
- */
-void halt()
-{
-#ifdef DEBUG
-    *(char*)0=0;
-#endif
-}
-
-/***********************************
- * Parse and append contents of environment variable envvar
- * to argc and argv[].

a/dmd2/mars.h

@@ -1 +1 @@
-
-// Compiler implementation of the D programming language
-7
+9
-// All Rights Reserved
-// written by Walter Bright
-// http://www.digitalmars.com
@@ -13 +13 @@
-
-#ifdef __DMC__
-#pragma once
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-#include <stdint.h>
-#include <stdarg.h>
@@ -34 +76 @@
-#endif
-
-#define BREAKABI 1  // 0 if not ready to break the ABI just yet
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-struct Array;
-
@@ -67 +131 @@
-};
-
-// make it easier to test new linkage types
-
-
+Any
+Any
-
-// Put command line switches in here
-struct Param
@@ -338 +402 @@
-    MATCHexact      // exact match
-};
-
+void warning(Loc loc, const char *format, ...);
-void error(Loc loc, const char *format, ...);
-void verror(Loc loc, const char *format, va_list);
-void fatal();

a/dmd2/module.c

@@ -84 +84 @@
-#ifdef IN_GCC
-    strictlyneedmoduleinfo = 0;
-#endif
+    selfimports = 0;
-    insearch = 0;
-    searchCacheIdent = NULL;
-    searchCacheSymbol = NULL;
@@ -145 +146 @@
-    this->doHdrGen = doHdrGen;
-}
-
-onst char* path, const
+har* path,
-{
-    char *argobj;
-    if (forcename)
@@ -903 +904 @@
-    //printf("-Module::runDeferredSemantic('%s'), len = %d\n", toChars(), deferred.dim);
-}
-
+/************************************
+ * Recursively look at every module this module imports,
+ * return TRUE if it imports m.
+ * Can be used to detect circular imports.
+ */
+
+int Module::imports(Module *m)
+{
+    //printf("%s Module::imports(%s)\n", toChars(), m->toChars());
+    int aimports_dim = aimports.dim;
+#if 0
+    for (int i = 0; i < aimports.dim; i++)
+    {   Module *mi = (Module *)aimports.data[i];
+    printf("\t[%d] %s\n", i, mi->toChars());
+    }
+#endif
+    for (int i = 0; i < aimports.dim; i++)
+    {   Module *mi = (Module *)aimports.data[i];
+    if (mi == m)
+        return TRUE;
+    if (!mi->insearch)
+    {
+        mi->insearch = 1;
+        int r = mi->imports(m);
+        if (r)
+        return r;
+    }
+    }
+    return FALSE;
+}
+
+/*************************************
+ * Return !=0 if module imports itself.
+ */
+
+int Module::selfImports()
+{
+    //printf("Module::selfImports() %s\n", toChars());
+    if (!selfimports)
+    {
+    for (int i = 0; i < amodules.dim; i++)
+    {   Module *mi = (Module *)amodules.data[i];
+        //printf("\t[%d] %s\n", i, mi->toChars());
+        mi->insearch = 0;
+    }
+
+    selfimports = imports(this) + 1;
+
+    for (int i = 0; i < amodules.dim; i++)
+    {   Module *mi = (Module *)amodules.data[i];
+        //printf("\t[%d] %s\n", i, mi->toChars());
+        mi->insearch = 0;
+    }
+    }
+    return selfimports - 1;
+}
+
+
-/* =========================== ModuleDeclaration ===================== */
-
-ModuleDeclaration::ModuleDeclaration(Array *packages, Identifier *id, bool safe)

a/dmd2/module.h

@@ -30 +30 @@
-#if IN_LLVM
-struct DValue;
-typedef DValue elem;
+namespace llvm { class Module; }
-#else
-#ifdef IN_GCC
-union tree_node; typedef union tree_node elem;
@@ -79 +80 @@
-    int strictlyneedmoduleinfo;
-#endif
-
+    int selfimports;        // 0: don't know, 1: does not, 2: does
+    int selfImports();      // returns !=0 if module imports itself
+
-    int insearch;
-    Identifier *searchCacheIdent;
-    Dsymbol *searchCacheSymbol; // cached value of search
@@ -143 +147 @@
-    void deleteObjFile();
-    void addDeferredSemantic(Dsymbol *s);
-    void runDeferredSemantic();
+    int imports(Module *m);
-
-    // Back end
-
@@ -172 +177 @@
-    void genmoduleinfo();
-
-    // LDC
+    llvm::Module* genLLVMModule(int multiobj);
-    void buildTargetFiles();
-onst char* path, const
+har* path,
-    Module *isModule() { return this; }
-    
-    bool llvmForceLogging;

a/dmd2/mtype.c

@@ -1 +1 @@
-
-// Compiler implementation of the D programming language
-8
+9
-// All Rights Reserved
-// written by Walter Bright
-// http://www.digitalmars.com
@@ -106 +106 @@
-ClassDeclaration *Type::typeinfotypelist;
-ClassDeclaration *Type::typeinfoconst;
-ClassDeclaration *Type::typeinfoinvariant;
+ClassDeclaration *Type::typeinfoshared;
-
-Type *Type::tvoidptr;
-Type *Type::basic[TMAX];
@@ -122 +123 @@
-#if DMDV2
-    this->cto = NULL;
-    this->ito = NULL;
+    this->sto = NULL;
+    this->scto = NULL;
-#endif
-    this->pto = NULL;
-    this->rto = NULL;
@@ -327 +330 @@
-    return MATCHnomatch;
-}
-
+/********************************
+ * Convert to 'const'.
+ */
+
-Type *Type::constOf()
-{
+#if 0
-    //printf("Type::constOf() %p %s\n", this, toChars());
-    if (isConst())
-    return this;
@@ -342 +350 @@
-    //if (t->nextOf()) assert(t->nextOf()->isConst());
-    //printf("-Type::constOf() %p %s\n", t, toChars());
-    return t;
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-Type *Type::invariantOf()
-{
+#if 0
-    //printf("Type::invariantOf() %p %s\n", this, toChars());
-    if (isInvariant())
-    {
@@ -370 +397 @@
-#endif
-    //printf("\t%p\n", t);
-    return t;
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-Type *Type::mutableOf()
-{
+#if 0
-    //printf("Type::mutableOf() %p, %s\n", this, toChars());
-    Type *t = this;
-    if (isConst())
@@ -396 +445 @@
-    t->rto = NULL;
-    t->cto = NULL;
-    t->ito = NULL;
+    t->sto = NULL;
+    t->scto = NULL;
-    t->vtinfo = NULL;
-    if (ty == Tsarray)
-    {   TypeSArray *ta = (TypeSArray *)t;
@@ -416 +467 @@
-    }
-    }
-    return t;
+#else
+    //printf("Type::mutableOf() %p, %s\n", this, toChars());
+    Type *t = this;
+    if (isConst())
+    {   if (isShared())
+        t = sto;        // shared const => shared
+    else
+        t = cto;
+    assert(!t || t->isMutable());
+    }
+    else if (isInvariant())
+    {   t = ito;
+    assert(!t || (t->isMutable() && !t->isShared()));
+    }
+    if (!t)
+    {
+    unsigned sz = sizeTy[ty];
+    t = (Type *)mem.malloc(sz);
+    memcpy(t, this, sz);
+    t->mod = 0;
+    t->deco = NULL;
+    t->arrayof = NULL;
+    t->pto = NULL;
+    t->rto = NULL;
+    t->cto = NULL;
+    t->ito = NULL;
+    t->sto = NULL;
+    t->scto = NULL;
+    t->vtinfo = NULL;
+    t = t->merge();
+
+    t->fixTo(this);
+
+    switch (mod)
+    {
+        case MODconst:
+        t->cto = this;
+        break;
+
+        case MODinvariant:
+        t->ito = this;
+        break;
+
+        case MODshared:
+        t->sto = this;
+        break;
+
+        case MODshared | MODconst:
+        t->scto = this;
+        break;
+
+        default:
+        assert(0);
+    }
+    }
+    return t;
+#endif
+}
+
+Type *Type::sharedOf()
+{
+    //printf("Type::sharedOf() %p, %s\n", this, toChars());
+    if (mod == MODshared)
+    {
+    return this;
+    }
+    if (sto)
+    {
+    assert(sto->isShared());
+    return sto;
+    }
+    Type *t = makeShared();
+    t = t->merge();
+    t->fixTo(this);
+    //printf("\t%p\n", t);
+    return t;
+}
+
+Type *Type::sharedConstOf()
+{
+    //printf("Type::sharedConstOf() %p, %s\n", this, toChars());
+    if (mod == (MODshared | MODconst))
+    {
+    return this;
+    }
+    if (scto)
+    {
+    assert(scto->mod == (MODshared | MODconst));
+    return scto;
+    }
+    Type *t = makeSharedConst();
+    t = t->merge();
+    t->fixTo(this);
+    //printf("\t%p\n", t);
+    return t;
+}
+
+
+/**********************************
+ * For our new type 'this', which is type-constructed from t,
+ * fill in the cto, ito, sto, scto shortcuts.
+ */
+
+void Type::fixTo(Type *t)
+{
+    ito = t->ito;
+#if 0
+    /* Cannot do these because these are not fully transitive:
+     * there can be a shared ptr to immutable, for example.
+     * Immutable subtypes are always immutable, though.
+     */
+    cto = t->cto;
+    sto = t->sto;
+    scto = t->scto;
+#endif
+
+    assert(mod != t->mod);
+#define X(m, n) (((m) << 3) | (n))
+    switch (X(mod, t->mod))
+    {
+    case X(0, MODconst):
+        cto = t;
+        break;
+
+    case X(0, MODinvariant):
+        ito = t;
+        break;
+
+    case X(0, MODshared):
+        sto = t;
+        break;
+
+    case X(0, MODshared | MODconst):
+        scto = t;
+        break;
+
+
+    case X(MODconst, 0):
+        cto = NULL;
+        goto L2;
+
+    case X(MODconst, MODinvariant):
+        ito = t;
+        goto L2;
+
+    case X(MODconst, MODshared):
+        sto = t;
+        goto L2;
+
+    case X(MODconst, MODshared | MODconst):
+        scto = t;
+    L2:
+        t->cto = this;
+        break;
+
+
+    case X(MODinvariant, 0):
+        ito = NULL;
+        goto L3;
+
+    case X(MODinvariant, MODconst):
+        cto = t;
+        goto L3;
+
+    case X(MODinvariant, MODshared):
+        sto = t;
+        goto L3;
+
+    case X(MODinvariant, MODshared | MODconst):
+        scto = t;
+    L3:
+        t->ito = this;
+        if (t->cto) t->cto->ito = this;
+        if (t->sto) t->sto->ito = this;
+        if (t->scto) t->scto->ito = this;
+        break;
+
+
+    case X(MODshared, 0):
+        sto = NULL;
+        goto L4;
+
+    case X(MODshared, MODconst):
+        cto = t;
+        goto L4;
+
+    case X(MODshared, MODinvariant):
+        ito = t;
+        goto L4;
+
+    case X(MODshared, MODshared | MODconst):
+        scto = t;
+    L4:
+        t->sto = this;
+        break;
+
+
+    case X(MODshared | MODconst, 0):
+        scto = NULL;
+        break;
+
+    case X(MODshared | MODconst, MODconst):
+        cto = t;
+        break;
+
+    case X(MODshared | MODconst, MODinvariant):
+        ito = t;
+        break;
+
+    case X(MODshared | MODconst, MODshared):
+        sto = t;
+    L5:
+        t->scto = this;
+        break;
+
+    default:
+        assert(0);
+    }
+#undef X
+
+    check();
+    t->check();
+    //printf("fixTo: %s, %s\n", toChars(), t->toChars());
+}
+
+/***************************
+ * Look for bugs in constructing types.
+ */
+
+void Type::check()
+{
+    switch (mod)
+    {
+    case 0:
+        if (cto) assert(cto->mod == MODconst);
+        if (ito) assert(ito->mod == MODinvariant);
+        if (sto) assert(sto->mod == MODshared);
+        if (scto) assert(scto->mod == (MODshared | MODconst));
+        break;
+
+    case MODconst:
+        if (cto) assert(cto->mod == 0);
+        if (ito) assert(ito->mod == MODinvariant);
+        if (sto) assert(sto->mod == MODshared);
+        if (scto) assert(scto->mod == (MODshared | MODconst));
+        break;
+
+    case MODinvariant:
+        if (cto) assert(cto->mod == MODconst);
+        if (ito) assert(ito->mod == 0);
+        if (sto) assert(sto->mod == MODshared);
+        if (scto) assert(scto->mod == (MODshared | MODconst));
+        break;
+
+    case MODshared:
+        if (cto) assert(cto->mod == MODconst);
+        if (ito) assert(ito->mod == MODinvariant);
+        if (sto) assert(sto->mod == 0);
+        if (scto) assert(scto->mod == (MODshared | MODconst));
+        break;
+
+    case MODshared | MODconst:
+        if (cto) assert(cto->mod == MODconst);
+        if (ito) assert(ito->mod == MODinvariant);
+        if (sto) assert(sto->mod == MODshared);
+        if (scto) assert(scto->mod == 0);
+        break;
+
+    default:
+        assert(0);
+    }
+
+    Type *tn = nextOf();
+    if (tn && ty != Tfunction && ty != Tdelegate)
+    {   // Verify transitivity
+    switch (mod)
+    {
+        case 0:
+        break;
+
+        case MODconst:
+        assert(tn->mod & MODinvariant || tn->mod & MODconst);
+        break;
+
+        case MODinvariant:
+        assert(tn->mod == MODinvariant);
+        break;
+
+        case MODshared:
+        assert(tn->mod & MODinvariant || tn->mod & MODshared);
+        break;
+
+        case MODshared | MODconst:
+        assert(tn->mod & MODinvariant || tn->mod & (MODshared | MODconst));
+        break;
+
+        default:
+        assert(0);
+    }
+    tn->check();
+    }
-}
-
-Type *Type::makeConst()
@@ -433 +785 @@
-    t->rto = NULL;
-    t->cto = NULL;
-    t->ito = NULL;
+    t->sto = NULL;
+    t->scto = NULL;
-    t->vtinfo = NULL;
-    //printf("-Type::makeConst() %p, %s\n", t, toChars());
-    return t;
@@ -452 +806 @@
-    t->rto = NULL;
-    t->cto = NULL;
-    t->ito = NULL;
+    t->sto = NULL;
+    t->scto = NULL;
-    t->vtinfo = NULL;
-    return t;
-}
-
+Type *Type::makeShared()
+{
+    if (sto)
+    return sto;
+    unsigned sz = sizeTy[ty];
+    Type *t = (Type *)mem.malloc(sz);
+    memcpy(t, this, sz);
+    t->mod = MODshared;
+    t->deco = NULL;
+    t->arrayof = NULL;
+    t->pto = NULL;
+    t->rto = NULL;
+    t->cto = NULL;
+    t->ito = NULL;
+    t->sto = NULL;
+    t->scto = NULL;
+    t->vtinfo = NULL;
+    return t;
+}
+
+Type *Type::makeSharedConst()
+{
+    if (scto)
+    return scto;
+    unsigned sz = sizeTy[ty];
+    Type *t = (Type *)mem.malloc(sz);
+    memcpy(t, this, sz);
+    t->mod = MODshared | MODconst;
+    t->deco = NULL;
+    t->arrayof = NULL;
+    t->pto = NULL;
+    t->rto = NULL;
+    t->cto = NULL;
+    t->ito = NULL;
+    t->sto = NULL;
+    t->scto = NULL;
+    t->vtinfo = NULL;
+    return t;
+}
+
+/************************************
+ * Apply MODxxxx bits to existing type.
+ */
+
+Type *Type::castMod(unsigned mod)
+{   Type *t;
+
+    switch (mod)
+    {
+    case 0:
+        t = mutableOf();
+        break;
+
+    case MODconst:
+        t = constOf();
+        break;
+
+    case MODinvariant:
+        t = invariantOf();
+        break;
+
+    case MODshared:
+        t = sharedOf();
+        break;
+
+    case MODshared | MODconst:
+        t = sharedConstOf();
+        break;
+
+    default:
+        assert(0);
+    }
+    return t;
+}
+
+/************************************
+ * Add MODxxxx bits to existing type.
+ * We're adding, not replacing, so adding const to
+ * a shared type => "shared const"
+ */
+
+Type *Type::addMod(unsigned mod)
+{   Type *t = this;
+
+    /* Add anything to immutable, and it remains immutable
+     */
+    if (!t->isInvariant())
+    {
+    switch (mod)
+    {
+        case 0:
+        break;
+
+        case MODconst:
+        if (isShared())
+            t = sharedConstOf();
+        else
+            t = constOf();
+        break;
+
+        case MODinvariant:
+        t = invariantOf();
+        break;
+
+        case MODshared:
+        if (isConst())
+            t = sharedConstOf();
+        else
+            t = sharedOf();
+        break;
+
+        case MODshared | MODconst:
+        t = sharedConstOf();
+        break;
+
+        default:
+        assert(0);
+    }
+    }
+    return t;
+}
+
+/************************************
+ * Add storage class modifiers to type.
+ */
+
+Type *Type::addStorageClass(unsigned stc)
+{
+    /* Just translate to MOD bits and let addMod() do the work
+     */
+    unsigned mod = 0;
+
+    if (stc & STCinvariant)
+    mod = MODinvariant;
+    else
+    {   if (stc & (STCconst | STCin))
+        mod = MODconst;
+    if (stc & STCshared)
+        mod |= MODshared;
+    }
+    return addMod(mod);
+}
+
-/**************************
- * Return type with the top level of it being mutable.
- */
@@ -585 +1084 @@
-        p = "const(";
-        goto L1;
-        case MODinvariant:
-nvariant
+mmutable
-        L1: buf->writestring(p);
-        toCBuffer2(buf, hgs, this->mod);
-        buf->writeByte(')');
@@ -896 +1395 @@
-    va_end( ap );
-}
-
+void Type::warning(Loc loc, const char *format, ...)
+{
+    if (global.params.warnings && !global.gag)
+    {
+    fprintf(stdmsg, "warning - ");
+    va_list ap;
+    va_start(ap, format);
+    ::verror(loc, format, ap);
+    va_end( ap );
+    }
+}
+
-Identifier *Type::getTypeInfoIdent(int internal)
-{
-    // _init_10TypeInfo_%s
@@ -1016 +1527 @@
-{
-    //printf("TypeNext::makeConst() %p, %s\n", this, toChars());
-    if (cto)
+    {   assert(cto->mod == MODconst);
-    return cto;
+    }
-    TypeNext *t = (TypeNext *)Type::makeConst();
-    if (ty != Tfunction && ty != Tdelegate && next->deco &&
-
-
+
+
+
+
+
+
-    //printf("TypeNext::makeConst() returns %p, %s\n", t, t->toChars());
-    return t;
-}
@@ -1033 +1550 @@
-    return ito;
-    }
-    TypeNext *t = (TypeNext *)Type::makeInvariant();
-
+
+
-    {   t->next = next->invariantOf();
-    }
-    return t;
-}
-
+Type *TypeNext::makeShared()
+{
+    //printf("TypeNext::makeShared() %s\n", toChars());
+    if (sto)
+    {   assert(sto->mod == MODshared);
+    return sto;
+    }
+    TypeNext *t = (TypeNext *)Type::makeShared();
+    if (ty != Tfunction && ty != Tdelegate && next->deco &&
+        !next->isInvariant() && !next->isShared())
+    {
+    if (next->isConst())
+        t->next = next->sharedConstOf();
+    else
+        t->next = next->sharedOf();
+    }
+    //printf("TypeNext::makeShared() returns %p, %s\n", t, t->toChars());
+    return t;
+}
+
+Type *TypeNext::makeSharedConst()
+{
+    //printf("TypeNext::makeSharedConst() %s\n", toChars());
+    if (scto)
+    {   assert(scto->mod == (MODshared | MODconst));
+    return scto;
+    }
+    TypeNext *t = (TypeNext *)Type::makeSharedConst();
+    if (ty != Tfunction && ty != Tdelegate && next->deco &&
+        !next->isInvariant() && !next->isSharedConst())
+    {
+    t->next = next->sharedConstOf();
+    }
+    //printf("TypeNext::makeSharedConst() returns %p, %s\n", t, t->toChars());
+    return t;
+}
+
-MATCH TypeNext::constConv(Type *to)
-{   MATCH m = Type::constConv(to);
-
@@ -1049 +1604 @@
-}
-
-
+void TypeNext::transitive()
+{
+    /* Invoke transitivity of type attributes
+     */
+    next = next->addMod(mod);
+}
+
-/* ============================= TypeBasic =========================== */
-
-TypeBasic::TypeBasic(TY ty)
@@ -1235 +1797 @@
-    if (ty == Tvoid)
-        return 1;
-    return getABITypeAlign(DtoType(this));
+#if TARGET_OSX
+        sz = 16;
+#else
+#endif
-}
-
-
@@ -1869 +2435 @@
-    if (ident == Id::idup)
-    {   Type *einv = next->invariantOf();
-        if (next->implicitConvTo(einv) < MATCHconst)
-nvariant
+mmutable
-        e->type = einv->arrayOf();
-    }
-    else
@@ -2095 +2661 @@
-    }
-
-    next = next->semantic(loc,sc);
-
-
-
-
+
-
-    Type *tbn = next->toBasetype();
-
@@ -2164 +2727 @@
-        Argument *arg = (Argument *)tt->arguments->data[(size_t)d];
-        return arg->type;
-    }
+    case Tstruct:
+    {   TypeStruct *ts = (TypeStruct *)tbn;
+        if (ts->sym->isnested)
+        error(loc, "cannot have array of inner structs %s", ts->toChars());
+        break;
+    }
-    case Tfunction:
-    case Tnone:
-        error(loc, "can't have array of %s", tbn->toChars());
@@ -2375 +2944 @@
-        error(loc, "can't have array of %s", tbn->toChars());
-        tn = next = tint32;
-        break;
+    case Tstruct:
+    {   TypeStruct *ts = (TypeStruct *)tbn;
+        if (ts->sym->isnested)
+        error(loc, "cannot have array of inner structs %s", ts->toChars());
+        break;
+    }
-    }
-    if (tn->isauto())
-    error(loc, "cannot have array of auto %s", tn->toChars());
-
-    if (mod == MODconst && !tn->isInvariant())
-    tn = tn->constOf();
-    else if (mod == MODinvariant)
-    tn = tn->invariantOf();
-
-    next = tn;
+    transitive();
-    return merge();
-}
-
@@ -2585 +3156 @@
-    if (index->nextOf() && !index->nextOf()->isInvariant())
-    {
-    index = index->constOf()->mutableOf();
+#if 0
+printf("index is %p %s\n", index, index->toChars());
+index->check();
+printf("index->mod = x%x\n", index->mod);
+printf("index->ito = x%x\n", index->ito);
+if (index->ito) {
+printf("index->ito->mod = x%x\n", index->ito->mod);
+printf("index->ito->ito = x%x\n", index->ito->ito);
+}
+#endif
-    }
-
-    switch (index->toBasetype()->ty)
@@ -2597 +3178 @@
-        break;
-    }
-    next = next->semantic(loc,sc);
-
-
-
-
+
-
-    switch (next->toBasetype()->ty)
-    {
@@ -2865 +3443 @@
-    if (n != next)
-    deco = NULL;
-    next = n;
-
-
-