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;
-
-
-
-
+
-    return merge();
-}
-
@@ -2981 +3556 @@
-    if (n != next)
-    deco = NULL;
-    next = n;
-
-
-
-
+
-    return merge();
-}
-
@@ -3046 +3618 @@
-    this->ispure = false;
-    this->isref = false;
-
-    // LDC
-    this->fty = NULL;
-}
-
-Type *TypeFunction::syntaxCopy()
@@ -3229 +3799 @@
-
-void TypeFunction::toCBuffer(OutBuffer *buf, Identifier *ident, HdrGenState *hgs)
-{
- %s\n", this, toChars()
+\n", this
-    const char *p = NULL;
-
-    if (inuse)
@@ -3243 +3813 @@
-    if (mod & MODconst)
-    buf->writestring("const ");
-    if (mod & MODinvariant)
-nvariant
+mmutable
-    if (mod & MODshared)
-    buf->writestring("shared ");
-
@@ -3286 +3856 @@
-
-void TypeFunction::toCBuffer2(OutBuffer *buf, HdrGenState *hgs, int mod)
-{
- %s\n", this, toChars()
+, ref = %d\n", this, isref
-    const char *p = NULL;
-
-    if (inuse)
@@ -3348 +3918 @@
-    return this;
-    }
-    //printf("TypeFunction::semantic() this = %p\n", this);
+    //printf("TypeFunction::semantic() %s, sc->stc = %x\n", toChars(), sc->stc);
-
-    TypeFunction *tf = (TypeFunction *)mem.malloc(sizeof(TypeFunction));
-    memcpy(tf, this, sizeof(TypeFunction));
@@ -3388 +3959 @@
-    tf->next = Type::terror;
-    }
-    if (tf->next->isauto() && !(sc->flags & SCOPEctor))
-auto
+scope
-
-    if (tf->parameters)
-    {   size_t dim = Argument::dim(tf->parameters);
@@ -3400 +3971 @@
-        arg->type = arg->type->semantic(loc,sc);
-        if (tf->inuse == 1) tf->inuse--;
-
-
-
-
-
-
-
-
+
-
-        if (arg->storageClass & (STCauto | STCalias | STCstatic))
-        {
@@ -4050 +4615 @@
-    //printf("TypeIdentifier::resolve(sc = %p, idents = '%s')\n", sc, toChars());
-    s = sc->search(loc, ident, &scopesym);
-    resolveHelper(loc, sc, s, scopesym, pe, pt, ps);
-
-
-
-
-
-
-
+
+
-}
-
-/*****************************************
@@ -4106 +4666 @@
-        if (tt->sym->sem == 1)
-        error(loc, "circular reference of typedef %s", tt->toChars());
-    }
-
-
-
-
+
-    }
-    else
-    {
@@ -4200 +4757 @@
-    if (s)
-    s->semantic(sc);
-    resolveHelper(loc, sc, s, NULL, pe, pt, ps);
-
-
-
-
-
-
-
+
+
-    //printf("pt = '%s'\n", (*pt)->toChars());
-}
-
@@ -4246 +4798 @@
-    return t;
-}
-
+Dsymbol *TypeInstance::toDsymbol(Scope *sc)
+{
+    Type *t;
+    Expression *e;
+    Dsymbol *s;
+
+    //printf("TypeInstance::semantic(%s)\n", toChars());
+
+    if (sc->parameterSpecialization)
+    {
+    unsigned errors = global.errors;
+    global.gag++;
+
+    resolve(loc, sc, &e, &t, &s);
+
+    global.gag--;
+    if (errors != global.errors)
+    {   if (global.gag == 0)
+        global.errors = errors;
+        return NULL;
+    }
+    }
+    else
+    resolve(loc, sc, &e, &t, &s);
+
+    return s;
+}
+
-
-/***************************** TypeTypeof *****************************/
-
@@ -4257 +4837 @@
-
-Type *TypeTypeof::syntaxCopy()
-{
+    //printf("TypeTypeof::syntaxCopy() %s\n", toChars());
-    TypeTypeof *t;
-
-    t = new TypeTypeof(loc, exp->syntaxCopy());
@@ -4434 +5015 @@
-    goto Lerr;
-    }
-    t = sc->func->type->nextOf();
-
-
-
-
-
+
-
-    if (idents.dim)
-    {
@@ -4572 +5149 @@
-    Dsymbol *s = sym->search(e->loc, ident, 0);
-    if (!s)
-    {
-
+
+
+
+
+
+
+
+
+
+
-    }
-    EnumMember *m = s->isEnumMember();
-    Expression *em = m->value->copy();
@@ -4839 +5425 @@
-    sym->inuse = 1;
-    Type *t = sym->basetype->toBasetype();
-    sym->inuse = 0;
-
-
-
-
+
-    return t;
-}
-
@@ -5008 +5591 @@
-Expression *TypeStruct::dotExp(Scope *sc, Expression *e, Identifier *ident)
-{   unsigned offset;
-
-    Expression *b;
-    VarDeclaration *v;
-    Dsymbol *s;
-    DotVarExp *de;
@@ -5143 +5725 @@
-    return de;
-    }
-
+    Import *timp = s->isImport();
+    if (timp)
+    {
+    e = new DsymbolExp(e->loc, s, 0);
+    e = e->semantic(sc);
+    return e;
+    }
+
+    OverloadSet *o = s->isOverloadSet();
+    if (o)
+    {   /* We really should allow this, triggered by:
+     *   template c()
+     *   {
+     *  void a();
+     *  void b () { this.a(); }
+     *   }
+     *   struct S
+     *   {
+     *  mixin c;
+     *  mixin c;
+     *  }
+     *  alias S e;
+     */
+    error(e->loc, "overload set for %s.%s not allowed in struct declaration", e->toChars(), ident->toChars());
+    return new IntegerExp(0);
+    }
+
-    d = s->isDeclaration();
-#ifdef DEBUG
-    if (!d)
@@ -5189 +5798 @@
-    accessCheck(e->loc, sc, e, d);
-
-// LDC we don't want dot exprs turned into pointer arithmetic. it complicates things for no apparent gain
-ndef IN_LLVM
-
+ 0
+Expression *
-    b->type = e->type->pointerTo();
-    b = new AddExp(e->loc, b, new IntegerExp(e->loc, v->offset, Type::tint32));
-    b->type = v->type->pointerTo();
-    b = new PtrExp(e->loc, b);
-
-
-
-
-
+
-    return b;
-#endif
-    }
@@ -5257 +5862 @@
-    for (size_t i = 0; i < s->fields.dim; i++)
-    {
-    Dsymbol *sm = (Dsymbol *)s->fields.data[i];
-
+
+
-        return TRUE;
-    }
-    return FALSE;
@@ -5283 +5889 @@
-            assert(v && v->storage_class & STCfield);
-
-            // 'from' type
-
-
-
-
-
+
-
-            // 'to' type
-
-
-
-
-
-
-
+
-
-            //printf("\t%s => %s, match = %d\n", v->type->toChars(), tv->toChars(), tvf->implicitConvTo(tv));
-            if (tvf->implicitConvTo(tv) < MATCHconst)
@@ -5641 +6237 @@
-    return de;
-    }
-
+    OverloadSet *o = s->isOverloadSet();
+    if (o)
+    {   /* We really should allow this
+     */
+    error(e->loc, "overload set for %s.%s not allowed in struct declaration", e->toChars(), ident->toChars());
+    return new IntegerExp(0);
+    }
+
-    Declaration *d = s->isDeclaration();
-    if (!d)
-    {
@@ -5990 +6594 @@
-{
-    //printf("TypeSlice::semantic() %s\n", toChars());
-    next = next->semantic(loc, sc);
-
-
-
-
+
-    //printf("next: %s\n", next->toChars());
-
-    Type *tbn = next->toBasetype();
@@ -6204 +6805 @@
-        if (arg->storageClass & STCconst)
-        buf->writestring("const ");
-        if (arg->storageClass & STCinvariant)
-nvariant
+mmutable
-        if (arg->storageClass & STCshared)
-        buf->writestring("shared ");
-

a/dmd2/mtype.h

@@ -23 +23 @@
-
-// llvm
-#include "../ir/irtype.h"
+#include "../ir/irfuncty.h"
-namespace llvm { class Type; }
-struct IrFuncTy;
-
-struct Scope;
-struct Identifier;
@@ -116 +116 @@
-{
-    TY ty;
-    unsigned char mod;  // modifiers MODxxxx
+    /* pick this order of numbers so switch statements work better
+     */
-    #define MODconst     1  // type is const
-2
-4
+4
+2
-    char *deco;
+
+    /* Note that there is no "shared immutable", because that is just immutable
+     */
+
-    Type *cto;      // MODconst ? mutable version of this type : const version
-    Type *ito;      // MODinvariant ? mutable version of this type : invariant version
+    Type *sto;      // MODshared ? mutable version of this type : shared mutable version
+    Type *scto;     // MODshared|MODconst ? mutable version of this type : shared const version
+
-    Type *pto;      // merged pointer to this type
-    Type *rto;      // reference to this type
-    Type *arrayof;  // array of this type
@@ -183 +192 @@
-    static ClassDeclaration *typeinfotypelist;
-    static ClassDeclaration *typeinfoconst;
-    static ClassDeclaration *typeinfoinvariant;
+    static ClassDeclaration *typeinfoshared;
-
-    static Type *basic[TMAX];
-    static unsigned char mangleChar[TMAX];
@@ -215 +225 @@
-    virtual void toCBuffer(OutBuffer *buf, Identifier *ident, HdrGenState *hgs);
-    virtual void toCBuffer2(OutBuffer *buf, HdrGenState *hgs, int mod);
-    void toCBuffer3(OutBuffer *buf, HdrGenState *hgs, int mod);
-
+ || TARGET_OSX
-    virtual void toCppMangle(OutBuffer *buf, CppMangleState *cms);
-#endif
-    virtual int isintegral();
@@ -234 +244 @@
-    int isInvariant()   { return mod & MODinvariant; }
-    int isMutable() { return !(mod & (MODconst | MODinvariant)); }
-    int isShared()  { return mod & MODshared; }
+    int isSharedConst() { return mod == (MODshared | MODconst); }
-    Type *constOf();
-    Type *invariantOf();
-    Type *mutableOf();
+    Type *sharedOf();
+    Type *sharedConstOf();
+    void fixTo(Type *t);
+    void check();
+    Type *castMod(unsigned mod);
+    Type *addMod(unsigned mod);
+    Type *addStorageClass(unsigned stc);
-    Type *pointerTo();
-    Type *referenceTo();
-    Type *arrayOf();
-    virtual Type *makeConst();
-    virtual Type *makeInvariant();
+    virtual Type *makeShared();
+    virtual Type *makeSharedConst();
-    virtual Dsymbol *toDsymbol(Scope *sc);
-    virtual Type *toBasetype();
-    virtual Type *toHeadMutable();
@@ -268 +288 @@
-    virtual Type *nextOf();
-
-    static void error(Loc loc, const char *format, ...);
+    static void warning(Loc loc, const char *format, ...);
-
-    // For backend
-    virtual unsigned totym();
@@ -293 +314 @@
-    Type *nextOf();
-    Type *makeConst();
-    Type *makeInvariant();
+    Type *makeShared();
+    Type *makeSharedConst();
-    MATCH constConv(Type *to);
+    void transitive();
-};
-
-struct TypeBasic : Type
@@ -309 +333 @@
-    Expression *dotExp(Scope *sc, Expression *e, Identifier *ident);
-    char *toChars();
-    void toCBuffer2(OutBuffer *buf, HdrGenState *hgs, int mod);
-
+ || TARGET_OSX
-    void toCppMangle(OutBuffer *buf, CppMangleState *cms);
-#endif
-    int isintegral();
@@ -361 +385 @@
-    TypeInfoDeclaration *getTypeInfoDeclaration();
-    Expression *toExpression();
-    int hasPointers();
-
+ || TARGET_OSX
-    void toCppMangle(OutBuffer *buf, CppMangleState *cms);
-#endif
-
@@ -386 +410 @@
-    MATCH implicitConvTo(Type *to);
-    Expression *defaultInit(Loc loc);
-    int builtinTypeInfo();
+    MATCH deduceType(Scope *sc, Type *tparam, TemplateParameters *parameters, Objects *dedtypes);
-    TypeInfoDeclaration *getTypeInfoDeclaration();
-    int hasPointers();
-
+ || TARGET_OSX
-    void toCppMangle(OutBuffer *buf, CppMangleState *cms);
-#endif
-
@@ -415 +440 @@
-    int hasPointers();
-    MATCH implicitConvTo(Type *to);
-    MATCH constConv(Type *to);
-
+ || TARGET_OSX
-    void toCppMangle(OutBuffer *buf, CppMangleState *cms);
-#endif
-
@@ -440 +465 @@
-    int isZeroInit();
-    TypeInfoDeclaration *getTypeInfoDeclaration();
-    int hasPointers();
-
+ || TARGET_OSX
-    void toCppMangle(OutBuffer *buf, CppMangleState *cms);
-#endif
-
@@ -457 +482 @@
-    Expression *dotExp(Scope *sc, Expression *e, Identifier *ident);
-    Expression *defaultInit(Loc loc);
-    int isZeroInit();
-
+ || TARGET_OSX
-    void toCppMangle(OutBuffer *buf, CppMangleState *cms);
-#endif
-};
@@ -491 +516 @@
-    MATCH deduceType(Scope *sc, Type *tparam, TemplateParameters *parameters, Objects *dedtypes);
-    TypeInfoDeclaration *getTypeInfoDeclaration();
-    Type *reliesOnTident();
-
+ || TARGET_OSX
-    void toCppMangle(OutBuffer *buf, CppMangleState *cms);
-#endif
-    bool parameterEscapes(Argument *p);
@@ -503 +528 @@
-    unsigned totym();
-
-    // LDC
-*
+
-};
-
-struct TypeDelegate : TypeNext
@@ -522 +547 @@
-    TypeInfoDeclaration *getTypeInfoDeclaration();
-    Expression *dotExp(Scope *sc, Expression *e, Identifier *ident);
-    int hasPointers();
-
+ || TARGET_OSX
-    void toCppMangle(OutBuffer *buf, CppMangleState *cms);
-#endif
-
@@ -573 +598 @@
-    void toCBuffer2(OutBuffer *buf, HdrGenState *hgs, int mod);
-    void resolve(Loc loc, Scope *sc, Expression **pe, Type **pt, Dsymbol **ps);
-    Type *semantic(Loc loc, Scope *sc);
+    Dsymbol *toDsymbol(Scope *sc);
-    MATCH deduceType(Scope *sc, Type *tparam, TemplateParameters *parameters, Objects *dedtypes);
-};
-
@@ -623 +649 @@
-    MATCH implicitConvTo(Type *to);
-    MATCH constConv(Type *to);
-    Type *toHeadMutable();
-
+ || TARGET_OSX
-    void toCppMangle(OutBuffer *buf, CppMangleState *cms);
-#endif
-
@@ -662 +688 @@
-    MATCH deduceType(Scope *sc, Type *tparam, TemplateParameters *parameters, Objects *dedtypes);
-    TypeInfoDeclaration *getTypeInfoDeclaration();
-    int hasPointers();
-
+ || TARGET_OSX
-    void toCppMangle(OutBuffer *buf, CppMangleState *cms);
-#endif
-
@@ -704 +730 @@
-    TypeInfoDeclaration *getTypeInfoDeclaration();
-    int hasPointers();
-    Type *toHeadMutable();
-
+ || TARGET_OSX
-    void toCppMangle(OutBuffer *buf, CppMangleState *cms);
-#endif
-
@@ -737 +763 @@
-    int hasPointers();
-    Type *toHeadMutable();
-    MATCH constConv(Type *to);
-
+ || TARGET_OSX
-    void toCppMangle(OutBuffer *buf, CppMangleState *cms);
-#endif
-
@@ -806 +832 @@
-extern int Tsize_t;
-extern int Tptrdiff_t;
-
+int arrayTypeCompatible(Loc loc, Type *t1, Type *t2);
+
-#endif /* DMD_MTYPE_H */

a/dmd2/opover.c

@@ -21 +21 @@
-#define integer_t dmd_integer_t
-#endif
-
-#if IN_GCC || IN_LLVM
-#include "mem.h"
-#elif POSIX
-#include "../root/mem.h"
-#elif _WIN32
-#include "..\root\mem.h"
-#endif
-
-//#include "port.h"
-#include "mtype.h"

a/dmd2/parse.c

@@ -77 +77 @@
-    {
-        nextToken();
-        if (token.value != TOKidentifier)
-afe
+ystem
-        goto Lerr;
-        }
-        Identifier *id = token.ident;
@@ -307 +307 @@
-        stc = STCinvariant;
-        goto Lstc;
-
+        case TOKshared:
+        if (peek(&token)->value == TOKlparen)
+            goto Ldeclaration;
+        stc = STCshared;
+        goto Lstc;
+
-        case TOKfinal:    stc = STCfinal;    goto Lstc;
-        case TOKauto:     stc = STCauto;     goto Lstc;
-        case TOKscope:    stc = STCscope;    goto Lstc;
@@ -337 +343 @@
-            case TOKconst:
-            case TOKinvariant:
-            case TOKimmutable:
+            case TOKshared:
-            // If followed by a (, it is not a storage class
-            if (peek(&token)->value == TOKlparen)
-                break;
-            if (token.value == TOKconst)
-                stc = STCconst;
+            else if (token.value == TOKshared)
+                stc = STCshared;
-            else
-                stc = STCinvariant;
-            goto Lstc;
@@ -378 +387 @@
-        if (token.value == TOKidentifier &&
-            (tk = peek(&token))->value == TOKlparen &&
-            skipParens(tk, &tk) &&
-
+
+
+
-        {
-            a = parseDeclarations(storageClass);
-            decldefs->append(a);
@@ -1037 +1048 @@
-            stc = STCinvariant;
-            goto L2;
-
+        case TOKshared:
+            if (peek(&token)->value == TOKlparen)
+            goto Ldefault;
+            stc = STCshared;
+            goto L2;
+
-        case TOKin:    stc = STCin;     goto L2;
-        case TOKout:       stc = STCout;    goto L2;
-        case TOKinout:
@@ -1093 +1110 @@
-            if ((storageClass & (STCconst | STCout)) == (STCconst | STCout))
-            error("out cannot be const");
-            if ((storageClass & (STCinvariant | STCout)) == (STCinvariant | STCout))
-nvariant
+mmutable
-            if ((storageClass & STCscope) &&
-            (storageClass & (STCref | STCout)))
-            error("scope cannot be ref or out");
@@ -1736 +1753 @@
-
-Objects *Parser::parseTemplateArgumentList2()
-{
+    //printf("Parser::parseTemplateArgumentList2()\n");
-    Objects *tiargs = new Objects();
-    enum TOK endtok = TOKrparen;
-    nextToken();
@@ -1918 +1936 @@
-Type *Parser::parseType(Identifier **pident, TemplateParameters **tpl)
-{   Type *t;
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    {
-    nextToken();
-    /* const type
@@ -1928 +1961 @@
-    return t;
-    }
-    else if ((token.value == TOKinvariant || token.value == TOKimmutable) &&
-(&token)->value
+Next()
-    {
-    nextToken();
-    /* invariant type
@@ -1937 +1970 @@
-    t = t->makeInvariant();
-    return t;
-    }
+    else if (token.value == TOKshared && peekNext() != TOKlparen)
+    {
+    nextToken();
+    /* shared type
+     */
+    t = parseType(pident, tpl);
+    t = t->makeShared();
+    return t;
+    }
-    else
-    t = parseBasicType();
-    t = parseDeclarator(t, pident, tpl);
@@ -2016 +2058 @@
-        check(TOKlparen);
-        t = parseType();
-        check(TOKrparen);
-
+
+
+
+
-        break;
-
-    case TOKinvariant:
@@ -2029 +2074 @@
-        t = t->makeInvariant();
-        break;
-
+    case TOKshared:
+        // shared(type)
+        nextToken();
+        check(TOKlparen);
+        t = parseType();
+        check(TOKrparen);
+        if (t->isConst())
+        t = t->makeSharedConst();
+        else
+        t = t->makeShared();
+        break;
+
-    default:
-        error("basic type expected, not %s", token.toChars());
-        t = Type::tint32;
@@ -2247 +2304 @@
-            switch (token.value)
-            {
-            case TOKconst:
-
+
+
+
+
-                nextToken();
-                continue;
-
@@ -2257 +2317 @@
-                nextToken();
-                continue;
-
+            case TOKshared:
+                if (tf->isConst())
+                tf = tf->makeSharedConst();
+                else
+                tf = tf->makeShared();
+                nextToken();
+                continue;
+
-            case TOKnothrow:
-                ((TypeFunction *)tf)->isnothrow = 1;
-                nextToken();
@@ -3072 +3140 @@
-    case TOKfinal:
-    case TOKinvariant:
-    case TOKimmutable:
+    case TOKshared:
-//  case TOKtypeof:
-    Ldeclaration:
-    {   Array *a;
@@ -3843 +3912 @@
-    int haveId = 0;
-
-#if DMDV2
-
+
+
+
+
-    peek(t)->value != TOKlparen)
-    {   /* const type
-
+
+
-     */
-    t = peek(t);
-    }
-#endif
-
-    if (!isBasicType(&t))
+    {
-    goto Lisnot;
+    }
-    if (!isDeclarator(&t, &haveId, endtok))
-    goto Lisnot;
-    if ( needId == 1 ||
@@ -3970 +4045 @@
-    case TOKconst:
-    case TOKinvariant:
-    case TOKimmutable:
-
+
+
-        t = peek(t);
-        if (t->value != TOKlparen)
-        goto Lfalse;
-        t = peek(t);
-        if (!isDeclaration(t, 0, TOKrparen, &t))
+        {
-        goto Lfalse;
+        }
-        t = peek(t);
-        break;
-
@@ -4120 +4198 @@
-            case TOKconst:
-            case TOKinvariant:
-            case TOKimmutable:
+            case TOKshared:
-            case TOKpure:
-            case TOKnothrow:
-                t = peek(t);
@@ -4182 +4261 @@
-        case TOKconst:
-        case TOKinvariant:
-        case TOKimmutable:
+        case TOKshared:
-        case TOKfinal:
-        continue;
-
@@ -4693 +4773 @@
-             token.value == TOKconst && peek(&token)->value == TOKrparen ||
-             token.value == TOKinvariant && peek(&token)->value == TOKrparen ||
-             token.value == TOKimmutable && peek(&token)->value == TOKrparen ||
+             token.value == TOKshared && peek(&token)->value == TOKrparen ||
-             token.value == TOKfunction ||
-             token.value == TOKdelegate ||
-             token.value == TOKreturn))
@@ -5058 +5139 @@
-        break;
-
-    case TOKcast:               // cast(type) expression
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        nextToken();
-        e = parseUnaryExp();
-tok
-
-
-
-
+m
+
+
+
+Type *
-        check(TOKrparen);
-        e = parseUnaryExp();
-        e = new CastExp(loc, e, t);

a/dmd2/readme.txt

@@ -1 +1 @@
-
-        The D Programming Language
-        Compiler Front End Source
-2
-
+9
+http://
-        All Rights Reserved
-
-
-This is the source code to the front end Digital Mars D compiler.
-It covers the lexical analysis, parsing, and semantic analysis
-of the D Programming Language defined in the documents at
-
-
-
-
-
-
-
+
-
-These sources are free, they are redistributable and modifiable
-under the terms of the GNU General Public License (attached as gpl.txt),
-or the Artistic License (attached as artistic.txt).
-
+The optimizer and code generator sources are 
+covered under a separate license, backendlicense.txt.
+
-It does not apply to anything else distributed by Digital Mars,
-including D compiler executables.
-

a/dmd2/root.c

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

a/dmd2/root.h

@@ -37 +37 @@
-#define TYPEDEFS
-
-#if _MSC_VER
+#include <float.h>  // for _isnan
-#include <malloc.h> // for alloca
-// According to VC 8.0 docs, long double is the same as double
-#define strtold strtod

a/dmd2/scope.c

@@ -257 +257 @@
-            sc->enclosing &&
-            sc->enclosing->search(loc, ident, NULL))
-        {
-            // WTF ?
-            if (global.params.warnings)
-
-
+
-        }
-
-        //printf("\tfound %s.%s, kind = '%s'\n", s->parent ? s->parent->toChars() : "", s->toChars(), s->kind());

a/dmd2/statement.c

@@ -1 +1 @@
-
-// Compiler implementation of the D programming language
-8
+9
-// All Rights Reserved
-// written by Walter Bright
-// http://www.digitalmars.com
@@ -96 +96 @@
-    va_end( ap );
-}
-
+void Statement::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 );
+    }
+}
+
-int Statement::hasBreak()
-{
-    //printf("Statement::hasBreak()\n");
@@ -124 +136 @@
-    return BEany;
-}
-
-// TRUE if statement may fall off the end without a throw or return
-
-int Statement::fallOffEnd()
-{
-    return TRUE;
-}
-
-// TRUE if statement 'comes from' somewhere else, like a goto
-
-int Statement::comeFrom()
@@ -231 +236 @@
-    return result;
-}
-
-int ExpStatement::fallOffEnd()
-{
-    if (exp)
-    {
-    if (exp->op == TOKassert)
-    {   AssertExp *a = (AssertExp *)exp;
-
-        if (a->e1->isBool(FALSE))   // if it's an assert(0)
-        return FALSE;
-    }
-    else if (exp->op == TOKhalt)
-        return FALSE;
-    }
-    return TRUE;
-}
-
-/******************************** CompileStatement ***************************/
-
@@ -565 +555 @@
-//printf("%s\n", s->toChars());
-        if (!(result & BEfallthru) && !s->comeFrom())
-        {
-
-
-
-
+
-        }
-
-        result &= ~BEfallthru;
@@ -578 +565 @@
-    return result;
-}
-
-int CompoundStatement::fallOffEnd()
-{   int falloff = TRUE;
-
-    //printf("CompoundStatement::fallOffEnd() %s\n", toChars());
-    for (int i = 0; i < statements->dim; i++)
-    {   Statement *s = (Statement *)statements->data[i];
-
-    if (!s)
-        continue;
-
-#if 0
-    if (!falloff && global.params.warnings && !s->comeFrom())
-    {
-        warning("%s: statement is not reachable", s->loc.toChars());
-    }
-#endif
-    falloff = s->fallOffEnd();
-    }
-    return falloff;
-}
-
-int CompoundStatement::comeFrom()
-{   int comefrom = FALSE;
@@ -716 +683 @@
-    return result;
-}
-
-int UnrolledLoopStatement::fallOffEnd()
-{
-    //printf("UnrolledLoopStatement::fallOffEnd()\n");
-    for (size_t i = 0; i < statements->dim; i++)
-    {   Statement *s = (Statement *)statements->data[i];
-
-    if (s)
-        s->fallOffEnd();
-    }
-    return TRUE;
-}
-
-int UnrolledLoopStatement::comeFrom()
-{   int comefrom = FALSE;
@@ -821 +777 @@
-    return statement ? statement->blockExit() : BEfallthru;
-}
-
-int ScopeStatement::fallOffEnd()
-{
-    return statement ? statement->fallOffEnd() : TRUE;
-}
-
-int ScopeStatement::comeFrom()
-{
@@ -951 +903 @@
-    return result;
-}
-
-int WhileStatement::fallOffEnd()
-{
-    if (body)
-    body->fallOffEnd();
-    return TRUE;
-}
-
-int WhileStatement::comeFrom()
-{
@@ -1046 +992 @@
-    return result;
-}
-
-int DoStatement::fallOffEnd()
-{
-    if (body)
-    body->fallOffEnd();
-    return TRUE;
-}
-
-int DoStatement::comeFrom()
-{
@@ -1171 +1111 @@
-    result &= ~BEfallthru;  // the body must do the exiting
-    if (body)
-    {   int r = body->blockExit();
-BEbreak
-
-
+(BEbreak | BEgoto)
+
+fallthru | BE
-    }
-    if (increment && increment->canThrow())
-    result |= BEthrow;
-    return result;
-}
-
-int ForStatement::fallOffEnd()
-{
-    if (body)
-    body->fallOffEnd();
-    return TRUE;
-}
-
-int ForStatement::comeFrom()
-{
@@ -1551 +1485 @@
-         */
-        Identifier *id = Identifier::generateId("__r");
-        VarDeclaration *r = new VarDeclaration(loc, NULL, id, new ExpInitializer(loc, aggr));
-
+
+
-        Statement *init = new DeclarationStatement(loc, r);
+//printf("init: %s\n", init->toChars());
-
-        // !__r.empty
-        Expression *e = new VarExp(loc, r);
@@ -1568 +1504 @@
-         */
-        e = new VarExp(loc, r);
-        Expression *einit = new DotIdExp(loc, e, idhead);
-
+//
-        Argument *arg = (Argument *)arguments->data[0];
-        VarDeclaration *ve = new VarDeclaration(loc, arg->type, arg->ident, new ExpInitializer(loc, einit));
-        ve->storage_class |= STCforeach;
@@ -1923 +1859 @@
-    return result;
-}
-
-int ForeachStatement::fallOffEnd()
-{
-    if (body)
-    body->fallOffEnd();
-    return TRUE;
-}
-
-int ForeachStatement::comeFrom()
-{
@@ -2023 +1953 @@
-
-    if (arg->type)
-    {
+    arg->type = arg->type->semantic(loc, sc);
-    lwr = lwr->implicitCastTo(sc, arg->type);
-    upr = upr->implicitCastTo(sc, arg->type);
-    }
@@ -2091 +2022 @@
-    return result;
-}
-
-int ForeachRangeStatement::fallOffEnd()
-{
-    if (body)
-    body->fallOffEnd();
-    return TRUE;
-}
-
-int ForeachRangeStatement::comeFrom()
-{
@@ -2253 +2178 @@
-    return result;
-}
-
-int IfStatement::fallOffEnd()
-{
-    if (!ifbody || ifbody->fallOffEnd() ||
-    !elsebody || elsebody->fallOffEnd())
-    return TRUE;
-    return FALSE;
-}
-
-
-void IfStatement::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
-{
@@ -2506 +2423 @@
-    return result;
-}
-
-int PragmaStatement::fallOffEnd()
-{
-    if (body)
-    return body->fallOffEnd();
-    return TRUE;
-}
-
-void PragmaStatement::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
-{
@@ -2717 +2628 @@
-    return result;
-}
-
-int SwitchStatement::fallOffEnd()
-{
-    if (body)
-    body->fallOffEnd();
-    return TRUE;    // need to do this better
-}
-
-void SwitchStatement::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
-{
@@ -2849 +2754 @@
-    return statement->blockExit();
-}
-
-int CaseStatement::fallOffEnd()
-{
-    return statement->fallOffEnd();
-}
-
-int CaseStatement::comeFrom()
-{
@@ -2916 +2817 @@
-    return statement->blockExit();
-}
-
-int DefaultStatement::fallOffEnd()
-{
-    return statement->fallOffEnd();
-}
-
-int DefaultStatement::comeFrom()
-{
@@ -2961 +2858 @@
-    return BEgoto;
-}
-
-int GotoDefaultStatement::fallOffEnd()
-{
-    return FALSE;
-}
-
-void GotoDefaultStatement::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
-{
@@ -3015 +2908 @@
-    return BEgoto;
-}
-
-int GotoCaseStatement::fallOffEnd()
-{
-    return FALSE;
-}
-
-void GotoCaseStatement::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
-{
@@ -3043 +2932 @@
-    return BEthrow;
-}
-
-int SwitchErrorStatement::fallOffEnd()
-{
-    return FALSE;
-}
-
-void SwitchErrorStatement::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
-{
@@ -3273 +3158 @@
-        exp = exp->semantic(sc);
-    }
-
-
+ && !fd->isCtorDeclaration()
-    {   // Function returns a reference
-        if (tbret->isMutable())
-        exp = exp->modifiableLvalue(sc, exp);
@@ -3346 +3231 @@
-    return result;
-}
-
-int ReturnStatement::fallOffEnd()
-{
-    return FALSE;
-}
-
-void ReturnStatement::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
-{
@@ -3445 +3326 @@
-    return ident ? BEgoto : BEbreak;
-}
-
-int BreakStatement::fallOffEnd()
-{
-    return FALSE;
-}
-
-void BreakStatement::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
-{
@@ -3553 +3430 @@
-    return ident ? BEgoto : BEcontinue;
-}
-
-int ContinueStatement::fallOffEnd()
-{
-    return FALSE;
-}
-
-void ContinueStatement::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
-{
@@ -3648 +3521 @@
-    return body ? body->blockExit() : BEfallthru;
-}
-
-int SynchronizedStatement::fallOffEnd()
-{
-    return body ? body->fallOffEnd() : TRUE;
-}
-
-void SynchronizedStatement::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
-{
@@ -3770 +3639 @@
-    return result;
-}
-
-int WithStatement::fallOffEnd()
-{
-    return body ? body->fallOffEnd() : TRUE;
-}
-
-/******************************** TryCatchStatement ***************************/
-
@@ -3837 +3702 @@
-}
-
-int TryCatchStatement::blockExit()
-
-
+
-    assert(body);
-
-
+
+
+
-    for (size_t i = 0; i < catches->dim; i++)
-    {
-        Catch *c = (Catch *)catches->data[i];
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-void TryCatchStatement::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
-{
@@ -4030 +3889 @@
-
-int TryFinallyStatement::blockExit()
-{
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-/****************************** OnScopeStatement ***************************/
-
@@ -4163 +4015 @@
-    return BEthrow;  // obviously
-}
-
-int ThrowStatement::fallOffEnd()
-{
-    return FALSE;
-}
-
-void ThrowStatement::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
-{
@@ -4226 +4074 @@
-    return statement ? statement->blockExit() : BEfallthru;
-}
-
-int VolatileStatement::fallOffEnd()
-{
-    return statement ? statement->fallOffEnd() : TRUE;
-}
-
-void VolatileStatement::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
-{
@@ -4295 +4139 @@
-    return BEgoto;
-}
-
-int GotoStatement::fallOffEnd()
-{
-    return FALSE;
-}
-
-void GotoStatement::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
-{
@@ -4389 +4229 @@
-    return statement ? statement->blockExit() : BEfallthru;
-}
-
-int LabelStatement::fallOffEnd()
-{
-    return statement ? statement->fallOffEnd() : TRUE;
-}
-
-int LabelStatement::comeFrom()
-{

a/dmd2/statement.h

@@ -79 +79 @@
-#endif
-struct code;
-
-
+; this is returned by blockExit()
- */
-enum BE
-{
@@ -134 +134 @@
-    char *toChars();
-
-    void error(const char *format, ...);
+    void warning(const char *format, ...);
-    virtual void toCBuffer(OutBuffer *buf, HdrGenState *hgs);
-    virtual TryCatchStatement *isTryCatchStatement() { return NULL; }
-    virtual GotoStatement *isGotoStatement() { return NULL; }
@@ -148 +149 @@
-    virtual int hasBreak();
-    virtual int hasContinue();
-    virtual int usesEH();
-    virtual int fallOffEnd();
-    virtual int blockExit();
-    virtual int comeFrom();
-    virtual void scopeCode(Scope *sc, Statement **sentry, Statement **sexit, Statement **sfinally);
@@ -183 +183 @@
-    void toCBuffer(OutBuffer *buf, HdrGenState *hgs);
-    Statement *semantic(Scope *sc);
-    Expression *interpret(InterState *istate);
-    int fallOffEnd();
-    int blockExit();
-
-    int inlineCost(InlineCostState *ics);
@@ -232 +231 @@
-    virtual Statement *semantic(Scope *sc);
-    int usesEH();
-    int blockExit();
-    int fallOffEnd();
-    int comeFrom();
-    virtual Statements *flatten(Scope *sc);
-    ReturnStatement *isReturnStatement();
@@ -266 +264 @@
-    int hasContinue();
-    int usesEH();
-    int blockExit();
-    int fallOffEnd();
-    int comeFrom();
-    Expression *interpret(InterState *istate);
-    void toCBuffer(OutBuffer *buf, HdrGenState *hgs);
@@ -291 +288 @@
-    int hasContinue();
-    int usesEH();
-    int blockExit();
-    int fallOffEnd();
-    int comeFrom();
-    Expression *interpret(InterState *istate);
-
@@ -313 +309 @@
-    int hasContinue();
-    int usesEH();
-    int blockExit();
-    int fallOffEnd();
-    int comeFrom();
-    Expression *interpret(InterState *istate);
-    void toCBuffer(OutBuffer *buf, HdrGenState *hgs);
@@ -336 +331 @@
-    int hasContinue();
-    int usesEH();
-    int blockExit();
-    int fallOffEnd();
-    int comeFrom();
-    Expression *interpret(InterState *istate);
-    void toCBuffer(OutBuffer *buf, HdrGenState *hgs);
@@ -362 +356 @@
-    int hasContinue();
-    int usesEH();
-    int blockExit();
-    int fallOffEnd();
-    int comeFrom();
-    Expression *interpret(InterState *istate);
-    void toCBuffer(OutBuffer *buf, HdrGenState *hgs);
@@ -396 +389 @@
-    int hasContinue();
-    int usesEH();
-    int blockExit();
-    int fallOffEnd();
-    int comeFrom();
-    Expression *interpret(InterState *istate);
-    void toCBuffer(OutBuffer *buf, HdrGenState *hgs);
@@ -426 +418 @@
-    int hasContinue();
-    int usesEH();
-    int blockExit();
-    int fallOffEnd();
-    int comeFrom();
-    Expression *interpret(InterState *istate);
-    void toCBuffer(OutBuffer *buf, HdrGenState *hgs);
@@ -453 +444 @@
-    void toCBuffer(OutBuffer *buf, HdrGenState *hgs);
-    int usesEH();
-    int blockExit();
-    int fallOffEnd();
-    IfStatement *isIfStatement() { return this; }
-
-    int inlineCost(InlineCostState *ics);
@@ -490 +480 @@
-    Statement *semantic(Scope *sc);
-    int usesEH();
-    int blockExit();
-    int fallOffEnd();
-
-    void toCBuffer(OutBuffer *buf, HdrGenState *hgs);
-
@@ -528 +517 @@
-    int hasBreak();
-    int usesEH();
-    int blockExit();
-    int fallOffEnd();
-    Expression *interpret(InterState *istate);
-    void toCBuffer(OutBuffer *buf, HdrGenState *hgs);
-
@@ -550 +538 @@
-    int compare(Object *obj);
-    int usesEH();
-    int blockExit();
-    int fallOffEnd();
-    int comeFrom();
-    Expression *interpret(InterState *istate);
-    void toCBuffer(OutBuffer *buf, HdrGenState *hgs);
@@ -578 +565 @@
-    Statement *semantic(Scope *sc);
-    int usesEH();
-    int blockExit();
-    int fallOffEnd();
-    int comeFrom();
-    Expression *interpret(InterState *istate);
-    void toCBuffer(OutBuffer *buf, HdrGenState *hgs);
@@ -601 +587 @@
-    Statement *semantic(Scope *sc);
-    Expression *interpret(InterState *istate);
-    int blockExit();
-    int fallOffEnd();
-    void toCBuffer(OutBuffer *buf, HdrGenState *hgs);
-
-    void toIR(IRState *irs);
@@ -619 +604 @@
-    Statement *semantic(Scope *sc);
-    Expression *interpret(InterState *istate);
-    int blockExit();
-    int fallOffEnd();
-    void toCBuffer(OutBuffer *buf, HdrGenState *hgs);
-
-    void toIR(IRState *irs);
@@ -629 +613 @@
-{
-    SwitchErrorStatement(Loc loc);
-    int blockExit();
-    int fallOffEnd();
-    void toCBuffer(OutBuffer *buf, HdrGenState *hgs);
-
-    void toIR(IRState *irs);
@@ -645 +628 @@
-    void toCBuffer(OutBuffer *buf, HdrGenState *hgs);
-    Statement *semantic(Scope *sc);
-    int blockExit();
-    int fallOffEnd();
-    Expression *interpret(InterState *istate);
-
-    int inlineCost(InlineCostState *ics);
@@ -667 +649 @@
-    Statement *semantic(Scope *sc);
-    Expression *interpret(InterState *istate);
-    int blockExit();
-    int fallOffEnd();
-    void toCBuffer(OutBuffer *buf, HdrGenState *hgs);
-
-    void toIR(IRState *irs);
@@ -686 +667 @@
-    Statement *semantic(Scope *sc);
-    Expression *interpret(InterState *istate);
-    int blockExit();
-    int fallOffEnd();
-    void toCBuffer(OutBuffer *buf, HdrGenState *hgs);
-
-    void toIR(IRState *irs);
@@ -708 +688 @@
-    int hasContinue();
-    int usesEH();
-    int blockExit();
-    int fallOffEnd();
-    void toCBuffer(OutBuffer *buf, HdrGenState *hgs);
-
-    Statement *inlineScan(InlineScanState *iss);
@@ -732 +711 @@
-    void toCBuffer(OutBuffer *buf, HdrGenState *hgs);
-    int usesEH();
-    int blockExit();
-    int fallOffEnd();
-
-    Statement *inlineScan(InlineScanState *iss);
-
@@ -750 +728 @@
-    int hasBreak();
-    int usesEH();
-    int blockExit();
-    int fallOffEnd();
-
-    Statement *inlineScan(InlineScanState *iss);
-
@@ -788 +765 @@
-    int hasContinue();
-    int usesEH();
-    int blockExit();
-    int fallOffEnd();
-
-    Statement *inlineScan(InlineScanState *iss);
-
@@ -820 +796 @@
-    Statement *semantic(Scope *sc);
-    void toCBuffer(OutBuffer *buf, HdrGenState *hgs);
-    int blockExit();
-    int fallOffEnd();
-
-    Statement *inlineScan(InlineScanState *iss);
-
@@ -837 +812 @@
-    Statement *semantic(Scope *sc);
-    Statements *flatten(Scope *sc);
-    int blockExit();
-    int fallOffEnd();
-    void toCBuffer(OutBuffer *buf, HdrGenState *hgs);
-
-    Statement *inlineScan(InlineScanState *iss);
@@ -856 +830 @@
-    Statement *syntaxCopy();
-    Statement *semantic(Scope *sc);
-    int blockExit();
-    int fallOffEnd();
-    Expression *interpret(InterState *istate);
-
-    void toIR(IRState *irs);
@@ -879 +852 @@
-    Statements *flatten(Scope *sc);
-    int usesEH();
-    int blockExit();
-    int fallOffEnd();
-    int comeFrom();
-    Expression *interpret(InterState *istate);
-    void toCBuffer(OutBuffer *buf, HdrGenState *hgs);

a/dmd2/struct.c

@@ -1 +1 @@
-
-// Compiler implementation of the D programming language
-8
+9
-// All Rights Reserved
-// written by Walter Bright
-// http://www.digitalmars.com
@@ -19 +19 @@
-#include "module.h"
-#include "id.h"
-#include "statement.h"
+#include "template.h"
-
-/********************************* AggregateDeclaration ****************************/
-
@@ -44 +45 @@
-    stag = NULL;
-    sinit = NULL;
-    scope = NULL;
-
+
+
-
+#if DMDV2
-    ctor = NULL;
-    defaultCtor = NULL;
+#endif
+    dtor = NULL;
-}
-
-enum PROT AggregateDeclaration::prot()
@@ -132 +137 @@
- * Align sizes of 0, as we may not know array sizes yet.
- */
-
-
+
+
+
+
-{
-    //printf("salign = %d, size = %d, offset = %d\n",salign,size,*poffset);
-    if (salign > 1)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-    }
-    //printf("result = %d\n",*poffset);
-}
@@ -171 +166 @@
-
-    // Check for forward referenced types which will fail the size() call
-    Type *t = v->type->toBasetype();
+    if (v->storage_class & STCref)
+    {   // References are the size of a pointer
+    t = Type::tvoidptr;
+    }
-    if (t->ty == Tstruct /*&& isStructDeclaration()*/)
-    {   TypeStruct *ts = (TypeStruct *)t;
-
+
-    if (ts->sym == this)
-    {
-        error("cannot have field %s with same struct type", v->toChars());
-    }
+#endif
-
-    if (ts->sym->sizeok != 1)
-    {
@@ -191 +191 @@
-    return;
-    }
-
-v->type
-v->type
-v->type
+t
+t
+t
-    alignmember(xalign, memalignsize, &sc->offset);
-    v->offset = sc->offset;
-    sc->offset += memsize;
@@ -211 +211 @@
-}
-
-
+/****************************************
+ * Returns !=0 if there's an extra member which is the 'this'
+ * pointer to the enclosing context (enclosing aggregate or function)
+ */
+
+int AggregateDeclaration::isNested()
+{
+    return isnested;
+}
+
+
-/********************************* StructDeclaration ****************************/
-
-StructDeclaration::StructDeclaration(Loc loc, Identifier *id)
-    : AggregateDeclaration(loc, id)
-{
-    zeroInit = 0;   // assume false until we do semantic processing
+#if DMDV2
-    hasIdentityAssign = 0;
-    cpctor = NULL;
-    postblit = NULL;
+#endif
-
-    // For forward references
-    type = new TypeStruct(this);
@@ -267 +280 @@
-#if STRUCTTHISREF
-    handle = type;
-#else
+    assert(0);
-    handle = type->pointerTo();
-#endif
-    structalign = sc->structalign;
@@ -277 +291 @@
-    assert(!isAnonymous());
-    if (sc->stc & STCabstract)
-    error("structs, unions cannot be abstract");
+#if DMDV2
-    if (storage_class & STCinvariant)
-        type = type->invariantOf();
-    else if (storage_class & STCconst)
-        type = type->constOf();
+#endif
-
-    if (sizeok == 0)        // if not already done the addMember step
-    {
+    int hasfunctions = 0;
-    for (i = 0; i < members->dim; i++)
-    {
-        Dsymbol *s = (Dsymbol *)members->data[i];
-        //printf("adding member '%s' to '%s'\n", s->toChars(), this->toChars());
-        s->addMember(sc, this, 1);
+        if (s->isFuncDeclaration())
+        hasfunctions = 1;
-    }
+
+    // If nested struct, add in hidden 'this' pointer to outer scope
+    if (hasfunctions && !(storage_class & STCstatic))
+        {   Dsymbol *s = toParent2();
+            if (s)
+            {
+                AggregateDeclaration *ad = s->isAggregateDeclaration();
+                FuncDeclaration *fd = s->isFuncDeclaration();
+
+        TemplateInstance *ti;
+                if (ad && (ti = ad->parent->isTemplateInstance()) != NULL && ti->isnested || fd)
+                {   isnested = 1;
+                    Type *t;
+                    if (ad)
+                        t = ad->handle;
+                    else if (fd)
+                    {   AggregateDeclaration *ad = fd->isMember2();
+                        if (ad)
+                            t = ad->handle;
+                        else
+                t = Type::tvoidptr;
+                    }
+                    else
+                        assert(0);
+            if (t->ty == Tstruct)
+            t = Type::tvoidptr; // t should not be a ref type
+                    assert(!vthis);
+                    vthis = new ThisDeclaration(t);
+            //vthis->storage_class |= STCref;
+                    members->push(vthis);
+                }
+            }
+        }
-    }
-
-    sizeok = 0;
@@ -314 +366 @@
-        break;
-    }
-#endif
+    Type *t;
+    if (s->isDeclaration() &&
+        (t = s->isDeclaration()->type) != NULL &&
+        t->toBasetype()->ty == Tstruct)
+    {   StructDeclaration *sd = (StructDeclaration *)t->toDsymbol(sc);
+        if (sd->isnested)
+        error("inner struct %s cannot be a field", sd->toChars());
+    }
-    }
-
-    /* The TypeInfo_Struct is expecting an opEquals and opCmp with
@@ -373 +433 @@
-
-    id = Id::cmp;
-    }
-
+
-    dtor = buildDtor(sc2);
-    postblit = buildPostBlit(sc2);
-    cpctor = buildCpCtor(sc2);
-    buildOpAssign(sc2);
+#endif
-
-    sc2->pop();
-
@@ -440 +501 @@
-
-    /* Look for special member functions.
-     */
+#if DMDV2
-    ctor =   (CtorDeclaration *)search(0, Id::ctor, 0);
+#endif
-    inv =    (InvariantDeclaration *)search(0, Id::classInvariant, 0);
-    aggNew =       (NewDeclaration *)search(0, Id::classNew,       0);
-    aggDelete = (DeleteDeclaration *)search(0, Id::classDelete,    0);

a/dmd2/template.c

@@ -1 +1 @@
-
-// Compiler implementation of the D programming language
-8
+9
-// All Rights Reserved
-// written by Walter Bright
-// http://www.digitalmars.com
@@ -187 +187 @@
-    {
-        goto Lnomatch;
-    }
+#if DMDV2
-    VarDeclaration *v1 = s1->isVarDeclaration();
-    VarDeclaration *v2 = s2->isVarDeclaration();
-    if (v1 && v2 && v1->storage_class & v2->storage_class & STCmanifest)
@@ -195 +196 @@
-        if (ei1 && ei2 && !ei1->exp->equals(ei2->exp))
-        goto Lnomatch;
-    }
+#endif
-    }
-    else if (v1)
-    {
@@ -262 +264 @@
-    }
-}
-
+#if DMDV2
-Object *objectSyntaxCopy(Object *o)
-{
-    if (!o)
@@ -274 +277 @@
-    return e->syntaxCopy();
-    return o;
-}
+#endif
-
-
-/* ======================== TemplateDeclaration ============================= */
@@ -301 +305 @@
-    this->loc = loc;
-    this->parameters = parameters;
-    this->origParameters = parameters;
+#if DMDV2
-    this->constraint = constraint;
+#endif
-    this->members = decldefs;
-    this->overnext = NULL;
-    this->overroot = NULL;
@@ -326 +332 @@
-        p->data[i] = (void *)tp->syntaxCopy();
-    }
-    }
+#if DMDV2
-    Expression *e = NULL;
-    if (constraint)
-    e = constraint->syntaxCopy();
+#endif
-    d = Dsymbol::arraySyntaxCopy(members);
-    td = new TemplateDeclaration(loc, ident, p, e, d);
-    
@@ -348 +356 @@
-
-    if (sc->func)
-    {
-
+
+
+
-    }
-
-    if (/*global.params.useArrayBounds &&*/ sc->module)
@@ -376 +386 @@
-    paramsym->parent = sc->parent;
-    Scope *paramscope = sc->push(paramsym);
-    paramscope->parameterSpecialization = 1;
+    paramscope->stc = 0;
-
-    if (global.params.doDocComments)
-    {
@@ -536 +547 @@
-    ScopeDsymbol *paramsym = new ScopeDsymbol();
-    paramsym->parent = scope->parent;
-    Scope *paramscope = scope->push(paramsym);
+    paramscope->stc = 0;
-
-    // Attempt type deduction
-    m = MATCHexact;
@@ -591 +603 @@
-    }
-    }
-
+#if DMDV2
-    if (m && constraint && !(flag & 1))
-    {   /* Check to see if constraint is satisfied.
-     */
@@ -607 +620 @@
-            e->error("constraint %s is not constant or does not evaluate to a bool", e->toChars());
-        }
-    }
+#endif
-
-#if LOGM
-    // Print out the results
@@ -823 +837 @@
-        Tuple *t = new Tuple();
-        //printf("t = %p\n", t);
-        dedargs->data[parameters->dim - 1] = (void *)t;
+        declareParameter(paramscope, tp, t);
-        goto L2;
-    }
-    else if (nfargs < nfparams - 1)
@@ -858 +873 @@
-        {   Expression *farg = (Expression *)fargs->data[fptupindex + i];
-            t->objects.data[i] = (void *)farg->type;
-        }
+        declareParameter(paramscope, tp, t);
-        goto L2;
-        }
-        fptupindex = -1;
@@ -875 +891 @@
-    }
-
-L2:
+#if DMDV2
-    // Match 'ethis' to any TemplateThisParameter's
-    if (ethis)
-    {
@@ -893 +910 @@
-        }
-    }
-    }
+#endif
-
-    // Loop through the function parameters
-    for (i = 0; i < nfparams; i++)
@@ -924 +942 @@
-        printf("\tfarg->type   = %s\n", farg->type->toChars());
-        printf("\tfparam->type = %s\n", fparam->type->toChars());
-#endif
+        Type *argtype = farg->type;
+
+#if DMDV2
+        /* Allow string literals which are type [] to match with [dim]
+         */
+        if (farg->op == TOKstring)
+        {   StringExp *se = (StringExp *)farg;
+        if (!se->committed && argtype->ty == Tarray &&
+            fparam->type->toBasetype()->ty == Tsarray)
+        {
+            argtype = new TypeSArray(argtype->nextOf(), new IntegerExp(se->loc, se->len, Type::tindex));
+            argtype = argtype->semantic(se->loc, NULL);
+            argtype = argtype->invariantOf();
+        }
+        }
+#endif
+
-        MATCH m;
-farg->
-farg->
+arg
+arg
-        //printf("\tdeduceType m = %d\n", m);
-
-        /* If no match, see if there's a conversion to a delegate
@@ -1061 +1096 @@
-    }
-    }
-
+#if DMDV2
-    if (constraint)
-    {   /* Check to see if constraint is satisfied.
-     */
@@ -1077 +1113 @@
-            e->error("constraint %s is not constant or does not evaluate to a bool", e->toChars());
-        }
-    }
-
+
-
-#if 0
-    for (i = 0; i < dedargs->dim; i++)
@@ -1343 +1379 @@
-    tp->toCBuffer(buf, hgs);
-    }
-    buf->writeByte(')');
-
+
-    if (constraint)
-    {   buf->writestring(" if (");
-    constraint->toCBuffer(buf, hgs);
-    buf->writeByte(')');
-    }
+#endif
-
-    if (hgs->hdrgen)
-    {
@@ -1383 +1420 @@
-    tp->toCBuffer(&buf, &hgs);
-    }
-    buf.writeByte(')');
-
+
-    if (constraint)
-    {   buf.writestring(" if (");
-    constraint->toCBuffer(&buf, &hgs);
-    buf.writeByte(')');
-    }
-
+
-    buf.writeByte(0);
-    return (char *)buf.extractData();
-}
@@ -1554 +1591 @@
-    return MATCHconst;
-}
-
+MATCH TypeDArray::deduceType(Scope *sc, Type *tparam, TemplateParameters *parameters,
+    Objects *dedtypes)
+{
+#if 0
+    printf("TypeDArray::deduceType()\n");
+    printf("\tthis   = %d, ", ty); print();
+    printf("\ttparam = %d, ", tparam->ty); tparam->print();
+#endif
+    return Type::deduceType(sc, tparam, parameters, dedtypes);
+
+  Lnomatch:
+    return MATCHnomatch;
+}
+
-MATCH TypeSArray::deduceType(Scope *sc, Type *tparam, TemplateParameters *parameters,
-    Objects *dedtypes)
-{
@@ -1852 +1903 @@
-        Expression *e1 = isExpression(o1);
-        Expression *e2 = isExpression(o2);
-
+        Dsymbol *s1 = isDsymbol(o1);
+        Dsymbol *s2 = isDsymbol(o2);
+
+        Tuple *v1 = isTuple(o1);
+        Tuple *v2 = isTuple(o2);
-#if 0
-        if (t1) printf("t1 = %s\n", t1->toChars());
-        if (t2) printf("t2 = %s\n", t2->toChars());
-        if (e1) printf("e1 = %s\n", e1->toChars());
-        if (e2) printf("e2 = %s\n", e2->toChars());
+        if (s1) printf("s1 = %s\n", s1->toChars());
+        if (s2) printf("s2 = %s\n", s2->toChars());
+        if (v1) printf("v1 = %s\n", v1->toChars());
+        if (v2) printf("v2 = %s\n", v2->toChars());
-#endif
-
-        if (t1 && t2)
@@ -1903 +1963 @@
-            dedtypes->data[j] = e1;
-        }
-        }
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        else
-        goto Lnomatch;
-    }
@@ -2537 +2623 @@
-
-Lnomatch:
-    *psparam = NULL;
+    //printf("\tm = %d\n", MATCHnomatch);
-    return MATCHnomatch;
-}
-
@@ -3157 +3244 @@
-    }
-    }
-
-isNested
+hasNestedArgs
-
-    /* See if there is an existing TemplateInstantiation that already
-     * implements the typeargs. If so, just refer to that one instead.
@@ -3231 +3318 @@
-#endif
-
-    //if (scx && scx->scopesym) printf("3: scx is %s %s\n", scx->scopesym->kind(), scx->scopesym->toChars());
-
+
+
+
+
+
+
+
+
+
+
+
+
-    {
-        //printf("\t1: adding to %s %s\n", scx->scopesym->kind(), scx->scopesym->toChars());
-        a = scx->scopesym->members;
@@ -3273 +3371 @@
-    argsym = new ScopeDsymbol();
-    argsym->parent = scope->parent;
-    scope = scope->push(argsym);
+//    scope->stc = 0;
-
-    // Declare each template parameter as an alias for the argument type
-
+
+
+
+
-
-    // Add members of template instance to template instance symbol table
-//    parent = scope->scopesym;
@@ -3752 +3854 @@
- * generation of the TemplateDeclaration.
- */
-
-isNested
+hasNestedArgs
-{   int nested = 0;
-isNested
+hasNestedArgs
-
-    /* A nested instance happens when an argument references a local
-     * symbol that is on the stack.
@@ -3803 +3905 @@
-                if (p == dparent)
-                goto L1;    // isnested is most nested
-            }
-1
+p
-            {
-                if (p == isnested)
-                {   isnested = dparent;
-                goto L1;    // dparent is most nested
-                }
-            }
-
+
+
-            }
-          L1:
-            //printf("\tnested inside %s\n", isnested->toChars());
@@ -3822 +3925 @@
-    }
-    else if (va)
-    {
-isNested
+hasNestedArgs
-    }
-    }
-    return nested;

a/dmd2/template.h

@@ -54 +54 @@
-    TemplateParameters *parameters; // array of TemplateParameter's
-
-    TemplateParameters *origParameters; // originals for Ddoc
-
+
-    Expression *constraint;
-
+
-    Array instances;            // array of TemplateInstance's
-
-    TemplateDeclaration *overnext;  // next overloaded TemplateDeclaration
@@ -66 +66 @@
-    Dsymbol *onemember;     // if !=NULL then one member of this template
-
-    TemplateDeclaration(Loc loc, Identifier *id, TemplateParameters *parameters,
-
+
+
+
+
-    Dsymbol *syntaxCopy(Dsymbol *);
-    void semantic(Scope *sc);
-    int overloadInsert(Dsymbol *s);
@@ -117 +120 @@
-    virtual TemplateTypeParameter  *isTemplateTypeParameter();
-    virtual TemplateValueParameter *isTemplateValueParameter();
-    virtual TemplateAliasParameter *isTemplateAliasParameter();
+#if DMDV2
-    virtual TemplateThisParameter *isTemplateThisParameter();
+#endif
-    virtual TemplateTupleParameter *isTemplateTupleParameter();
-
-    virtual TemplateParameter *syntaxCopy() = 0;
@@ -314 +319 @@
-    TemplateDeclaration *findTemplateDeclaration(Scope *sc);
-    TemplateDeclaration *findBestMatch(Scope *sc);
-    void declareParameters(Scope *sc);
-isNested
+hasNestedArgs
-    Identifier *genIdent();
-
-    TemplateInstance *isTemplateInstance() { return this; }

a/dmd2/traits.c

@@ -1 +1 @@
-
-// Compiler implementation of the D programming language
-7
+9
-// All Rights Reserved
-// written by Walter Bright
-// http://www.digitalmars.com
@@ -12 +12 @@
-#include <stdlib.h>
-#include <ctype.h>
-#include <assert.h>
+#if _MSC_VER
+#include <complex>
+#else
-#include <complex.h>
+#endif
-#include <math.h>
-
-#if IN_GCC
@@ -24 +28 @@
-#define integer_t dmd_integer_t
-#endif
-
-#if IN_GCC || IN_LLVM
-#include "mem.h"
-#elif _WIN32
-#include "..\root\mem.h"
-#elif linux
-#include "../root/mem.h"
-#endif
-
-//#include "port.h"
-#include "mtype.h"
@@ -53 +51 @@
-
-#define LOGSEMANTIC 0
-
+#if DMDV2
+
-/************************************************
- * Delegate to be passed to overloadApply() that looks
- * for virtual functions.
@@ -438 +438 @@
-}
-
-
+#endif

a/gen/dvalue.cpp

@@ -33 +33 @@
-
-LLValue* DVarValue::getRVal()
-{
-    assert(val);
-    Type* bt = type->toBasetype();
-    if (DtoIsPassedByRef(bt))
-        return val;

a/gen/linker.cpp

@@ -14 +14 @@
-#include "gen/logger.h"
-#include "gen/cl_options.h"
-
+#include <sys/types.h> 
+ #include <sys/wait.h> 
+
-//////////////////////////////////////////////////////////////////////////////
-
-// Is this useful?
@@ -172 +175 @@
-        break;
-
-    case OSWindows:
-'
+
-        break;
-    }
-
@@ -313 +316 @@
-        break;
-
-    case OSWindows:
-'
+
-        break;
-    }
-
@@ -339 +342 @@
-    llvm::OStream logstr = Logger::cout();
-    for (; I != E; ++I)
-        if (*I)
-'" << *I << "'
+" << *I << "
-    logstr << "\n" << std::flush;
-
-
-    // terminate args list
-    args.push_back(NULL);
-
+    const char** Cargs = new const char* [args.size()];
+    for (unsigned i = 0, e = args.size(); i != e; ++i)
+            Cargs[i] = args[i];
-    // try to call linker!!!
-
+
+
+
+
+
-    {
-        error("linking failed:\nstatus: %d", status);
-        if (!errstr.empty())
@@ -379 +389 @@
-    std::vector<const char*> args;
-    // args[0] should be the name of the executable
-    args.push_back(gExePath.toString().c_str());
-'
+
-    for (size_t i = 1, length = opts::runargs.size(); i < length; i++)
-    {
-        args.push_back(opts::runargs[i].c_str());

a/gen/llvmhelpers.cpp

@@ -396 +396 @@
-
-void DtoAssign(Loc& loc, DValue* lhs, DValue* rhs)
-{
-...);\n"
+ %s <- %s );\n", lhs->toChars(), rhs->toChars() 
-    LOG_SCOPE;
-
-    Type* t = lhs->getType()->toBasetype();
-    Type* t2 = rhs->getType()->toBasetype();
-
+     Logger::println("type: %s <- %s );\n", t->toChars(), t2->toChars() );
+
-    if (t->ty == Tstruct) {
-        if (!t->equals(t2)) {
-            // FIXME: use 'rhs' for something !?!
-            DtoAggrZeroInit(lhs->getLVal());
-        }
-        else {
+        Logger::cout() << "struct copy: " << *lhs->getLVal() << " <- " << *rhs->getRVal() << " );\n";
-            DtoAggrCopy(lhs->getLVal(), rhs->getRVal());
-        }
-    }
@@ -1572 +1575 @@
-{
-    t = t->toBasetype();
-    if (t->ty == Tsarray) {
-
-
+
+
+
-    } else if (t->ty != Tstruct)
-        return false;
-

a/gen/todebug.cpp

@@ -33 +33 @@
- */
-static LLGlobalVariable* emitDwarfGlobalDecl(const LLStructType* type, const char* name, bool linkonce=false)
-{
-
+Any
-    LLGlobalVariable* gv = new LLGlobalVariable(type, true, linkage, NULL, name, gIR->module);
-    gv->setSection("llvm.metadata");
-    return gv;

a/gen/toir.cpp

@@ -1067 +1067 @@
-    if (VarDeclaration* vd = var->isVarDeclaration()) {
-        LLValue* arrptr;
-        // indexing struct pointer
-
+
+
-            assert(e1type->nextOf()->ty == Tstruct);
-            TypeStruct* ts = (TypeStruct*)e1type->nextOf();
-            arrptr = DtoIndexStruct(l->getRVal(), ts->sym, vd);
-        }
-        // indexing normal struct
-        else if (e1type->ty == Tstruct) {
+        Logger::cout() << "indexing normal struct: " << '\n';
-            TypeStruct* ts = (TypeStruct*)e1type;
-            arrptr = DtoIndexStruct(l->getRVal(), ts->sym, vd);
-        }
-        // indexing class
-        else if (e1type->ty == Tclass) {
+        Logger::cout() << "indexing indexing class: " << '\n';
-            TypeClass* tc = (TypeClass*)e1type;
-            arrptr = DtoIndexClass(l->getRVal(), tc->sym, vd);
-        }
@@ -1172 +1175 @@
-        else {
-            Logger::println("normal this exp");
-            v = p->func()->thisArg;
+        if( type->toBasetype()->ty == Tstruct ) v = DtoLoad(v);
-        }
-        return new DVarValue(type, vd, v);
-    }

a/gen/toobj.cpp

@@ -7 +7 @@
-// in artistic.txt, or the GNU General Public License in gnu.txt.
-// See the included readme.txt for details.
-
+#include <sys/types.h> 
+ #include <sys/wait.h> 
+
-#include <cstddef>
-#include <fstream>
-
@@ -357 +360 @@
-    }
-
-    // Run the compiler to assembly the program.
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-    if (R)
-    {
-        error("Failed to invoke gcc. %s", ErrMsg.c_str());

a/gen/typinf.cpp

@@ -1 +1 @@
-
-
-4
+9
-// All Rights Reserved
-// written by Walter Bright
-// www.digitalmars.com
@@ -116 +116 @@
-    if (!t->vtinfo)
-    {
-#if DMDV2
-
+
+
+
-        t->vtinfo = new TypeInfoConstDeclaration(t);
-    else if (t->isInvariant())
-        t->vtinfo = new TypeInfoInvariantDeclaration(t);
@@ -366 +368 @@
-    assert(0 && "TypeInfoDeclaration::llvmDeclare");
-}
-
+void TypeInfoSharedDeclaration::toDt(dt_t **pdt)
+{
+    assert(0 && "TypeInfoSharedDeclaration::toDt");
+}
-/* ========================================================================= */
-
-void TypeInfoTypedefDeclaration::llvmDeclare()

a/ir/irfuncty.h

@@ -2 +2 @@
-#define LDC_IR_IRFUNCTY_H
-
-#include "ir/ir.h"
-
+//
-
-#include <vector>
-

a/ldc2.conf.in

@@ -1 +1 @@
-[Environment]
-
+ -defaultlib=@RUNTIME_AIO@ -debuglib=@RUNTIME_AIO@