Changeset 659

Timestamp:

07/02/07 18:20:06 (1 year ago)

Author:

Gregor

Message:

MERGE: DMD 1.018

Files:

• branches/dmdfe/attrib.c (modified) (1 diff)
• branches/dmdfe/class.c (modified) (1 diff)
• branches/dmdfe/dsymbol.c (modified) (1 diff)
• branches/dmdfe/expression.c (modified) (16 diffs)
• branches/dmdfe/expression.h (modified) (3 diffs)
• branches/dmdfe/func.c (modified) (2 diffs)
• branches/dmdfe/inline.c (modified) (3 diffs)
• branches/dmdfe/interpret.c (modified) (2 diffs)
• branches/dmdfe/lexer.c (modified) (2 diffs)
• branches/dmdfe/mars.c (modified) (1 diff)
• branches/dmdfe/mars.h (modified) (1 diff)
• branches/dmdfe/module.c (modified) (1 diff)
• branches/dmdfe/mtype.c (modified) (5 diffs)
• branches/dmdfe/optimize.c (modified) (1 diff)
• branches/dmdfe/parse.c (modified) (2 diffs)
• branches/dmdfe/scope.c (modified) (7 diffs)
• branches/dmdfe/scope.h (modified) (1 diff)
• branches/dmdfe/statement.c (modified) (21 diffs)
• branches/dmdfe/template.c (modified) (1 diff)

branches/dmdfe/attrib.c

@@ -1076 +1076 @@
-    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/dmdfe/class.c

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

branches/dmdfe/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/dmdfe/expression.c

@@ -303 +303 @@
-void expandTuples(Expressions *exps)
-{
+    //printf("expandTuples()\n");
-    if (exps)
-    {
@@ -309 +310 @@
-        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
@@ -665 +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);
@@ -858 +883 @@
-{
-    if (flag == 0)
-
+
+
+
+
+
+
-        Token::toChars(op), toChars());
+    }
-    return 0;
-}
@@ -1009 +1040 @@
-char *IntegerExp::toChars()
-{
+#if 1
+    return Expression::toChars();
+#else
-    static char buffer[sizeof(value) * 3 + 1];
-
-    sprintf(buffer, "%jd", value);
-    return buffer;
+#endif
-}
-
@@ -2435 +2470 @@
-}
-
+ArrayLiteralExp::ArrayLiteralExp(Loc loc, Expression *e)
+    : Expression(loc, TOKarrayliteral, sizeof(ArrayLiteralExp))
+{
+    elements = new Expressions;
+    elements->push(e);
+}
+
-Expression *ArrayLiteralExp::syntaxCopy()
-{
@@ -2666 +2708 @@
-    this->sd = sd;
-    this->elements = elements;
-
+ym
-    this->soffset = 0;
-    this->fillHoles = 1;
@@ -4397 +4439 @@
-    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)
@@ -4765 +4808 @@
-        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;
@@ -5360 +5409 @@
-        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
-    }
-
@@ -7163 +7230 @@
-    else
-    {
-Can only append to dynamic arrays, not %s ~= %s", tb1->toChars(), tb2
+cannot append type %s to type %s", tb2->toChars(), tb1
-    type = Type::tint32;
-    e = this;
@@ -7590 +7657 @@
-{   Expression *e;
-
-\n"
+ %s\n", toChars()
-    if (!type)
-    {
@@ -7616 +7683 @@
-    {
-        type = tb1->next->arrayOf();
+        if (tb2->ty == Tarray)
+        {   // Make e2 into [e2]
+        e2 = new ArrayLiteralExp(e2->loc, e2);
+        e2->type = type;
+        }
-        return this;
-    }
@@ -7622 +7694 @@
-    {
-        type = tb2->next->arrayOf();
+        if (tb1->ty == Tarray)
+        {   // Make e1 into [e1]
+        e1 = new ArrayLiteralExp(e1->loc, e1);
+        e1->type = type;
+        }
-        return this;
-    }
@@ -8375 +8452 @@
-    unsigned cs1;
-
+#if LOGSEMANTIC
+    printf("CondExp::semantic('%s')\n", toChars());
+#endif
-    if (type)
-    return this;
@@ -8427 +8507 @@
-    {
-    typeCombine(sc);
+    switch (e1->type->toBasetype()->ty)
+    {
+        case Tcomplex32:
+        case Tcomplex64:
+        case Tcomplex80:
+        e2 = e2->castTo(sc, e1->type);
+        break;
+    }
+    switch (e2->type->toBasetype()->ty)
+    {
+        case Tcomplex32:
+        case Tcomplex64:
+        case Tcomplex80:
+        e1 = e1->castTo(sc, e2->type);
+        break;
+    }
-    }
-    return this;

branches/dmdfe/expression.h

@@ -334 +334 @@
-
-    ArrayLiteralExp(Loc loc, Expressions *elements);
+    ArrayLiteralExp(Loc loc, Expression *e);
-
-    Expression *syntaxCopy();
@@ -384 +385 @@
-                // NULL entries for fields to skip
-
-; 
+ym;
-    size_t soffset;     // offset from start of s
-    int fillHoles;      // fill alignment 'holes' with zero
@@ -517 +518 @@
-    int equals(Object *o);
-    Expression *semantic(Scope *sc);
+    Expression *optimize(int result);
-    Expression *interpret(InterState *istate);
-    void dump(int indent);

branches/dmdfe/func.c

@@ -334 +334 @@
-
-    // This is an 'introducing' function.
+
+    // Verify this doesn't override previous final function
+    if (cd->baseClass)
+    {   Dsymbol *s = cd->baseClass->search(loc, ident, 0);
+        if (s)
+        {
+        FuncDeclaration *f = s->isFuncDeclaration();
+        f = f->overloadExactMatch(type);
+        if (f && f->isFinal() && f->prot() != PROTprivate)
+            error("cannot override final function %s", f->toPrettyChars());
+        }
+    }
+
-    if (isFinal())
-    {
-        // Verify this doesn't override previous final function
-        if (cd->baseClass)
-        {   Dsymbol *s = cd->baseClass->search(loc, ident, 0);
-        if (s)
-        {
-            FuncDeclaration *f = s->isFuncDeclaration();
-            f = f->overloadExactMatch(type);
-            if (f && f->isFinal())
-            error("cannot override final function %s", f->toPrettyChars());
-        }
-        }
-        cd->vtblFinal.push(this);
-    }
@@ -605 +607 @@
-    sc2->incontract = 0;
-    sc2->tf = NULL;
+    sc2->noctor = 0;
-
-    // Declare 'this'

branches/dmdfe/inline.c

@@ -823 +823 @@
-{
-    condition = condition->inlineScan(iss);
-->inlineScan(iss)
+ ? body->inlineScan(iss) : NULL
-    return this;
-}
@@ -830 +830 @@
-Statement *DoStatement::inlineScan(InlineScanState *iss)
-{
-->inlineScan(iss)
+ ? body->inlineScan(iss) : NULL
-    condition = condition->inlineScan(iss);
-    return this;
@@ -872 +872 @@
-    //printf("SwitchStatement::inlineScan()\n");
-    condition = condition->inlineScan(iss);
-->inlineScan(iss)
+ ? body->inlineScan(iss) : NULL
-    if (sdefault)
-    sdefault = (DefaultStatement *)sdefault->inlineScan(iss);

branches/dmdfe/interpret.c

@@ -1136 +1136 @@
-        {   expsx = new Expressions();
-            expsx->setDim(elements->dim);
-i
+elements->dim
-            {
-            expsx->data[j] = elements->data[j];
@@ -1942 +1942 @@
-    else
-        error("%s failed", toChars());
+    goto Lcant;
-    }
-    else

branches/dmdfe/lexer.c

@@ -401 +401 @@
-    //printf("peekPastParen()\n");
-    int parens = 1;
+    int curlynest = 0;
-    while (1)
-    {
@@ -416 +417 @@
-            continue;
-        tk = peek(tk);
+        break;
+
+        case TOKlcurly:
+        curlynest++;
+        continue;
+
+        case TOKrcurly:
+        if (--curlynest >= 0)
+            continue;
+        break;
+
+        case TOKsemicolon:
+        if (curlynest)
+            continue;
-        break;
-

branches/dmdfe/mars.c

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

branches/dmdfe/mars.h

@@ -30 +30 @@
-#endif
-
-
+
+
-
-struct Array;

branches/dmdfe/module.c

@@ -578 +578 @@
-    }
-    Parser p(this, buf, buflen, docfile != NULL);
+    p.nextToken();
-    members = p.parseModule();
-    md = p.md;

branches/dmdfe/mtype.c

@@ -599 +599 @@
-            error(e->loc, "%s.init is void", v->toChars());
-        else
-
+
+
-            if (e->op == TOKassign || e->op == TOKconstruct)
-            {
@@ -614 +615 @@
-            }
-            }
+            e = e->optimize(WANTvalue | WANTinterpret);
+//          if (!e->isConst())
+//          error(loc, ".init cannot be evaluated at compile time");
-        }
-        return e;
@@ -2011 +2015 @@
-    case Tfunction:
-    case Tnone:
+    case Ttuple:
-        error(loc, "can't have array of %s", tbn->toChars());
-        tn = next = tint32;
@@ -2354 +2359 @@
-    //printf("TypePointer::semantic()\n");
-    Type *n = next->semantic(loc, sc);
+    switch (n->toBasetype()->ty)
+    {
+    case Ttuple:
+        error(loc, "can't have pointer to %s", n->toChars());
+        n = tint32;
+        break;
+    }
-    if (n != next)
-    deco = NULL;
@@ -3898 +3910 @@
-    if (ident == Id::init)
-    {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-    }
-    return sym->basetype->dotExp(sc, e, ident);

branches/dmdfe/optimize.c

@@ -60 +60 @@
-{
-    //printf("Expression::optimize(result = x%x) %s\n", result, toChars());
+    return this;
+}
+
+Expression *VarExp::optimize(int result)
+{
+    if (result & WANTinterpret)
+    {
+    return fromConstInitializer(this);
+    }
-    return this;
-}

branches/dmdfe/parse.c

@@ -61 +61 @@
-    endloc = 0;
-    inBrackets = 0;
-
+//
-}
-
@@ -502 +502 @@
-    case TOKcolon:
-        nextToken();
-1
+0
-        a = NULL;
-#else

branches/dmdfe/scope.c

@@ -27 +27 @@
-
-void *Scope::operator new(size_t size)
-
-
+
-    if (freelist)
-    {
-
+Scope *
-    freelist = s->enclosing;
+    //printf("freelist %p\n", s);
+    assert(s->flags & SCOPEfree);
+    s->flags &= ~SCOPEfree;
-    return s;
-    }
-
-
+
+
+
-}
-
@@ -42 +46 @@
-{   // Create root scope
-
+    //printf("Scope::Scope() %p\n", this);
-    this->module = NULL;
-    this->scopesym = NULL;
@@ -76 +81 @@
-Scope::Scope(Scope *enclosing)
-{
+    //printf("Scope::Scope(enclosing = %p) %p\n", enclosing, this);
+    assert(!(enclosing->flags & SCOPEfree));
-    this->module = enclosing->module;
-    this->func   = enclosing->func;
@@ -88 +95 @@
-    this->structalign = enclosing->structalign;
-    this->enclosing = enclosing;
+#ifdef DEBUG
+    if (enclosing->enclosing)
+    assert(!(enclosing->enclosing->flags & SCOPEfree));
+    if (this == enclosing->enclosing)
+    {
+    printf("this = %p, enclosing = %p, enclosing->enclosing = %p\n", this, enclosing, enclosing->enclosing);
+    }
+    assert(this != enclosing->enclosing);
+#endif
-    this->slabel = NULL;
-    this->linkage = enclosing->linkage;
@@ -149 +165 @@
-Scope *Scope::pop()
-{
-\n"
+ %p nofree = %d\n", this, nofree
-    Scope *enc = enclosing;
-
@@ -158 +174 @@
-    {   enclosing = freelist;
-    freelist = this;
+    flags |= SCOPEfree;
-    }
-
@@ -324 +341 @@
-void Scope::setNoFree()
-{   Scope *sc;
-
-
-
+
+
+
+
+
+
-    sc->nofree = 1;
-
-
+
+
+
+
+
+
+
+

branches/dmdfe/scope.h

@@ -79 +79 @@
-#define SCOPEctor   1   // constructor type
-#define SCOPEstaticif   2   // inside static if
+#define SCOPEfree   4   // is on free list
-
-    AnonymousAggregateDeclaration *anonAgg; // for temporary analysis

branches/dmdfe/statement.c

@@ -252 +252 @@
-    Parser p(sc->module, (unsigned char *)se->string, se->len, 0);
-    p.loc = loc;
+    p.nextToken();
-
-    Statements *statements = new Statements();
@@ -782 +783 @@
-Statement *WhileStatement::syntaxCopy()
-{
-->syntaxCopy()
+ ? body->syntaxCopy() : NULL
-    return s;
-}
@@ -822 +823 @@
-    scd->sbreak = this;
-    scd->scontinue = this;
-
+
+
-    scd->pop();
-
@@ -842 +844 @@
-int WhileStatement::usesEH()
-{
-->usesEH()
+ ? body->usesEH() : 0
-}
-
-int WhileStatement::fallOffEnd()
-{
-
+
+
-    return TRUE;
-}
@@ -864 +867 @@
-    buf->writebyte(')');
-    buf->writenl();
-
+
+
-}
-
@@ -878 +882 @@
-Statement *DoStatement::syntaxCopy()
-{
-->syntaxCopy()
+ ? body->syntaxCopy() : NULL
-    return s;
-}
@@ -886 +890 @@
-{
-    sc->noctor++;
-
+
+
-    sc->noctor--;
-    condition = condition->semantic(sc);
@@ -908 +913 @@
-int DoStatement::usesEH()
-{
-->usesEH()
+ ? body->usesEH() : 0
-}
-
-int DoStatement::fallOffEnd()
-{
-
+
+
-    return TRUE;
-}
@@ -928 +934 @@
-    buf->writestring("do");
-    buf->writenl();
-
+
+
-    buf->writestring("while (");
-    condition->toCBuffer(buf, hgs);
@@ -1193 +1200 @@
-            arg->type = e->type;
-            Initializer *ie = new ExpInitializer(0, e);
-
+
+
+
+
+
+
+
+
-        }
-        }
@@ -2058 +2072 @@
-int SwitchStatement::usesEH()
-{
-->usesEH()
+ ? body->usesEH() : 0
-}
-
-int SwitchStatement::fallOffEnd()
-{
-
+
+
-    return TRUE;    // need to do this better
-}
@@ -2822 +2837 @@
-{
-    Expression *e = exp ? exp->syntaxCopy() : NULL;
-->syntaxCopy()
+ ? body->syntaxCopy() : NULL
-    return s;
-}
@@ -2844 +2859 @@
-    }
-    }
-
+
+
-    return this;
-}
@@ -2865 +2881 @@
-int SynchronizedStatement::fallOffEnd()
-{
-->fallOffEnd()
+ ? body->fallOffEnd() : TRUE
-}
-
@@ -2895 +2911 @@
-Statement *WithStatement::syntaxCopy()
-{
-->syntaxCopy()
+ ? body->syntaxCopy() : NULL
-    return s;
-}
@@ -2951 +2967 @@
-    sc = sc->push(sym);
-
-
+
+
-
-    sc->pop();
@@ -2963 +2980 @@
-    exp->toCBuffer(buf, hgs);
-    buf->writestring(")\n");
-
+
+
-}
-
-int WithStatement::usesEH()
-{
-->usesEH()
+ ? body->usesEH() : 0
-}
-
-int WithStatement::fallOffEnd()
-{
-->fallOffEnd()
+ ? body->fallOffEnd() : TRUE
-}
-
@@ -3016 +3034 @@
-        char *sj = cj->loc.toChars();
-
-implicitConvTo(cj->type
+toBasetype()->implicitConvTo(cj->type->toBasetype()
-        error("catch at %s hides catch at %s", sj, si);
-    }
@@ -3344 +3362 @@
-Statement *VolatileStatement::semantic(Scope *sc)
-{
-->semantic(sc)
+ ? statement->semantic(sc) : NULL
-    return this;
-}
@@ -3352 +3370 @@
-    Statements *a;
-
-->flatten(sc)
+ ? statement->flatten(sc) : NULL
-    if (a)
-    {   for (int i = 0; i < a->dim; i++)
@@ -3367 +3385 @@
-int VolatileStatement::fallOffEnd()
-{
-->fallOffEnd()
+ ? statement->fallOffEnd() : TRUE
-}
-

branches/dmdfe/template.c

@@ -1131 +1131 @@
-    if (equals(at))
-        goto Lexact;
+    else if (ty == Tclass && at->ty == Tclass)
+    {
+        return (MATCH) implicitConvTo(at);
+    }
-    else if (ty == Tsarray && at->ty == Tarray &&
-        next->equals(at->next))