Changeset 838

Timestamp:

11/17/07 17:28:07 (1 year ago)

Author:

Gregor

Message:

MERGE: DMD 2.007

Files:

• branches/dmdfe-2.0/cast.c (modified) (9 diffs)
• branches/dmdfe-2.0/declaration.c (modified) (6 diffs)
• branches/dmdfe-2.0/declaration.h (modified) (8 diffs)
• branches/dmdfe-2.0/expression.c (modified) (10 diffs)
• branches/dmdfe-2.0/expression.h (modified) (11 diffs)
• branches/dmdfe-2.0/func.c (modified) (6 diffs)
• branches/dmdfe-2.0/idgen.c (modified) (1 diff)
• branches/dmdfe-2.0/inline.c (modified) (5 diffs)
• branches/dmdfe-2.0/lexer.c (modified) (1 diff)
• branches/dmdfe-2.0/mars.c (modified) (2 diffs)
• branches/dmdfe-2.0/mtype.c (modified) (27 diffs)
• branches/dmdfe-2.0/mtype.h (modified) (12 diffs)
• branches/dmdfe-2.0/opover.c (modified) (1 diff)
• branches/dmdfe-2.0/optimize.c (modified) (2 diffs)
• branches/dmdfe-2.0/parse.c (modified) (2 diffs)
• branches/dmdfe-2.0/statement.c (modified) (8 diffs)
• branches/dmdfe-2.0/statement.h (modified) (2 diffs)
• branches/dmdfe-2.0/template.c (modified) (17 diffs)
• branches/dmdfe-2.0/tocsym.c (modified) (1 diff)
• branches/dmdfe-2.0/toir.c (modified) (7 diffs)
• branches/dmdfe-2.0/toobj.c (modified) (1 diff)

branches/dmdfe-2.0/cast.c

@@ -969 +969 @@
-        }
-        if (f)
-
+
+
-        se->semantic(sc);
-        // Let SymOffExp::castTo() do the heavy lifting
@@ -1117 +1118 @@
-            e->type = t;
-            }
+            f->tookAddressOf = 1;
-            return e;
-        }
@@ -1158 +1160 @@
-            if (f->tintro && f->tintro->nextOf()->isBaseOf(f->type->nextOf(), &offset) && offset)
-            error("%s", msg);
+            f->tookAddressOf = 1;
-            e = new DelegateExp(loc, e1, f);
-            e->type = t;
@@ -1171 +1174 @@
-    {   int offset;
-
+    func->tookAddressOf = 1;
-    if (func->tintro && func->tintro->nextOf()->isBaseOf(func->type->nextOf(), &offset) && offset)
-        error("%s", msg);
@@ -1248 +1252 @@
-    TY ty;
-
-\n"
+ %s\n", toChars()
-    //dump(0);
-
@@ -1322 +1326 @@
-       )
-    {
-
-
+
+
+
+
+
+
+
-    }
-    }
@@ -1349 +1358 @@
-    else if (t1n->mod != t2n->mod)
-    {
-->constOf
-->constOf
+n->mutableOf()->constOf()->pointerTo
+n->mutableOf()->constOf()->pointerTo
-        goto Lagain;
-    }
@@ -1405 +1414 @@
-        )
-    {
-
-
+
+
+
+
+
+
+
+
+
-    goto Lagain;
-    }
@@ -1478 +1494 @@
-    if (!type)
-    type = t;
+#if 0
+    printf("-BinExp::typeCombine() %s\n", toChars());
+    if (e1->type) printf("\tt1 = %s\n", e1->type->toChars());
+    if (e2->type) printf("\tt2 = %s\n", e2->type->toChars());
+    printf("\ttype = %s\n", type->toChars());
+#endif
-    //dump(0);
-    return this;

branches/dmdfe-2.0/declaration.c

@@ -589 +589 @@
-    offset = 0;
-    noauto = 0;
-    nestedref = 0;
-    inuse = 0;
-    ctorinit = 0;
@@ -842 +841 @@
-
-    if (!init && !sc->inunion && !isStatic() && !isConst() && fd &&
-
+
+
-    {
-    // Provide a default initializer
@@ -936 +936 @@
-        if (t->ty == Tsarray)
-        {
-
-
-
+
+
-            {
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-            }
-            e1 = new SliceExp(loc, e1, NULL, NULL);
@@ -1117 +1121 @@
-
-/************************************
-variable is a reference to
-or not
+this variable is actually in
+rather than the current one
- */
-
-void VarDeclaration::checkNestedReference(Scope *sc, Loc loc)
-{
-
-
+
+
+
-    FuncDeclaration *fdv = toParent()->isFuncDeclaration();
+    // The current function
-    FuncDeclaration *fdthis = sc->parent->isFuncDeclaration();
-
-
+ && fdv != fdthis
-    {
-        if (loc.filename)
-        fdthis->getLevel(loc, fdv);
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        //printf("var %s in function %s is nested ref\n", toChars(), fdv->toChars());
-    }
-    }
-}
+
-
-/*******************************
@@ -1153 +1176 @@
-    if (!parent && !(storage_class & (STCstatic | STCconst)))
-    {   error("forward referenced");
+halt();
-    type = Type::terror;
-    return 0;
@@ -1262 +1286 @@
-/***************************** TypeInfoConstDeclaration **********************/
-
+#if V2
-TypeInfoConstDeclaration::TypeInfoConstDeclaration(Type *tinfo)
-    : TypeInfoDeclaration(tinfo, 0)
-{
-}
+#endif
-
-/***************************** TypeInfoInvariantDeclaration **********************/
-
+#if V2
-TypeInfoInvariantDeclaration::TypeInfoInvariantDeclaration(Type *tinfo)
-    : TypeInfoDeclaration(tinfo, 0)
-{
-}
+#endif
-
-/***************************** TypeInfoStructDeclaration **********************/

branches/dmdfe-2.0/declaration.h

@@ -32 +32 @@
-struct TupleType;
-struct InterState;
+struct IRState;
-
-enum PROT;
@@ -211 +212 @@
-    unsigned offset;
-    int noauto;         // no auto semantics
-int nestedref;     // referenced by a lexically nested function
+FuncDeclarations nestedrefs; // referenced by these lexically nested functions
-    int inuse;
-    int ctorinit;       // it has been initialized in a ctor
@@ -386 +387 @@
-
-/**************************************************************/
+#if V2
-
-enum BUILTIN
@@ -397 +399 @@
-    BUILTINfabs,        // std.math.fabs
-};
+
+#endif
-
-struct FuncDeclaration : Declaration
@@ -427 +431 @@
-    int cantInterpret;          // !=0 if cannot interpret function
-    int semanticRun;            // !=0 if semantic3() had been run
-    int nestedFrameRef;            // !=0 if nested variables referenced
+                   // this function's
-    ForeachStatement *fes;      // if foreach body, this is the foreach
-    int introducing;            // !=0 if 'introducing' function
@@ -447 +451 @@
-    Symbol *shidden;            // hidden pointer passed to function
-
+#if V2
-    enum BUILTIN builtin;       // set if this is a known, builtin
-                    // function we can evaluate at compile
-                    // time
+
+    int tookAddressOf;          // set if someone took the address of
+                    // this function
+    Dsymbols closureVars;       // local variables in this function
+                    // which are referenced by nested
+                    // functions
+#else
+    int nestedFrameRef;         // !=0 if nested variables referenced
+#endif
-
-    FuncDeclaration(Loc loc, Loc endloc, Identifier *id, enum STC storage_class, Type *type);
@@ -490 +504 @@
-    void toDocBuffer(OutBuffer *buf);
-    FuncDeclaration *isUnique();
+    int needsClosure();
-
-    static FuncDeclaration *genCfunc(Type *treturn, char *name);
@@ -495 +510 @@
-
-    Symbol *toThunkSymbol(int offset);  // thunk version
+    void buildClosure(IRState *irs);
-
-    FuncDeclaration *isFuncDeclaration() { return this; }

branches/dmdfe-2.0/expression.c

@@ -872 +872 @@
-}
-
-void 
+Expression *
-{
-    if (!type->isintegral() && !type->isfloating())
-
+
+
+
+
-}
-
@@ -1972 +1975 @@
-    type = var->type;
-    var->isVarDeclaration()->checkNestedReference(sc, loc);
-#if 0
-    if (fd != fdthis)       // if nested
-    {
-    fdthis->getLevel(loc, fd);
-    fd->vthis->nestedref = 1;
-    fd->nestedFrameRef = 1;
-    }
-#endif
-    sc->callSuper |= CSXthis;
-    return this;
@@ -2080 +2075 @@
-
-    var->isVarDeclaration()->checkNestedReference(sc, loc);
-#if 0
-    if (fd != fdthis)
-    {
-    fdthis->getLevel(loc, fd);
-    fd->vthis->nestedref = 1;
-    fd->nestedFrameRef = 1;
-    }
-#endif
-
-    sc->callSuper |= CSXsuper;
@@ -3440 +3427 @@
-}
-
-Off
-
-OffExp::SymOffExp(Loc loc, Declaration *var, unsigned offset
-TOKsymoff, sizeof(SymOffExp)
+bol
+
+bolExp::SymbolExp(Loc loc, enum TOK op, int size, Declaration *var
+op, size
-{
-    assert(var);
-    this->var = var;
+    this->hasOverloads = hasOverloads;
+}
+
+/********************** SymOffExp **************************************/
+
+SymOffExp::SymOffExp(Loc loc, Declaration *var, unsigned offset, int hasOverloads)
+    : SymbolExp(loc, TOKsymoff, sizeof(SymOffExp), var, hasOverloads)
+{
-    this->offset = offset;
-    this->hasOverloads = hasOverloads;
-
-    VarDeclaration *v = var->isVarDeclaration();
@@ -3495 +3489 @@
-
-VarExp::VarExp(Loc loc, Declaration *var, int hasOverloads)
-   : Expression(loc, TOKvar, sizeof(VarExp)
-
-)\n", this, var->
+    : SymbolExp(loc, TOKvar, sizeof(VarExp), var, hasOverloads
+
+, loc = %s)\n", this, var->toChars(), loc.
-    //if (strcmp(var->ident->toChars(), "func") == 0) halt();
-    this->var = var;
-    this->type = var->type;
-    this->hasOverloads = hasOverloads;
-}
-
@@ -3807 +3799 @@
-        type = fd->type->pointerTo();
-    }
+    fd->tookAddressOf++;
-    }
-    return this;
@@ -6005 +5998 @@
-        if (f)
-        {
+        if (!dve->hasOverloads)
+            f->tookAddressOf = 1;
-        Expression *e = new DelegateExp(loc, dve->e1, f, dve->hasOverloads);
-        e = e->semantic(sc);
@@ -6020 +6015 @@
-        if (f)
-        {
+        if (!ve->hasOverloads)
+            f->tookAddressOf = 1;
-        if (f->isNested())
-        {
@@ -6054 +6051 @@
-    printf("PtrExp::semantic('%s')\n", toChars());
-#endif
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    return this;
-}
@@ -7410 +7411 @@
-    else
-    {
+    e1 = e1->checkArithmetic();
+    e2 = e2->checkArithmetic();
-    type = e1->type;
-    typeCombine(sc);
-    e1->checkArithmetic();
-    e2->checkArithmetic();
-    if (type->isreal() || type->isimaginary())
-    {

branches/dmdfe-2.0/expression.h

@@ -109 +109 @@
-    void checkNoBool();
-    Expression *checkIntegral();
-void 
+Expression *
-    void checkDeprecated(Scope *sc, Dsymbol *s);
-    virtual Expression *checkToBoolean();
@@ -328 +328 @@
-    Expression *interpret(InterState *istate);
-    Expression *castTo(Scope *sc, Type *t);
-    elem *toElem(IRState *irs);
-
-    int inlineCost(InlineCostState *ics);
@@ -353 +352 @@
-    MATCH implicitConvTo(Type *t);
-    Expression *castTo(Scope *sc, Type *t);
-    dt_t **toDt(dt_t **pdt);
-
-    int inlineCost(InlineCostState *ics);
@@ -370 +368 @@
-    Expression *semantic(Scope *sc);
-    int isBool(int result);
-    elem *toElem(IRState *irs);
-    int checkSideEffect(int flag);
-    void toCBuffer(OutBuffer *buf, HdrGenState *hgs);
@@ -401 +398 @@
-    Expression *getField(Type *type, unsigned offset);
-    int getFieldIndex(Type *type, unsigned offset);
-    elem *toElem(IRState *irs);
-    int checkSideEffect(int flag);
-    void toCBuffer(OutBuffer *buf, HdrGenState *hgs);
@@ -408 +404 @@
-    Expression *optimize(int result);
-    Expression *interpret(InterState *istate);
-    dt_t **toDt(dt_t **pdt);
-    Expression *toLvalue(Scope *sc, Expression *e);
-
@@ -496 +491 @@
-};
-
+struct SymbolExp : Expression
+{
+    Declaration *var;
+    int hasOverloads;
+
+    SymbolExp(Loc loc, enum TOK op, int size, Declaration *var, int hasOverloads);
+};
+
-// Offset from symbol
-
-
-
-
+
+
-    unsigned offset;
-    int hasOverloads;
-
-    SymOffExp(Loc loc, Declaration *var, unsigned offset, int hasOverloads = 0);
@@ -518 +519 @@
-// Variable
-
-
-
-
-
-
+
+
-    VarExp(Loc loc, Declaration *var, int hasOverloads = 0);
-    int equals(Object *o);
@@ -688 +686 @@
-
-    Expression *op_overload(Scope *sc);
-
-    elem *toElemBin(IRState *irs, int op);
-};
-
@@ -824 +820 @@
-    AddrExp(Loc loc, Expression *e);
-    Expression *semantic(Scope *sc);
-    elem *toElem(IRState *irs);
-    MATCH implicitConvTo(Type *t);
-    Expression *castTo(Scope *sc, Type *t);
@@ -840 +835 @@
-    Expression *optimize(int result);
-    Expression *interpret(InterState *istate);
+
+    // For operator overloading
+    Identifier *opId();
-};
-

branches/dmdfe-2.0/func.c

@@ -64 +64 @@
-    cantInterpret = 0;
-    semanticRun = 0;
-    nestedFrameRef = 0;
-    fes = NULL;
-    introducing = 0;
@@ -75 +74 @@
-    shidden = NULL;
-    builtin = BUILTINunknown;
+    tookAddressOf = 0;
-}
-
@@ -556 +556 @@
-    if (!parent)
-    {
+    if (global.errors)
+        return;
-    printf("FuncDeclaration::semantic3(%s '%s', sc = %p)\n", kind(), toChars(), sc);
-    assert(0);
-    }
-)\n", parent->toChars(), toChars(), sc
+, loc = %s)\n", parent->toChars(), toChars(), sc, loc.toChars()
-    //fflush(stdout);
-    //{ static int x; if (++x == 2) *(char*)0=0; }
@@ -747 +749 @@
-            arg->ident = id;
-        }
-0
+loc
-        //printf("declaring parameter %s of type %s\n", v->toChars(), v->type->toChars());
-        v->storage_class |= STCparameter;
@@ -784 +786 @@
-            VarDeclaration *v = sc2->search(0, narg->ident, NULL)->isVarDeclaration();
-            assert(v);
-0
+v->loc
-            exps->data[j] = (void *)e;
-            }
-            assert(arg->ident);
-0
+loc
-            //printf("declaring tuple %s\n", v->toChars());
-            v->isexp = 1;
@@ -1871 +1873 @@
-}
-
+/*******************************
+ * Look at all the variables in this function that are referenced
+ * by nested functions, and determine if a closure needs to be
+ * created for them.
+ */
+
+#if V2
+int FuncDeclaration::needsClosure()
+{
+    /* Need a closure for all the closureVars[] if any of the
+     * closureVars[] are accessed by a
+     * function that escapes the scope of this function.
+     * We take the conservative approach and decide that any function that:
+     * 1) is a virtual function
+     * 2) has its address taken
+     * 3) has a parent that escapes
+     * escapes.
+     */
+
+    //printf("FuncDeclaration::needsClosure() %s\n", toChars());
+    for (int i = 0; i < closureVars.dim; i++)
+    {   VarDeclaration *v = (VarDeclaration *)closureVars.data[i];
+    assert(v->isVarDeclaration());
+    //printf("\tv = %s\n", v->toChars());
+
+    for (int j = 0; j < v->nestedrefs.dim; j++)
+    {   FuncDeclaration *f = (FuncDeclaration *)v->nestedrefs.data[j];
+        assert(f != this);
+
+        //printf("\t\tf = %s, %d, %d\n", f->toChars(), f->isVirtual(), f->tookAddressOf);
+        if (f->isVirtual() || f->tookAddressOf)
+        goto Lyes;  // assume f escapes this function's scope
+
+        // Look to see if any parents of f that are below this escape
+        for (Dsymbol *s = f->parent; s != this; s = s->parent)
+        {
+        f = s->isFuncDeclaration();
+        if (f && (f->isVirtual() || f->tookAddressOf))
+            goto Lyes;
+        }
+    }
+    }
+    return 0;
+
+Lyes:
+    //printf("\tneeds closure\n");
+    return 1;
+}
+#endif
+
-/****************************** FuncAliasDeclaration ************************/
-

branches/dmdfe-2.0/idgen.c

@@ -191 +191 @@
-    { "opIn" },
-    { "opIn_r" },
+    { "opStar" },
-
-    { "classNew", "new" },

branches/dmdfe-2.0/inline.c

@@ -547 +547 @@
-    else
-    {
-        ExpInitializer *ie;
-        ExpInitializer *ieto;
-        VarDeclaration *vto;
-
@@ -560 +558 @@
-        ids->to.push(vto);
-
-->isVoidInitializer()
+
-        {
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-        }
-        de->declaration = (Dsymbol *) (void *)vto;
@@ -855 +855 @@
-{
-    aggr = aggr->inlineScan(iss);
-
+
+
-    return this;
-}
@@ -865 +866 @@
-    lwr = lwr->inlineScan(iss);
-    upr = upr->inlineScan(iss);
-
+
+
-    return this;
-}
@@ -1289 +1291 @@
-    isSynchronized() ||
-    isImportedSymbol() ||
+#if V2
+    closureVars.dim ||  // no nested references to this frame
+#else
-    nestedFrameRef ||   // no nested references to this frame
+#endif
-    (isVirtual() && !isFinal())
-       ))

branches/dmdfe-2.0/lexer.c

@@ -3023 +3023 @@
-    Token::tochars[TOKdeclaration]  = "declaration";
-    Token::tochars[TOKdottd]        = "dottd";
-
+
+

branches/dmdfe-2.0/mars.c

@@ -56 +56 @@
-    copyright = "Copyright (c) 1999-2007 by Digital Mars";
-    written = "written by Walter Bright";
-6
+7
-    global.structalign = 8;
-
@@ -110 +110 @@
-    fprintf(stdmsg, "\n");
-    fflush(stdmsg);
-
+//
-    }
-    global.errors++;

branches/dmdfe-2.0/mtype.c

@@ -670 +670 @@
-
-
-
+Loc loc
-{
-#if LOGDEFAULTINIT
@@ -734 +734 @@
-    if (ty == Tvoid)
-        error(loc, "void does not have an initializer");
-
-
+
-    }
-    else if (ident == Id::mangleof)
@@ -812 +811 @@
-                v->type->toBasetype()->ty == Tstruct)
-            {
-
+e->loc
-            }
-            }
@@ -822 +821 @@
-        }
-#endif
-
-
+
-        return ex;
-    }
@@ -978 +976 @@
-    return cto;
-    TypeNext *t = (TypeNext *)Type::makeConst();
-
+
+
-    t->next = next->constOf();
-    return t;
@@ -1547 +1546 @@
-}
-
-
+Loc loc
-{   integer_t value = 0;
-
@@ -1573 +1572 @@
-    case Tcomplex64:
-    case Tcomplex80:
-
-
-
+
+
+
+
+
+
-}
-
@@ -1990 +1992 @@
-
-    dim = dim->optimize(WANTvalue | WANTinterpret);
+    if (sc->parameterSpecialization && dim->op == TOKvar &&
+        ((VarExp *)dim)->var->storage_class & STCtemplateparameter)
+    {
+        /* It could be a template parameter N which has no value yet:
+         *   template Foo(T : T[N], size_t N);
+         */
+        return this;
+    }
-    integer_t d1 = dim->toInteger();
-    dim = dim->castTo(sc, tsize_t);
@@ -2171 +2181 @@
-}
-
-
+Loc loc
-{
-#if LOGDEFAULTINIT
-    printf("TypeSArray::defaultInit() '%s'\n", toChars());
-#endif
-
+loc
-}
-
@@ -2359 +2369 @@
-}
-
-
+Loc loc
-{
-#if LOGDEFAULTINIT
@@ -2365 +2375 @@
-#endif
-    Expression *e;
-0
+loc
-    e->type = this;
-    return e;
@@ -2564 +2574 @@
-}
-
-
+Loc loc
-{
-#if LOGDEFAULTINIT
@@ -2570 +2580 @@
-#endif
-    Expression *e;
-0
+loc
-    e->type = this;
-    return e;
@@ -2680 +2690 @@
-}
-
-
+Loc loc
-{
-#if LOGDEFAULTINIT
@@ -2686 +2696 @@
-#endif
-    Expression *e;
-0
+loc
-    e->type = this;
-    return e;
@@ -2762 +2772 @@
-}
-
-
+Loc loc
-{
-#if LOGDEFAULTINIT
@@ -2768 +2778 @@
-#endif
-    Expression *e;
-0
+loc
-    e->type = this;
-    return e;
@@ -3295 +3305 @@
-}
-
-
+Loc loc
-{
-#if LOGDEFAULTINIT
@@ -3301 +3311 @@
-#endif
-    Expression *e;
-0
+loc
-    e->type = this;
-    return e;
@@ -4097 +4107 @@
-    if (!sym->symtab)
-        goto Lfwd;
-
+loc
-    }
-    else
@@ -4157 +4167 @@
-
-
-
+Loc loc
-{
-#if LOGDEFAULTINIT
@@ -4164 +4174 @@
-    // Initialize to first member of enum
-    Expression *e;
-0
+loc
-    return e;
-}
@@ -4351 +4361 @@
-
-
-
+Loc loc
-{   Expression *e;
-    Type *bt;
@@ -4364 +4374 @@
-    }
-    bt = sym->basetype;
-
+loc
-    e->type = this;
-    while (bt->ty == Tsarray)
@@ -4644 +4654 @@
-}
-
-
+Loc loc
-{   Symbol *s;
-    Declaration *d;
@@ -5074 +5084 @@
-}
-
-
+Loc loc
-{
-#if LOGDEFAULTINIT
@@ -5080 +5090 @@
-#endif
-    Expression *e;
-0
+loc
-    e->type = this;
-    return e;

branches/dmdfe-2.0/mtype.h

@@ -243 +243 @@
-    virtual Expression *dotExp(Scope *sc, Expression *e, Identifier *ident);
-    virtual unsigned memalign(unsigned salign);
-
+Loc loc = 0
-    virtual int isZeroInit();       // if initializer is 0
-    Identifier *getTypeInfoIdent(int internal);
@@ -300 +300 @@
-    int isunsigned();
-    MATCH implicitConvTo(Type *to);
-
+Loc loc
-    int isZeroInit();
-
@@ -332 +332 @@
-    MATCH constConv(Type *to)