Changeset 523

Timestamp:

04/19/07 18:22:23 (1 year ago)

Author:

Gregor

Message:

Thu Apr 19 13:50:24 PDT 2007 Richards@codu.org

• MERGE: DMD 1.013
  

Thu Apr 19 13:46:10 PDT 2007 Richards@codu.org

• Local branch.
  

Files:

• branches/dmdfe/cast.c (modified) (2 diffs)
• branches/dmdfe/constfold.c (modified) (2 diffs)
• branches/dmdfe/declaration.c (modified) (1 diff)
• branches/dmdfe/expression.c (modified) (5 diffs)
• branches/dmdfe/expression.h (modified) (1 diff)
• branches/dmdfe/interpret.c (modified) (8 diffs)
• branches/dmdfe/link.c (modified) (4 diffs)
• branches/dmdfe/mars.c (modified) (1 diff)
• branches/dmdfe/mtype.c (modified) (4 diffs)
• branches/dmdfe/opover.c (modified) (2 diffs)
• branches/dmdfe/optimize.c (modified) (3 diffs)
• branches/dmdfe/parse.c (modified) (7 diffs)
• branches/dmdfe/port.h (modified) (1 diff)
• branches/dmdfe/statement.c (modified) (1 diff)

branches/dmdfe/cast.c

@@ -404 +404 @@
-}
-
+int AssocArrayLiteralExp::implicitConvTo(Type *t)
+{   MATCH result = MATCHexact;
+
+    Type *typeb = type->toBasetype();
+    Type *tb = t->toBasetype();
+    if (tb->ty == Taarray && typeb->ty == Taarray)
+    {
+    for (size_t i = 0; i < keys->dim; i++)
+    {   Expression *e = (Expression *)keys->data[i];
+        MATCH m = (MATCH)e->implicitConvTo(((TypeAArray *)tb)->key);
+        if (m < result)
+        result = m;         // remember worst match
+        if (result == MATCHnomatch)
+        break;              // no need to check for worse
+        e = (Expression *)values->data[i];
+        m = (MATCH)e->implicitConvTo(tb->next);
+        if (m < result)
+        result = m;         // remember worst match
+        if (result == MATCHnomatch)
+        break;              // no need to check for worse
+    }
+    return result;
+    }
+    else
+    return Expression::implicitConvTo(t);
+}
+
-int AddrExp::implicitConvTo(Type *t)
-{
@@ -919 +946 @@
-    {
-    type = typeb->next->pointerTo();
+    }
+L1:
+    return Expression::castTo(sc, t);
+}
+
+Expression *AssocArrayLiteralExp::castTo(Scope *sc, Type *t)
+{
+    Type *typeb = type->toBasetype();
+    Type *tb = t->toBasetype();
+    if (tb->ty == Taarray && typeb->ty == Taarray &&
+    tb->next->toBasetype()->ty != Tvoid)
+    {
+    assert(keys->dim == values->dim);
+    for (size_t i = 0; i < keys->dim; i++)
+    {   Expression *e = (Expression *)values->data[i];
+        e = e->castTo(sc, tb->next);
+        values->data[i] = (void *)e;
+
+        e = (Expression *)keys->data[i];
+        e = e->castTo(sc, ((TypeAArray *)tb)->key);
+        keys->data[i] = (void *)e;
+    }
+    type = t;
+    return this;
-    }
-L1:

branches/dmdfe/constfold.c

@@ -1019 +1019 @@
-    e = new IntegerExp(loc, dim, type);
-    }
+    else if (e1->op == TOKassocarrayliteral)
+    {   AssocArrayLiteralExp *ale = (AssocArrayLiteralExp *)e1;
+    size_t dim = ale->keys->dim;
+
+    e = new IntegerExp(loc, dim, type);
+    }
-    else
-    e = EXP_CANT_INTERPRET;
@@ -1088 +1094 @@
-        {   e = (Expression *)ale->elements->data[i];
-        e->type = type;
+        }
+    }
+    }
+    else if (e1->op == TOKassocarrayliteral && !e1->checkSideEffect(2))
+    {
+    AssocArrayLiteralExp *ae = (AssocArrayLiteralExp *)e1;
+    /* Search the keys backwards, in case there are duplicate keys
+     */
+    for (size_t i = ae->keys->dim; i;)
+    {
+        i--;
+        Expression *ekey = (Expression *)ae->keys->data[i];
+        Expression *ex = Equal(TOKequal, Type::tbool, ekey, e2);
+        if (ex == EXP_CANT_INTERPRET)
+        return ex;
+        if (ex->isBool(TRUE))
+        {   e = (Expression *)ae->values->data[i];
+        e->type = type;
+        break;
-        }
-    }

branches/dmdfe/declaration.c

@@ -597 +597 @@
-{
-    //printf("VarDeclaration::semantic('%s', parent = '%s')\n", toChars(), sc->parent->toChars());
+    //printf("type = %s\n", type->toChars());
+    //printf("linkage = %d\n", sc->linkage);
-    //if (strcmp(toChars(), "mul") == 0) halt();
-

branches/dmdfe/expression.c

@@ -43 +43 @@
-#endif
-
-
+//
-#include "mtype.h"
-#include "init.h"
@@ -3415 +3415 @@
-        exps->push(e);
-    }
+    else if (o->dyncast() == DYNCAST_TYPE)
+    {
+        Type *t = (Type *)o;
+        Expression *e = new TypeExp(loc, t);
+        exps->push(e);
+    }
-    else
-    {
@@ -4174 +4180 @@
-Expression *CompileExp::semantic(Scope *sc)
-{
-1 || 
+
-    printf("CompileExp::semantic('%s')\n", toChars());
-#endif
@@ -4180 +4186 @@
-    e1 = resolveProperties(sc, e1);
-    e1 = e1->optimize(WANTvalue | WANTinterpret);
-e1->print();
-    if (e1->op != TOKstring)
-    {   error("argument to mixin must be a string, not (%s)", e1->toChars());
@@ -5923 +5928 @@
-    }
-    }
-
+
+
-}
-

branches/dmdfe/expression.h

@@ -368 +368 @@
-    Expression *optimize(int result);
-    Expression *interpret(InterState *istate);
+    int implicitConvTo(Type *t);
+    Expression *castTo(Scope *sc, Type *t);
-
-    int inlineCost(InlineCostState *ics);

branches/dmdfe/interpret.c

@@ -992 +992 @@
-
-Expression *AssocArrayLiteralExp::interpret(InterState *istate)
-NULL
-NULL
+keys
+values
-
-#if LOG
@@ -1005 +1005 @@
-    ex = ekey->interpret(istate);
-    if (ex == EXP_CANT_INTERPRET)
-
-
-
-
+
-
-    /* If any changes, do Copy On Write
@@ -1014 +1011 @@
-    if (ex != ekey)
-    {
-
-
-
-
-
-
-
-
+
+
-        keysx->data[i] = (void *)ex;
-    }
@@ -1027 +1018 @@
-    ex = evalue->interpret(istate);
-    if (ex == EXP_CANT_INTERPRET)
-
-
-
-
+
-
-    /* If any changes, do Copy On Write
@@ -1036 +1024 @@
-    if (ex != evalue)
-    {
-
-
-
-
-
-
-
-
+
+
-        valuesx->data[i] = (void *)ex;
-    }
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    ae->type = type;
-    return ae;
-    }
-    return this;
+
+Lerr:
+    if (keysx != keys)
+    delete keysx;
+    if (valuesx != values)
+    delete values;
+    return EXP_CANT_INTERPRET;
-}
-
@@ -1201 +1212 @@
-    }
-    }
-
+
+
+
-    {
-    VarExp *ve = (VarExp *)e1;
@@ -1460 +1473 @@
-    if (e1 == EXP_CANT_INTERPRET)
-    goto Lcant;
-
+ || e1->op == TOKassocarrayliteral
-    {
-    e = ArrayLength(type, e1);
@@ -1484 +1497 @@
-    goto Lcant;
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-    e2 = this->e2->interpret(istate);

branches/dmdfe/link.c

@@ -1 +1 @@
-
-
-6
+7
-// All Rights Reserved
-// written by Walter Bright
@@ -144 +144 @@
-    p = cmdbuf.toChars();
-
+    FileName *lnkfilename = NULL;
+    size_t plen = strlen(p);
+    if (plen > 7000)
+    {
+    lnkfilename = FileName::forceExt(global.params.exefile, "lnk");
+    File flnk(lnkfilename);
+    flnk.setbuffer(p, plen);
+    flnk.ref = 1;
+    if (flnk.write())
+        error("error writing file %s", lnkfilename);
+    if (lnkfilename->len() < plen)
+        sprintf(p, "@%s", lnkfilename->toChars());
+    }
+
-    char *linkcmd = getenv("LINKCMD");
-    if (!linkcmd)
-    linkcmd = "link";
-    status = executecmd(linkcmd, p, 1);
+    if (lnkfilename)
+    {
+    remove(lnkfilename->toChars());
+    delete lnkfilename;
+    }
-    return status;
-#else
@@ -204 +223 @@
-    argv.push((void *)"-m32");
-
-    argv.push((void *)"-lphobos");  // turns into /usr/lib/libphobos.a
-    argv.push((void *)"-lpthread");
-    argv.push((void *)"-lm");
-
-    if (0 && global.params.exefile)
-    {
@@ -224 +239 @@
-
-    for (i = 0; i < global.params.linkswitches->dim; i++)
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    if (!global.params.quiet)

branches/dmdfe/mars.c

@@ -56 +56 @@
-    copyright = "Copyright (c) 1999-2007 by Digital Mars";
-    written = "written by Walter Bright";
-2
+3
-    global.structalign = 8;
-

branches/dmdfe/mtype.c

@@ -1680 +1680 @@
-}
-
+Expression *semanticLength(Scope *sc, TupleDeclaration *s, Expression *exp)
+{
+    ScopeDsymbol *sym = new ArrayScopeSymbol(s);
+    sym->parent = sc->scopesym;
+    sc = sc->push(sym);
+
+    exp = exp->semantic(sc);
+
+    sc->pop();
+    return exp;
+}
+
-void TypeSArray::resolve(Loc loc, Scope *sc, Expression **pe, Type **pt, Dsymbol **ps)
-{
@@ -1748 +1760 @@
-{
-    //printf("TypeSArray::semantic() %s\n", toChars());
+
+    Type *t;
+    Expression *e;
+    Dsymbol *s;
+    next->resolve(loc, sc, &e, &t, &s);
+    if (dim && s && s->isTupleDeclaration())
+    {   TupleDeclaration *sd = s->isTupleDeclaration();
+
+    dim = semanticLength(sc, sd, dim);
+    dim = dim->optimize(WANTvalue | WANTinterpret);
+    uinteger_t d = dim->toUInteger();
+
+    if (d >= sd->objects->dim)
+    {   error(loc, "tuple index %ju exceeds %u", d, sd->objects->dim);
+        return Type::terror;
+    }
+    Object *o = (Object *)sd->objects->data[(size_t)d];
+    if (o->dyncast() != DYNCAST_TYPE)
+    {   error(loc, "%s is not a type", toChars());
+        return Type::terror;
+    }
+    t = (Type *)o;
+    return t;
+    }
+
-    next = next->semantic(loc,sc);
-    Type *tbn = next->toBasetype();
@@ -1765 +1802 @@
-        goto Loverflow;
-
-
-
-
+
-         tbn->isfloating() ||
-         tbn->ty == Tpointer ||
@@ -2207 +2242 @@
-    FuncDeclaration *fd;
-    Expressions *arguments;
-    char aakeys[7+3*sizeof(int)+1];
-    int size = key->size(e->loc);
-
-    assert(size);
-
-
-
-
-
-
-
-
-
-
+
-    ec = new VarExp(0, fd);
-    arguments = new Expressions();
-    arguments->push(e);
-
-
+
-    e = new CallExp(e->loc, ec, arguments);
-    e->type = index->arrayOf();

branches/dmdfe/opover.c

@@ -1 +1 @@
-
-// Compiler implementation of the D programming language
-6
+7
-// All Rights Reserved
-// written by Walter Bright
@@ -27 +27 @@
-#endif
-
-
+//
-#include "mtype.h"
-#include "init.h"

branches/dmdfe/optimize.c

@@ -265 +265 @@
-    //printf("CastExp::optimize(result = %d) %s\n", result, toChars());
-    //printf("from %s to %s\n", type->toChars(), to->toChars());
+    //printf("from %s\n", type->toChars());
-    //printf("type = %p\n", type);
-    assert(type);
-
-
+
+
+
+
+
+
-    if ((e1->op == TOKstring || e1->op == TOKarrayliteral) &&
-    (type->ty == Tpointer || type->ty == Tarray) &&
@@ -277 +282 @@
-    return e1;
-    }
+    /* The first test here is to prevent infinite loops
+     */
+    if (op1 != TOKarrayliteral && e1->op == TOKarrayliteral)
+    return e1->castTo(NULL, to);
-    if (e1->op == TOKnull &&
-    (type->ty == Tpointer || type->ty == Tclass))
@@ -520 +529 @@
-    e1 = e1->optimize(WANTvalue | (result & WANTinterpret));
-    e = this;
-
+ || e1->op == TOKassocarrayliteral
-    {
-    e = ArrayLength(type, e1);

branches/dmdfe/parse.c

@@ -192 +192 @@
-
-        case TOKinvariant:
+#if 1
+        s = parseInvariant();
+#else
-        if (peek(&token)->value == TOKlcurly)
-            s = parseInvariant();
@@ -199 +202 @@
-            goto Lstc;
-        }
+#endif
-        break;
-
@@ -268 +272 @@
-            case TOKsynchronized: stc |= STCsynchronized; goto Lstc;
-            case TOKdeprecated:   stc |= STCdeprecated;  goto Lstc;
-
+//
-            default:
-            break;
@@ -2002 +2006 @@
-        }
-        v->storage_class = storage_class;
-
+
+
+
+
+
+
+
+
+
-        switch (token.value)
-        {   case TOKsemicolon:
@@ -2062 +2074 @@
-        v = new VarDeclaration(loc, t, ident, init);
-        v->storage_class = storage_class;
-
+
+
+
+
+
+
+
+
+
-        switch (token.value)
-        {   case TOKsemicolon:
@@ -2328 +2348 @@
-    case TOKvoid:
-        t = peek(&token);
-
+ || t->value == TOKcomma
-        {
-        nextToken();
@@ -3962 +3982 @@
-
-    case TOKlbracket:
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        break;
-    }

branches/dmdfe/port.h

@@ -35 +35 @@
-    static double dbl_min;
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-    static double floor(double);

branches/dmdfe/statement.c

@@ -2429 +2429 @@
-        fd->nrvo_can = 0;
-    }
+    else
+        fd->nrvo_can = 0;
-
-    if (fd->returnLabel && tbret->ty != Tvoid)