Changeset 415

Timestamp:

03/12/07 20:50:31 (1 year ago)

Author:

Gregor

Message:

MERGE: DMD 1.009

Files:

• branches/dmdfe/constfold.c (modified) (8 diffs)
• branches/dmdfe/declaration.c (modified) (3 diffs)
• branches/dmdfe/declaration.h (modified) (2 diffs)
• branches/dmdfe/expression.c (modified) (5 diffs)
• branches/dmdfe/expression.h (modified) (3 diffs)
• branches/dmdfe/init.c (modified) (1 diff)
• branches/dmdfe/interpret.c (modified) (15 diffs)
• branches/dmdfe/mangle.c (modified) (3 diffs)
• branches/dmdfe/mars.c (modified) (1 diff)
• branches/dmdfe/mars.h (modified) (1 diff)
• branches/dmdfe/mtype.c (modified) (6 diffs)
• branches/dmdfe/optimize.c (modified) (1 diff)
• branches/dmdfe/statement.c (modified) (2 diffs)
• branches/dmdfe/staticassert.c (modified) (3 diffs)
• branches/dmdfe/tocsym.c (modified) (5 diffs)
• branches/dmdfe/todt.c (modified) (1 diff)

branches/dmdfe/constfold.c

@@ -458 +458 @@
-    n2 = e2->toInteger();
-    if (n2 == 0)
-
+2->e
-        e2 = new IntegerExp(0, 1, e2->type);
-        n2 = 1;
@@ -521 +521 @@
-    n2 = e2->toInteger();
-    if (n2 == 0)
-
+2->e
-        e2 = new IntegerExp(0, 1, e2->type);
-        n2 = 1;
@@ -1030 +1030 @@
-    Loc loc = e1->loc;
-
-
+
+
-    if (e1->op == TOKstring && e2->op == TOKint64)
-    {   StringExp *es1 = (StringExp *)e1;
@@ -1067 +1068 @@
-
-    if (i >= length)
-rror("array index %ju is out of bounds [0 .. %ju]", i
+2->error("array index %ju is out of bounds %s[0 .. %ju]", i, e1->toChars()
-    }
-    else if (e1->op == TOKarrayliteral && !e1->checkSideEffect(2))
@@ -1145 +1146 @@
-{   Expression *e = EXP_CANT_INTERPRET;
-    Loc loc = e1->loc;
+    Type *t;
-
-    //printf("Cat(e1 = %s, e2 = %s)\n", e1->toChars(), e2->toChars());
@@ -1185 +1187 @@
-    return e;
-    }
-
-
+
-    {
-    // Concatenate the strings
@@ -1320 +1321 @@
-    else if (e1->op == TOKnull && e2->op == TOKstring)
-    {
+    t = e1->type;
-    e = e2;
-    goto L1;
@@ -1325 +1327 @@
-    else if (e1->op == TOKstring && e2->op == TOKnull)
-    {   e = e1;
+    t = e2->type;
-      L1:
+    Type *tb = t->toBasetype();
+    if (tb->ty == Tarray && tb->next->equals(e->type))
+    {   Expressions *expressions = new Expressions();
+        expressions->push(e);
+        e = new ArrayLiteralExp(loc, expressions);
+        e->type = t;
+    }
-    if (!e->type->equals(type))
-    {   StringExp *se = (StringExp *)e->copy();

branches/dmdfe/declaration.c

@@ -1 +1 @@
-
-// Compiler implementation of the D programming language
-6
+7
-// All Rights Reserved
-// written by Walter Bright
@@ -149 +149 @@
-
-    return tupletype;
+}
+
+int TupleDeclaration::needThis()
+{
+    //printf("TupleDeclaration::needThis(%s)\n", toChars());
+    for (size_t i = 0; i < objects->dim; i++)
+    {   Object *o = (Object *)objects->data[i];
+    if (o->dyncast() == DYNCAST_EXPRESSION)
+    {   Expression *e = (Expression *)o;
+        if (e->op == TOKdsymbol)
+        {   DsymbolExp *ve = (DsymbolExp *)e;
+        Declaration *d = ve->s->isDeclaration();
+        if (d && d->needThis())
+        {
+            return 1;
+        }
+        }
+    }
+    }
+    return 0;
-}
-
@@ -967 +987 @@
-int VarDeclaration::needThis()
-{
+    //printf("VarDeclaration::needThis(%s, x%x)\n", toChars(), storage_class);
-    return storage_class & STCfield;
-}

branches/dmdfe/declaration.h

@@ -131 +131 @@
-    char *kind();
-    Type *getType();
+    int needThis();
-
-    TupleDeclaration *isTupleDeclaration() { return this; }
@@ -461 +462 @@
-    FuncAliasDeclaration *isFuncAliasDeclaration() { return this; }
-    char *kind();
+    Symbol *toSymbol();
-};
-

branches/dmdfe/expression.c

@@ -1155 +1155 @@
-        }
-        case Tchar:
-
+
+
+
-            buf->printf("'%c'", (int)v);
-        else
@@ -1830 +1832 @@
-    TupleDeclaration *tup = s->isTupleDeclaration();
-    if (tup)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-    e = e->semantic(sc);
-    return e;
@@ -2757 +2744 @@
-    else
-    type = newtype->semantic(loc, sc);
+    newtype = type;     // in case type gets cast to something else
-    tb = type->toBasetype();
-    //printf("tb: %s, deco = %s\n", tb->toChars(), tb->deco);
@@ -3276 +3264 @@
-    this->exps = exps;
-    this->type = NULL;
+}
+
+
+TupleExp::TupleExp(Loc loc, TupleDeclaration *tup)
+    : Expression(loc, TOKtuple, sizeof(TupleExp))
+{
+    exps = new Expressions();
+    type = NULL;
+
+    exps->reserve(tup->objects->dim);
+    for (size_t i = 0; i < tup->objects->dim; i++)
+    {   Object *o = (Object *)tup->objects->data[i];
+    if (o->dyncast() == DYNCAST_EXPRESSION)
+    {
+        Expression *e = (Expression *)o;
+        e = e->syntaxCopy();
+        exps->push(e);
+    }
+    else if (o->dyncast() == DYNCAST_DSYMBOL)
+    {
+        Dsymbol *s = (Dsymbol *)o;
+        Expression *e = new DsymbolExp(loc, s);
+        exps->push(e);
+    }
+    else
+    {
+        error("%s is not an expression", o->toChars());
+    }
+    }
-}
-
@@ -4721 +4738 @@
-    s2 = s->search(loc, id, 0);
-    if (!s2)
-", id->toChars
+ %s", id->toChars(), s->kind
-    goto Lerr;
-    }

branches/dmdfe/expression.h

@@ -19 +19 @@
-struct Type;
-struct Scope;
+struct TupleDeclaration;
-struct VarDeclaration;
-struct FuncDeclaration;
@@ -309 +310 @@
-
-    TupleExp(Loc loc, Expressions *exps);
+    TupleExp(Loc loc, TupleDeclaration *tup);
-    Expression *syntaxCopy();
-    int equals(Object *o);
@@ -1215 +1217 @@
-#define EXP_BREAK_INTERPRET ((Expression *)3)
-#define EXP_GOTO_INTERPRET  ((Expression *)4)
+#define EXP_VOID_INTERPRET  ((Expression *)5)
-
-Expression *expType(Type *type, Expression *e);

branches/dmdfe/init.c

@@ -360 +360 @@
-{   Expressions *elements;
-
+    //printf("ArrayInitializer::toExpression()\n");
+    //static int i; if (++i == 2) halt();
-    elements = new Expressions();
-    for (size_t i = 0; i < value.dim; i++)

branches/dmdfe/interpret.c

@@ -76 +76 @@
-    TypeFunction *tf = (TypeFunction *)tb;
-    Type *tret = tf->next->toBasetype();
-|| tret->ty == Tvoid
+/*|| tret->ty == Tvoid*/
-    {   cantInterpret = 1;
-    return NULL;
@@ -88 +88 @@
-        {   cantInterpret = 1;
-        return NULL;
-        }
-    }
-    }
-
-    /* Save the values of the local variables used
-     */
-    Expressions valueSaves;
-    if (istate)
-    {
-    valueSaves.setDim(istate->vars.dim);
-    for (size_t i = 0; i < istate->vars.dim; i++)
-    {   VarDeclaration *v = (VarDeclaration *)istate->vars.data[i];
-        if (v)
-        {   valueSaves.data[i] = v->value;
-        v->value = NULL;
-        }
-    }
@@ -174 +159 @@
-    }
-
+    /* Save the values of the local variables used
+     */
+    Expressions valueSaves;
+    if (istate)
+    {
+    //printf("saving state...\n");
+    valueSaves.setDim(istate->vars.dim);
+    for (size_t i = 0; i < istate->vars.dim; i++)
+    {   VarDeclaration *v = (VarDeclaration *)istate->vars.data[i];
+        if (v)
+        {
+        //printf("\tsaving [%d] %s = %s\n", i, v->toChars(), v->value->toChars());
+        valueSaves.data[i] = v->value;
+        v->value = NULL;
+        }
+    }
+    }
+
-    Expression *e = NULL;
-
@@ -253 +256 @@
-{
-#if LOG
-)\n
+%s)\n", exp ? exp->toChars() : "
-#endif
-    START()
@@ -286 +289 @@
-    }
-    }
+#if LOG
+    printf("-CompoundStatement::interpret() %p\n", e);
+#endif
-    return e;
-}
@@ -375 +381 @@
-{
-#if LOG
-)\n
+%s)\n", exp ? exp->toChars() : "
-#endif
-    START()
-
+
+
-    return exp->interpret(istate);
-}
@@ -837 +844 @@
-    {
-    if (v->isConst() && v->init)
-
+
+
+
+
-    else
-    {   e = v->value;
@@ -852 +862 @@
-
-Expression *DeclarationExp::interpret(InterState *istate)
-
+
+
+
+
+
-    VarDeclaration *v = declaration->isVarDeclaration();
-    if (v)
@@ -865 +879 @@
-        e = NULL;
-    }
+    else if (s == v && v->isConst() && v->init)
+    {   e = v->init->toExpression();
+        if (!e)
+        e = EXP_CANT_INTERPRET;
+        else if (!e->type)
+        e->type = v->type;
+    }
-    }
-    return e;
@@ -870 +891 @@
-
-Expression *TupleExp::interpret(InterState *istate)
-
+
+
+
+
+
-
-    for (size_t i = 0; i < exps->dim; i++)
@@ -1032 +1057 @@
-    Expression *e2;
-
+#if LOG
+    printf("BinExp::interpretCommon2() %s\n", toChars());
+#endif
-    e1 = this->e1->interpret(istate);
-    if (e1 == EXP_CANT_INTERPRET)
-    goto Lcant;
-
+ && e1->op != TOKstring && e1->op != TOKarrayliteral
-    goto Lcant;
-
@@ -1041 +1069 @@
-    if (e2 == EXP_CANT_INTERPRET)
-    goto Lcant;
-
+ && e2->op != TOKstring && e2->op != TOKarrayliteral
-    goto Lcant;
-
@@ -1104 +1132 @@
-        if (e2 != EXP_CANT_INTERPRET)
-        {
-v->isAuto(
+!(v->isDataseg() || v->isParameter()
-            {
-            for (size_t i = 0; 1; i++)
@@ -1277 +1305 @@
-        if (eresult)
-            e = eresult;
+        else if (fd->type->toBasetype()->next->ty == Tvoid)
+            e = EXP_VOID_INTERPRET;
-        else
-            error("cannot evaluate %s at compile time", toChars());
@@ -1335 +1365 @@
-    Expression *e2;
-
+#if LOG
+    printf("IndexExp::interpret() %s\n", toChars());
+#endif
-    e1 = this->e1->interpret(istate);
-    if (e1 == EXP_CANT_INTERPRET)

branches/dmdfe/mangle.c

@@ -31 +31 @@
-    Dsymbol *s;
-
+    //printf("::mangle(%s)\n", sthis->toChars());
-    s = sthis;
-    do
-    {
-
+mangle: 
-    if (s->ident)
-    {
@@ -61 +62 @@
-//    buf.prependstring("_D");
-L1:
-
+
+
-    FuncDeclaration *fd = sthis->isFuncDeclaration();
-    if (fd && (fd->needThis() || fd->isNested()))
-    buf.writeByte(Type::needThisPrefix());
-
+
+
+
+
+
-
-    id = buf.toChars();
@@ -135 +141 @@
-        return "_Dmain";
-
+    assert(this);
-    return Declaration::mangle();
-    }

branches/dmdfe/mars.c

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

branches/dmdfe/mars.h

@@ -18 +18 @@
-#include <stdint.h>
-#include <stdarg.h>
+
+#ifdef __DMC__
+#ifdef DEBUG
+#undef assert
+#define assert(e) (static_cast<void>((e) || (printf("assert %s(%d) %s\n", __FILE__, __LINE__, #e), halt())))
+#endif
+#endif
-
-#ifdef IN_GCC

branches/dmdfe/mtype.c

@@ -3074 +3074 @@
-        sm = s->search(loc, id, 0);
-        if (!sm)
-
+
+
+
+
+
+
-            return;
-        }
@@ -3310 +3315 @@
-    if (s)
-    {
-    s = s->toAlias();
-    for (int i = 0; i < idents.dim; i++)
-    {   Identifier *id;
-        Dsymbol *sm;
-
+        s = s->toAlias();
-        id = (Identifier *)idents.data[i];
-        //printf("\tid = '%s'\n", id->toChars());
@@ -3326 +3331 @@
-        sm = s->search(loc, id, 0);
-        if (!sm)
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-
-
-
+
-        {
-
-
+
+
+
+
+
+
+
+
+
+
+
-        }
-        ti->tempdecl = td;
-        if (!ti->semanticdone)
-            ti->semantic(sc);
-        sm = ti->toAlias();
-        }
-        else
@@ -3349 +3369 @@
-        break;
-        }
-        s = s->toAlias();
-    }
-    }
@@ -4218 +4237 @@
-        return e;
-    }
+    if (d->isTupleDeclaration())
+    {
+        e = new TupleExp(e->loc, d->isTupleDeclaration());
+        e = e->semantic(sc);
+        return e;
+    }
-    return new VarExp(e->loc, d);
-    }
@@ -4549 +4574 @@
-        return e;
-    }
+    else if (d->isTupleDeclaration())
+    {
+        e = new TupleExp(e->loc, d->isTupleDeclaration());
+        e = e->semantic(sc);
+        return e;
+    }
-    else
-        ve = new VarExp(e->loc, d);

branches/dmdfe/optimize.c

@@ -43 +43 @@
-Expression *fromConstInitializer(Expression *e1)
-{
+    //printf("fromConstInitializer(%s)\n", e1->toChars());
-    if (e1->op == TOKvar)
-    {   VarExp *ve = (VarExp *)e1;

branches/dmdfe/statement.c

@@ -1137 +1137 @@
-    size_t n;
-    TupleExp *te = NULL;
-
+  // expression tuple
-    {   te = (TupleExp *)aggr;
-        n = te->exps->dim;
-    }
-
+  // type tuple
-    {
-        n = Argument::dim(tuple->arguments);
@@ -1183 +1183 @@
-        if (te)
-        {
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-        }
-        else

branches/dmdfe/staticassert.c

@@ -1 +1 @@
-
-6
+7
-// All Rights Reserved
-// written by Walter Bright
@@ -50 +50 @@
-
-    e = exp->semantic(sc);
-
+ | WANTinterpret
-    if (e->isBool(FALSE))
-    {
@@ -56 +56 @@
-    {
-        msg = msg->semantic(sc);
-
+ | WANTinterpret
-        char *p = msg->toChars();
-        p = strdup(p);
-(%s) is false, %s", exp->toChars()
+%s"
-        free(p);
-    }
-    else
-(%s) is false", exp->toChars()
+is false"
-    if (!global.gag)
-        fatal();

branches/dmdfe/tocsym.c

@@ -1 +1 @@
-
-// Compiler implementation of the D programming language
-6
+7
-// All Rights Reserved
-// written by Walter Bright
@@ -175 +175 @@
-
-    if (storage_class & STCout)
-
+
+
+
+
+
+
+
+
+
+
-    else if (storage_class & STClazy)
-        t = type_fake(TYullong);        // Tdelegate as C type
@@ -277 +286 @@
- */
-
+Symbol *FuncAliasDeclaration::toSymbol()
+{
+    return funcalias->toSymbol();
+}
+
+/*************************************
+ */
+
-Symbol *FuncDeclaration::toSymbol()
-{
@@ -289 +306 @@
-    id = mangle();
-#endif
-)\n"
+ %s)\n", kind()
-    //printf("\tid = '%s'\n", id);
-    //printf("\ttype = %s\n", type->toChars());
@@ -301 +318 @@
-        f = s->Sfunc;
-        f->Fstartline.Slinnum = loc.linnum;
+        f->Fstartline.Sfilename = loc.filename;
-        if (endloc.linnum)
-
+
+
+
-        else
-
+
+
+
-        t = type->toCtype();
-    }

branches/dmdfe/todt.c

@@ -426 +426 @@
-#ifdef DEBUG
-    printf("Expression::toDt() %d\n", op);
+    dump(0);
-#endif
-    error("non-constant expression %s", toChars());