Changeset 694

Timestamp:

07/24/07 01:17:13 (1 year ago)

Author:

Gregor

Message:

MERGE: trunk r693

Files:

• branches/tango/docs/ChangeLog (modified) (1 diff)
• branches/tango/docs/NEWS (modified) (1 diff)
• branches/tango/dsss.conf (modified) (1 diff)
• branches/tango/hcf/path.d (modified) (13 diffs)
• branches/tango/rebuild/aggregate.h (modified) (1 diff)
• branches/tango/rebuild/attrib.c (modified) (1 diff)
• branches/tango/rebuild/cast.c (modified) (2 diffs)
• branches/tango/rebuild/class.c (modified) (1 diff)
• branches/tango/rebuild/constfold.c (modified) (4 diffs)
• branches/tango/rebuild/declaration.c (modified) (1 diff)
• branches/tango/rebuild/delegatize.c (modified) (1 diff)
• branches/tango/rebuild/dsymbol.c (modified) (1 diff)
• branches/tango/rebuild/enum.c (modified) (1 diff)
• branches/tango/rebuild/enum.h (modified) (2 diffs)
• branches/tango/rebuild/expression.c (modified) (25 diffs)
• branches/tango/rebuild/expression.h (modified) (8 diffs)
• branches/tango/rebuild/func.c (modified) (2 diffs)
• branches/tango/rebuild/hdrgen.h (modified) (1 diff)
• branches/tango/rebuild/idgen.c (modified) (4 diffs)
• branches/tango/rebuild/init.c (modified) (1 diff)
• branches/tango/rebuild/init.h (modified) (3 diffs)
• branches/tango/rebuild/inline.c (modified) (9 diffs)
• branches/tango/rebuild/interpret.c (modified) (19 diffs)
• branches/tango/rebuild/lexer.c (modified) (5 diffs)
• branches/tango/rebuild/lexer.h (modified) (1 diff)
• branches/tango/rebuild/link.c (modified) (1 diff)
• branches/tango/rebuild/mars.c (modified) (7 diffs)
• branches/tango/rebuild/mars.h (modified) (2 diffs)
• branches/tango/rebuild/module.c (modified) (1 diff)
• branches/tango/rebuild/mtype.c (modified) (13 diffs)
• branches/tango/rebuild/mtype.h (modified) (1 diff)
• branches/tango/rebuild/optimize.c (modified) (4 diffs)
• branches/tango/rebuild/parse.c (modified) (3 diffs)
• branches/tango/rebuild/rebuild.conf/gdc-posix (modified) (1 diff)
• branches/tango/rebuild/rebuild.conf/gdc-posix-tango (modified) (1 diff)
• branches/tango/rebuild/rebuild.exe (modified) (previous)
• branches/tango/rebuild/rebuild_choosedc.exe (modified) (previous)
• branches/tango/rebuild/scope.c (modified) (7 diffs)
• branches/tango/rebuild/scope.h (modified) (1 diff)
• branches/tango/rebuild/statement.c (modified) (23 diffs)
• branches/tango/rebuild/statement.h (modified) (3 diffs)
• branches/tango/rebuild/staticassert.c (modified) (2 diffs)
• branches/tango/rebuild/struct.c (modified) (1 diff)
• branches/tango/rebuild/template.c (modified) (9 diffs)
• branches/tango/sss/build.d (modified) (3 diffs)
• branches/tango/sss/clean.d (modified) (3 diffs)
• branches/tango/sss/conf.d (modified) (11 diffs)
• branches/tango/sss/dsss_lib_test.d (copied) (copied from trunk/sss/dsss_lib_test.d)
• branches/tango/sss/main.d (modified) (4 diffs)
• branches/tango/sss/uninstall.d (modified) (2 diffs)

branches/tango/docs/ChangeLog

@@ -1 @@
-
+
+
+
+
-        - Rebuild: -of<name> now converts / to \ on Windows (see ticket #85).
-        - `dsss uninstall` now removes (empty) directories as well as files
-          (see ticket #84).
+        - Rebuild: Merged DMD 1.018.
+        - Rebuild: Added proper documentation for -Dq (see ticket #90).
+        - /etc will now be preferred to /usr/etc when installing to the prefix
+          /usr.
+        - Rebuild: Added -no-export-dynamic flag (see ticket #91).
-
-0.67 from 0.66:

branches/tango/docs/NEWS

@@ -1 @@
-
+
+
+
-
-2007-06-25: DSSS and Rebuild 0.66 released.

branches/tango/dsss.conf

@@ -29 +29 @@
-# Install this as a sourcelibrary, so it will work on any platform/compiler combination
-type = sourcelibrary
+exclude = sss/dsss_lib_test.d sss/dsssdll.d sss/main.d sss/stub.d
+buildflags = -Irebuild
+
+# dsss_lib_test is special, so put it in share/
+postinstall = install sss/dsss_lib_test.d $PREFIX/share/dsss
-
-version (Windows) {

branches/tango/hcf/path.d

@@ -29 +29 @@
-module hcf.path;
-
+import tango.io.FileConst;
+import tango.io.FilePath;
+import tango.io.FileSystem;
+
+import tango.text.String;
+import tango.text.Util;
+
+import tango.stdc.stdlib;
+import tango.stdc.stringz;
+
+version (Posix) {
+    import tango.stdc.posix.sys.stat;
+}
+
-version (Windows) {
-    import bcd.windows.windows;
-}
-
+/* Simple getDirName, etc */
+char[] getDirName(char[] fname)
+{
+    return (new FilePath(fname)).path();
+}
+char[] getBaseName(char[] fname)
+{
+    return (new FilePath(fname)).file();
+}
+char[] getName(char[] fname)
+{
+    return (new FilePath(fname)).name();
+}
+char[] getExt(char[] fname)
+{
+    return (new FilePath(fname)).ext();
+}
+
-/** Get the system PATH */
-char[][] getPath()
-{
-toString(getenv("PATH")), std.path.pathsep
+fromUtf8z(getenv("PATH")), FileConst.SystemPathChar~""
-}
-
@@ -53 +85 @@
-    // is this a directory?
-    if (dir != "") {
-std.path.isabs(dir
+(new FilePath(dir)).isAbsolute(
-            // make it absolute
-getcwd() ~ std.path.sep
+FileSystem.getDirectory() ~ FileConst.PathSeparatorChar
-        }
-        return true;
@@ -62 +94 @@
-    version (Windows) {
-        // is it in cwd?
-getcwd
-exists(cwd ~ std.path.sep ~ bname
+FileSystem.getDirectory
+(new FilePath(cwd ~ FileConst.PathSeparatorChar ~ bname)).exists(
-            dir = cwd;
-            return true;
@@ -72 +104 @@
-    char[][] path = getPath();
-    foreach (pe; path) {
-std.path.sep
-exists(fullname
-
+FileConst.PathSeparatorChar
+(new FilePath(fullname)).exists(
+//
-                dir = pe;
-                return true;
-
-
+
+
+
+
-                    dir = pe;
-                    return true;
-                }
-
+*/
-        }
-    }
@@ -107 +141 @@
-    
-    // expand tildes
-ret = expandTilde(ret);
+// ret = expandTilde(ret); FIXME
-    
-    // get rid of any duplicate separators
-    for (int i = 0; i < ret.length; i++) {
-sep
+FileConst.PathSeparatorChar~""
-            // drop the duplicate separator
-            i++;
-            while (i < ret.length &&
-sep
+FileConst.PathSeparatorChar~""
-                ret = ret[0 .. i] ~ ret[(i + 1) .. $];
-            }
@@ -122 +156 @@
-    
-    // make sure we don't miss a .. element
-std.path.sep
-std.path.sep
+FileConst.PathSeparatorChar
+FileConst.PathSeparatorChar
-    }
-    
-    // or a . element
-std.path.sep
-std.path.sep
+FileConst.PathSeparatorChar
+FileConst.PathSeparatorChar
-    }
-    
-    // search for .. elements
-    for (int i = 0; ret.length > 4 && i <= ret.length - 4; i++) {
-std.path.sep ~ ".." ~ std.path.sep
+FileConst.PathSeparatorChar ~ ".." ~ FileConst.PathSeparatorChar
-            // drop the previous path element
-            int j;
-std.path.sep
+FileConst.PathSeparatorChar~""
-            if (j > 0) {
-                // cut
@@ -142 +176 @@
-            } else {
-                // sort of ridiculous, but cut as best we can
-std.path.sep
+FileConst.PathSeparatorChar
-            }
-            i = j - 1;
@@ -150 +184 @@
-    // search for . elements
-    for (int i = 0; ret.length > 2 && i <= ret.length - 3; i++) {
-std.path.sep ~ "." ~ std.path.sep
+FileConst.PathSeparatorChar ~ "." ~ FileConst.PathSeparatorChar
-            // drop this path element
-            ret = ret[0..i] ~ ret[(i + 2) .. $];
@@ -159 +193 @@
-    // finally, get rid of any trailing separators
-    while (ret.length &&
-sep
+FileConst.PathSeparatorChar~""
-        ret = ret[0 .. ($ - 1)];
-    }
@@ -175 +209 @@
-    
-    // split it into elements
-sep
+FileConst.PathSeparatorChar~""
-    
-    char[] curdir;
@@ -182 +216 @@
-    if (dires.length &&
-        dires[0] == "") {
-std.path.sep
+FileConst.PathSeparatorChar~""
-        dires = dires[1..$];
-    }
@@ -189 +223 @@
-    foreach (dire; dires) {
-        if (curdir.length) {
-sep
+FileConst.PathSeparatorChar
-        } else {
-            curdir ~= dire;
-        }
-        
-exists(curdir
-mkdir(curdir
+(new FilePath(curdir)).exists(
+(new FilePath(curdir)).createFolder(
-        }
-    }
@@ -205 +239 @@
-    // can only delete writable files on Windows
-    version (Windows) {
-String
-String
+Utf8
+Utf8
-                           ~FILE_ATTRIBUTE_READONLY);
-    }
-    
-isdir(name
-listdir(name
+(new FilePath(name)).isDir(
+(new FilePath(name)).toList(
-            // don't delete . or ..
-            if (elem == "." ||
-                elem == "..") continue;
-std.path.sep
+FileConst.PathSeparatorChar
-        }
-        
-        // remove the directory itself
-rmdir(name
+(new FilePath(name)).remove(
-    } else {
-std.file.remove(name
-
-
+(new FilePath(name)).remove(
+
+

branches/tango/rebuild/aggregate.h

@@ -44 +44 @@
-    unsigned alignsize;     // size of struct for alignment purposes
-    unsigned structalign;   // struct member alignment in effect
+    int hasUnions;      // set if aggregate has overlapping fields
-    Array fields;       // VarDeclaration fields
-    unsigned sizeok;        // set when structsize contains valid data

branches/tango/rebuild/attrib.c

@@ -1208 +1208 @@
-    Parser p(sc->module, (unsigned char *)se->string, se->len, 0);
-    p.loc = loc;
+    p.nextToken();
-    decl = p.parseDeclDefs(0);
-    if (p.token.value != TOKeof)

branches/tango/rebuild/cast.c

@@ -333 +333 @@
-{   MATCH m;
-
-
+
+
+
+
-    if (!committed)
-    {
@@ -351 +354 @@
-            ((TypeSArray *)t)->dim->toInteger())
-            return MATCHnomatch;
+            goto L1;
-        case Tarray:
+            goto L1;
-        case Tpointer:
+        L1:
-            if (t->next->ty == Tchar)
-            return MATCHexact;

branches/tango/rebuild/class.c

@@ -524 +524 @@
-    structalign = 0;
-
-
+ = sc
-
-    scope = scx ? scx : new Scope(*sc);

branches/tango/rebuild/constfold.c

@@ -684 +684 @@
-    real_t r2;
-
+    //printf("Equal(e1 = %s, e2 = %s)\n", e1->toChars(), e2->toChars());
+
-    assert(op == TOKequal || op == TOKnotequal);
-
@@ -714 +716 @@
-        Expression *ee2 = (Expression *)es2->elements->data[i];
-
+        Expression *v = Equal(TOKequal, Type::tint32, ee1, ee2);
+        if (v == EXP_CANT_INTERPRET)
+            return EXP_CANT_INTERPRET;
+        cmp = v->toInteger();
+        if (cmp == 0)
+            break;
+        }
+    }
+    }
+    else if (e1->op == TOKstructliteral && e2->op == TOKstructliteral)
+    {   StructLiteralExp *es1 = (StructLiteralExp *)e1;
+    StructLiteralExp *es2 = (StructLiteralExp *)e2;
+
+    if (es1->sd != es2->sd)
+        cmp = 0;
+    else if ((!es1->elements || !es1->elements->dim) &&
+        (!es2->elements || !es2->elements->dim))
+        cmp = 1;        // both arrays are empty
+    else if (!es1->elements || !es2->elements)
+        cmp = 0;
+    else if (es1->elements->dim != es2->elements->dim)
+        cmp = 0;
+    else
+    {
+        cmp = 1;
+        for (size_t i = 0; i < es1->elements->dim; i++)
+        {   Expression *ee1 = (Expression *)es1->elements->data[i];
+        Expression *ee2 = (Expression *)es2->elements->data[i];
+
+        if (ee1 == ee2)
+            continue;
+        if (!ee1 || !ee2)
+        {   cmp = 0;
+            break;
+        }
-        Expression *v = Equal(TOKequal, Type::tint32, ee1, ee2);
-        if (v == EXP_CANT_INTERPRET)
@@ -1057 +1094 @@
-    Loc loc = e1->loc;
-
-)\n", e1
+, e2 = %s)\n", e1->toChars(), e2
-    assert(e1->type);
-    if (e1->op == TOKstring && e2->op == TOKint64)
@@ -1405 +1442 @@
-}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

branches/tango/rebuild/declaration.c

@@ -802 +802 @@
-    if (init)
-    {
+    ArrayInitializer *ai = init->isArrayInitializer();
+    if (ai && type->toBasetype()->ty == Taarray)
+    {
+        init = ai->toAssocArrayInitializer();
+    }
+
-    ExpInitializer *ei = init->isExpInitializer();
-

branches/tango/rebuild/delegatize.c

@@ -185 +185 @@
-
-
+void StructLiteralExp::scanForNestedRef(Scope *sc)
+{
+    arrayExpressionScanForNestedRef(sc, elements);
+}
+
+
-void TupleExp::scanForNestedRef(Scope *sc)
-{

branches/tango/rebuild/dsymbol.c

@@ -871 +871 @@
-        v->storage_class |= STCconst;
-        }
+        else if (ce->op == TOKarrayliteral)
+        {   /* It is for an array literal, so the
+         * length will be a const.
+         */
+        Expression *e = new IntegerExp(0, ((ArrayLiteralExp *)ce)->elements->dim, Type::tsize_t);
+        v->init = new ExpInitializer(0, e);
+        v->storage_class |= STCconst;
+        }
-        else if (ce->op == TOKtuple)
-        {   /* It is for an expression tuple, so the

branches/tango/rebuild/enum.c

@@ -27 +27 @@
-    minval = 0;
-    defaultval = 0;
+    sinit = NULL;
-}
-

branches/tango/rebuild/enum.h

@@ -26 +26 @@
-#endif
-
+
-struct EnumDeclaration : ScopeDsymbol
-{
@@ -48 +49 @@
-
-    void toDebug();
+
+    Symbol *sinit;
+    Symbol *toInitializer();
-};
-

branches/tango/rebuild/expression.c

@@ -303 +303 @@
-void expandTuples(Expressions *exps)
-{
+    //printf("expandTuples()\n");
-    if (exps)
-    {
-    for (size_t i = 0; i < exps->dim; i++)
-    {   Expression *arg = (Expression *)exps->data[i];
+        if (!arg)
+        continue;
+
+        // Look for tuple with 0 members
+        if (arg->op == TOKtype)
+        {   TypeExp *e = (TypeExp *)arg;
+        if (e->type->toBasetype()->ty == Ttuple)
+        {   TypeTuple *tt = (TypeTuple *)e->type->toBasetype();
+
+            if (!tt->arguments || tt->arguments->dim == 0)
+            {
+            exps->remove(i);
+            if (i == exps->dim)
+                return;
+            i--;
+            continue;
+            }
+        }
+        }
-
-        // Inline expand all the tuples
@@ -663 +683 @@
-    Expression *e;
-    if (!size)
+    {
+#ifdef DEBUG
-    fprintf(stdmsg, "No expression copy for: %s\n", toChars());
+    printf("op = %d\n", op);
+    dump(0);
+#endif
+    assert(0);
+    }
-    e = (Expression *)mem.malloc(size);
-    return (Expression *)memcpy(e, this, size);
@@ -856 +883 @@
-{
-    /*if (flag == 0)
-
-
+
+
+
+
+
+
+
+
-    return 0;
-}
@@ -1007 +1040 @@
-char *IntegerExp::toChars()
-{
+#if 1
+    return Expression::toChars();
+#else
-    static char buffer[sizeof(value) * 3 + 1];
-
-    sprintf(buffer, "%jd", value);
-    return buffer;
+#endif
-}
-
@@ -2350 +2387 @@
-        case '"':
-        case '\\':
-
+
+
-        default:
-        if (c <= 0xFF)
-isprint(c
+(isprint(c) || hgs->console
-            buf->writeByte(c);
-            else
@@ -2433 +2471 @@
-}
-
+ArrayLiteralExp::ArrayLiteralExp(Loc loc, Expression *e)
+    : Expression(loc, TOKarrayliteral, sizeof(ArrayLiteralExp))
+{
+    elements = new Expressions;
+    elements->push(e);
+}
+
-Expression *ArrayLiteralExp::syntaxCopy()
-{
@@ -2459 +2504 @@
-        error("%s has no value", e->toChars()); */
-    e = resolveProperties(sc, e);
+
+    unsigned char committed = 1;
+    if (e->op == TOKstring)
+        committed = ((StringExp *)e)->committed;
+
-    if (!t0)
-    {   t0 = e->type;
@@ -2470 +2520 @@
-    else
-        e = e->implicitCastTo(sc, t0);
+    if (!committed && e->op == TOKstring)
+    {   StringExp *se = (StringExp *)e;
+        se->committed = 0;
+    }
-    elements->data[i] = (void *)e;
-    }
@@ -2643 +2697 @@
-    key->toMangleBuffer(buf);
-    value->toMangleBuffer(buf);
+    }
+}
+
+/************************ StructLiteralExp ************************************/
+
+// sd( e1, e2, e3, ... )
+
+StructLiteralExp::StructLiteralExp(Loc loc, StructDeclaration *sd, Expressions *elements)
+    : Expression(loc, TOKstructliteral, sizeof(StructLiteralExp))
+{
+    this->sd = sd;
+    this->elements = elements;
+    this->sym = NULL;
+    this->soffset = 0;
+    this->fillHoles = 1;
+}
+
+Expression *StructLiteralExp::syntaxCopy()
+{
+    return new StructLiteralExp(loc, sd, arraySyntaxCopy(elements));
+}
+
+Expression *StructLiteralExp::semantic(Scope *sc)
+{   Expression *e;
+
+#if LOGSEMANTIC
+    printf("StructLiteralExp::semantic('%s')\n", toChars());
+#endif
+
+    // Run semantic() on each element
+    for (size_t i = 0; i < elements->dim; i++)
+    {   e = (Expression *)elements->data[i];
+    if (!e)
+        continue;
+    e = e->semantic(sc);
+    elements->data[i] = (void *)e;
+    }
+    expandTuples(elements);
+    size_t offset = 0;
+    for (size_t i = 0; i < elements->dim; i++)
+    {   e = (Expression *)elements->data[i];
+    if (!e)
+        continue;
+
+    if (!e->type)
+        error("%s has no value", e->toChars());
+    e = resolveProperties(sc, e);
+    if (i >= sd->fields.dim)
+    {   error("more initializers than fields of %s", sd->toChars());
+        break;
+    }
+    Dsymbol *s = (Dsymbol *)sd->fields.data[i];
+    VarDeclaration *v = s->isVarDeclaration();
+    assert(v);
+    if (v->offset < offset)
+        error("overlapping initialization for %s", v->toChars());
+    offset = v->offset + v->type->size();
+
+    Type *telem = v->type;
+    while (!e->implicitConvTo(telem) && telem->toBasetype()->ty == Tsarray)
+    {   /* Static array initialization, as in:
+         *  T[3][5] = e;
+         */
+        telem = telem->toBasetype()->nextOf();
+    }
+
+    e = e->implicitCastTo(sc, telem);
+
+    elements->data[i] = (void *)e;
+    }
+
+    /* Fill out remainder of elements[] with default initializers for fields[]
+     */
+    for (size_t i = elements->dim; i < sd->fields.dim; i++)
+    {   Dsymbol *s = (Dsymbol *)sd->fields.data[i];
+    VarDeclaration *v = s->isVarDeclaration();
+    assert(v);
+
+    if (v->offset < offset)
+    {   e = NULL;
+        sd->hasUnions = 1;
+    }
+    else
+    {
+        if (v->init)
+        {   e = v->init->toExpression();
+        if (!e)
+            error("cannot make expression out of initializer for %s", v->toChars());
+        }
+        else
+        {   e = v->type->defaultInit();
+        e->loc = loc;
+        }
+        offset = v->offset + v->type->size();
+    }
+    elements->push(e);
+    }
+
+    type = sd->type;
+    return this;
+}
+
+/**************************************
+ * Gets expression at offset of type.
+ * Returns NULL if not found.
+ */
+
+Expression *StructLiteralExp::getField(Type *type, unsigned offset)
+{   Expression *e = NULL;
+    int i = getFieldIndex(type, offset);
+
+    if (i != -1)
+    {   e = (Expression *)elements->data[i];
+    if (e)
+    {
+        e = e->copy();
+        e->type = type;
+    }
+    }
+    return e;
+}
+
+/************************************
+ * Get index of field.
+ * Returns -1 if not found. 
+ */
+
+int StructLiteralExp::getFieldIndex(Type *type, unsigned offset)
+{
+    /* Find which field offset is by looking at the field offsets
+     */
+    for (size_t i = 0; i < sd->fields.dim; i++)
+    {
+    Dsymbol *s = (Dsymbol *)sd->fields.data[i];
+    VarDeclaration *v = s->isVarDeclaration();
+    assert(v);
+
+    if (offset == v->offset &&
+        type->size() == v->type->size())
+    {   Expression *e = (Expression *)elements->data[i];
+        if (e)
+        {
+        return i;
+        }
+        break;
+    }
+    }
+    return -1;
+}
+
+
+Expression *StructLiteralExp::toLvalue(Scope *sc, Expression *e)
+{
+    return this;
+}
+
+
+int StructLiteralExp::checkSideEffect(int flag)
+{   int f = 0;
+
+    for (size_t i = 0; i < elements->dim; i++)
+    {   Expression *e = (Expression *)elements->data[i];
+    if (!e)
+        continue;
+
+    f |= e->checkSideEffect(2);
+    }
+    if (flag == 0 && f == 0)
+    Expression::checkSideEffect(0);
+    return f;
+}
+
+void StructLiteralExp::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
+{
+    buf->writestring(sd->toChars());
+    buf->writeByte('(');
+    argsToCBuffer(buf, elements, hgs);
+    buf->writeByte(')');
+}
+
+void StructLiteralExp::toMangleBuffer(OutBuffer *buf)
+{
+    size_t dim = elements ? elements->dim : 0;
+    buf->printf("S%u", dim);
+    for (size_t i = 0; i < dim; i++)
+    {   Expression *e = (Expression *)elements->data[i];
+    if (e)
+        e->toMangleBuffer(buf);
+    else
+        buf->writeByte('v');    // 'v' for void
-    }
-}
@@ -3212 +3456 @@
-    if (v)
-    {
-
-
+ 
+variable 
-    }
-}
@@ -4189 +4433 @@
-    if (e1->op != TOKstring)
-    {   //error("argument to mixin must be a string, not (%s)", e1->toChars());
+    type = Type::terror;
-    return this;
-    }
@@ -4195 +4440 @@
-    Parser p(sc->module, (unsigned char *)se->string, se->len, 0);
-    p.loc = loc;
+    p.nextToken();
-    Expression *e = p.parseExpression();
-    /* if (p.token.value != TOKeof)
@@ -4563 +4809 @@
-        assert(0);
-    }
+    else if (ident == Id::stringof)
+    {   char *s = ie->toChars();
+        e = new StringExp(loc, s, strlen(s), 'c');
+        e = e->semantic(sc);
+        return e;
+    }
-    //error("undefined identifier %s", toChars());
-    type = Type::tvoid;
@@ -5158 +5410 @@
-        e1 = e1->semantic(sc);
-    }
+#if 1   // patch for #540 by Oskar Linde
+    else if (e1->op == TOKdotexp)
+    {
+        DotExp *de = (DotExp *) e1;
+
+        if (de->e2->op == TOKimport)
+        {   // This should *really* be moved to ScopeExp::semantic()
+        ScopeExp *se = (ScopeExp *)de->e2;
+        de->e2 = new DsymbolExp(loc, se->sds);
+        de->e2 = de->e2->semantic(sc);
+        }
+
+        if (de->e2->op == TOKtemplate)
+        {   TemplateExp *te = (TemplateExp *) de->e2;
+        e1 = new DotTemplateExp(loc,de->e1,te->td);
+        }
+    }
+#endif
-    }
-
@@ -5179 +5449 @@
-    {   AggregateDeclaration *ad;
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-    {
-        ad = ((TypeClass *)t1)->sym;
-        goto L1;
-    }
-    else if (t1->ty == Tstruct)
-    {
-        ad = ((TypeStruct *)t1)->sym;
-    L1:
-        // Rewrite as e1.call(arguments)
@@ -5953 +6230 @@
-    if (v)
-    {
-
+ && !v->isParameter()
-        error("escaping reference to local %s", v->toChars()); */
-    }
@@ -6375 +6652 @@
-    : BinExp(loc, TOKindex, sizeof(IndexExp), e1, e2)
-{
+    //printf("IndexExp::IndexExp('%s')\n", toChars());
-    lengthVar = NULL;
-    modifiable = 0; // assume it is an rvalue
@@ -6391 +6669 @@
-    if (type)
-    return this;
+    if (!e1->type)
+    e1 = e1->semantic(sc);
-    assert(e1->type);       // semantic() should already be run on it
-    e = this;
@@ -6576 +6856 @@
-    : BinExp(loc, TOKassign, sizeof(AssignExp), e1, e2)
-{
+    ismemset = 0;
-}
-
@@ -6950 +7231 @@
-    else
-    {
-Can only append to dynamic arrays, not %s ~=