Changeset 835

Timestamp:

11/17/07 17:11:23 (9 months ago)

Author:

Gregor

Message:

MERGE: DMD 2.004

Files:

• branches/dmdfe-2.0/aggregate.h (modified) (2 diffs)
• branches/dmdfe-2.0/cast.c (modified) (19 diffs)
• branches/dmdfe-2.0/class.c (modified) (2 diffs)
• branches/dmdfe-2.0/constfold.c (modified) (4 diffs)
• branches/dmdfe-2.0/declaration.c (modified) (6 diffs)
• branches/dmdfe-2.0/declaration.h (modified) (1 diff)
• branches/dmdfe-2.0/dsymbol.c (modified) (4 diffs)
• branches/dmdfe-2.0/dsymbol.h (modified) (1 diff)
• branches/dmdfe-2.0/enum.c (modified) (1 diff)
• branches/dmdfe-2.0/expression.c (modified) (18 diffs)
• branches/dmdfe-2.0/expression.h (modified) (4 diffs)
• branches/dmdfe-2.0/func.c (modified) (6 diffs)
• branches/dmdfe-2.0/identifier.c (modified) (2 diffs)
• branches/dmdfe-2.0/idgen.c (modified) (4 diffs)
• branches/dmdfe-2.0/init.c (modified) (2 diffs)
• branches/dmdfe-2.0/init.h (modified) (4 diffs)
• branches/dmdfe-2.0/interpret.c (modified) (12 diffs)
• branches/dmdfe-2.0/lexer.c (modified) (6 diffs)
• branches/dmdfe-2.0/lexer.h (modified) (2 diffs)
• branches/dmdfe-2.0/link.c (modified) (1 diff)
• branches/dmdfe-2.0/mars.c (modified) (5 diffs)
• branches/dmdfe-2.0/mars.h (modified) (1 diff)
• branches/dmdfe-2.0/mtype.c (modified) (6 diffs)
• branches/dmdfe-2.0/mtype.h (modified) (1 diff)
• branches/dmdfe-2.0/opover.c (modified) (1 diff)
• branches/dmdfe-2.0/optimize.c (modified) (10 diffs)
• branches/dmdfe-2.0/parse.c (modified) (5 diffs)
• branches/dmdfe-2.0/parse.h (modified) (1 diff)
• branches/dmdfe-2.0/statement.c (modified) (5 diffs)
• branches/dmdfe-2.0/staticassert.c (modified) (1 diff)
• branches/dmdfe-2.0/template.c (modified) (2 diffs)
• branches/dmdfe-2.0/toobj.c (modified) (9 diffs)
• branches/dmdfe-2.0/traits.c (modified) (3 diffs)
• branches/dmdfe-2.0/typinf.c (modified) (2 diffs)

branches/dmdfe-2.0/aggregate.h

@@ -149 +149 @@
-};
-
-2
+6
-
-struct ClassDeclaration : AggregateDeclaration
@@ -193 +193 @@
-
-    Dsymbol *search(Loc, Identifier *ident, int flags);
+    int isFuncHidden(FuncDeclaration *fd);
-    FuncDeclaration *findFunc(Identifier *ident, TypeFunction *tf);
-    void interfaceSemantic(Scope *sc);

branches/dmdfe-2.0/cast.c

@@ -96 +96 @@
-    toChars(), type->toChars(), t->toChars());
-#endif
+    //static int nest; if (++nest == 10) halt();
-    if (!type)
-    {   error("%s is not an expression", toChars());
@@ -101 +102 @@
-    }
-    Expression *e = optimize(WANTvalue | WANTflags);
+    if (e->type == t)
+    return MATCHexact;
-    if (e != this)
-
+i
-    return e->implicitConvTo(t);
-    }
@@ -593 +596 @@
-    toChars(), type->toChars(), t->toChars());
-#endif
+    if (type == t)
+    return this;
-    e = this;
-    tb = t->toBasetype();
@@ -693 +698 @@
-Expression *StringExp::castTo(Scope *sc, Type *t)
-{
+    /* This follows copy-on-write; any changes to 'this'
+     * will result in a copy.
+     * The this->string member is considered immutable.
+     */
-    StringExp *se;
-    Type *tb;
-unique
+copied = 0
-
-    //printf("StringExp::castTo(t = %s), '%s' committed = %d\n", t->toChars(), toChars(), committed);
@@ -702 +711 @@
-    {
-    error("cannot convert string literal to void*");
+    }
+
+    se = this;
+    if (!committed)
+    {   se = (StringExp *)copy();
+    se->committed = 1;
+    copied = 1;
+    }
+
+    if (type == t)
+    {
+    return se;
-    }
-
@@ -709 +730 @@
-    return Expression::castTo(sc, t);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-    return se;
-    }
-
-    if (tb->ty != Tsarray && tb->ty != Tarray && tb->ty != Tpointer)
-
+
+
+
+
-    goto Lcast;
-    }
-
-
+
+
+
+
+
-    goto Lcast;
-    }
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-    goto Lcast;
-    }
-
-    se->committed = 1;
-
-    int tfty;
-    int ttty;
-    char *p;
-    size_t u;
-    unsigned c;
-    size_t newlen;
-
-#define X(tf,tt)    ((tf) * 256 + (tt))
-    {
-    OutBuffer buffer;
-
-tfty = se->type
-
+size_t 
+int tfty = typeb
+int 
-    switch (X(tfty, ttty))
-    {
@@ -772 +785 @@
-
-    case X(Tchar, Twchar):
-
-
-
+size_t 
+  unsigned c;
+char *
-        if (p)
-            error("%s", p);
@@ -785 +798 @@
-
-    case X(Tchar, Tdchar):
-
-
-
+size_t 
+  unsigned c;
+char *
-        if (p)
-            error("%s", p);
@@ -797 +810 @@
-
-    case X(Twchar,Tchar):
-
-
-
+size_t 
+  unsigned c;
+char *
-        if (p)
-            error("%s", p);
@@ -810 +823 @@
-
-    case X(Twchar,Tdchar):
-
-
-
+size_t 
+  unsigned c;
+char *
-        if (p)
-            error("%s", p);
@@ -822 +835 @@
-
-    case X(Tdchar,Tchar):
-
-
-
+size_t 
+
+unsigned 
-        if (!utf_isValidDchar(c))
-            error("invalid UCS-32 char \\U%08x", c);
@@ -836 +849 @@
-
-    case X(Tdchar,Twchar):
-
-
-
+size_t 
+
+unsigned 
-        if (!utf_isValidDchar(c))
-            error("invalid UCS-32 char \\U%08x", c);
@@ -850 +863 @@
-
-    L1:
-
-
+
+
+
+
-        se->string = buffer.extractData();
-        se->len = newlen;
@@ -858 +873 @@
-
-    default:
-
-
-
-
+
-        goto Lcast;
-    }
-    }
-#undef X
+L2:
+    assert(copied);
-
-    // See if need to truncate or extend the literal
@@ -877 +891 @@
-    if (dim2 != se->len)
-    {
+        // Copy when changing the string literal
-        unsigned newsz = se->sz;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-    }
-    }
@@ -906 +910 @@
-Lcast:
-    Expression *e = new CastExp(loc, se, t);
-
+   // so semantic() won't be run on e
-    return e;
-}
@@ -967 +971 @@
-Expression *ArrayLiteralExp::castTo(Scope *sc, Type *t)
-{
+#if 0
+    printf("ArrayLiteralExp::castTo(this=%s, type=%s, t=%s)\n",
+    toChars(), type->toChars(), t->toChars());
+#endif
+    if (type == t)
+    return this;
-    Type *typeb = type->toBasetype();
-    Type *tb = t->toBasetype();
@@ -1154 +1164 @@
-    Type *t = Type::tptrdiff_t;
-
-
+loc
-    if (!t->equals(t2b))
-        e2 = e2->castTo(sc, t);
@@ -1167 +1177 @@
-    Expression *e;
-
-
+loc
-    if (!t->equals(t1b))
-        e = e1->castTo(sc, t);

branches/dmdfe-2.0/class.c

@@ -1 +1 @@
-
-// Compiler implementation of the D programming language
-6
+7
-// All Rights Reserved
-// written by Walter Bright
@@ -767 +767 @@
-}
-
+/**********************************************************
+ * fd is in the vtbl[] for this class.
+ * Return 1 if function is hidden (not findable through search).
+ */
+
+int isf(void *param, FuncDeclaration *fd)
+{
+    //printf("param = %p, fd = %p %s\n", param, fd, fd->toChars());
+    return param == fd;
+}
+
+int ClassDeclaration::isFuncHidden(FuncDeclaration *fd)
+{
+    //printf("ClassDeclaration::isFuncHidden(%s)\n", fd->toChars());
+    Dsymbol *s = search(0, fd->ident, 4|2);
+    if (!s)
+    {   //printf("not found\n");
+    /* Because, due to a hack, if there are multiple definitions
+     * of fd->ident, NULL is returned.
+     */
+    return 0;
+    }
+    FuncDeclaration *fdstart = s->toAlias()->isFuncDeclaration();
+    //printf("%s fdstart = %p\n", s->kind(), fdstart);
+    return !overloadApply(fdstart, &isf, fd);
+}
+
-/****************
- * Find virtual function matching identifier and type.

branches/dmdfe-2.0/constfold.c

@@ -669 +669 @@
-    assert(op == TOKequal || op == TOKnotequal);
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    {   StringExp *es1 = (StringExp *)e1;
-    StringExp *es2 = (StringExp *)e2;
@@ -793 +821 @@
-    int cmp;
-
-
+
+
+
+
+
-    {
-    SymOffExp *es1 = (SymOffExp *)e1;
@@ -1055 +1087 @@
-    else
-    {
-
+loc, 
-    e = new IntegerExp(loc, 0, type);
-    }
@@ -1252 +1284 @@
-    //printf("\tt1 = %s, t2 = %s\n", t1->toChars(), t2->toChars());
-
-e2->op == TOKint64
+(e2->op == TOKint64 || e2->op == TOKstructliteral)
-    {   e = e2;
-    goto L2;
-    }
-e1->op == TOKint64
+(e1->op == TOKint64 || e1->op == TOKstructliteral)
-    {   e = e1;
-     L2:

branches/dmdfe-2.0/declaration.c

@@ -649 +649 @@
-{
-    //printf("VarDeclaration::semantic('%s', parent = '%s')\n", toChars(), sc->parent->toChars());
-
+ 
-    //printf("linkage = %d\n", sc->linkage);
-    //if (strcmp(toChars(), "mul") == 0) halt();
@@ -841 +841 @@
-    if (type->ty == Tstruct &&
-        ((TypeStruct *)type)->sym->zeroInit == 1)
-
+
+
+
+
+
+
-        Expression *e = new IntegerExp(loc, 0, Type::tint32);
-        Expression *e1;
-        e1 = new VarExp(loc, this);
-        e = new AssignExp(loc, e1, e);
-
-/*->type->defaultInit()*/
+        // don't type check this, it would fail
+
-        return;
-    }
@@ -871 +876 @@
-    {
-    ArrayInitializer *ai = init->isArrayInitializer();
-ype->toBasetype()
+b
-    {
-        init = ai->toAssocArrayInitializer();
-    }
-
+    StructInitializer *si = init->isStructInitializer();
-    ExpInitializer *ei = init->isExpInitializer();
-
@@ -965 +971 @@
-         */
-
-ei && 
+
-        {
-        unsigned errors = global.errors;
-        global.gag++;
-        //printf("+gag\n");
-
+
+
-        inuse++;
-
+
+
+
+
+
+
+
+
+
+
-        inuse--;
-        e = e->implicitCastTo(sc, type);
-        global.gag--;
-        //printf("-gag\n");
@@ -982 +997 @@
-            global.errors = errors; // act as if nothing happened
-        }
-
+ if (ei)
-        {
-            e = e->optimize(WANTvalue | WANTinterpret);
@@ -990 +1005 @@
-            }
-        }
+        else
+            init = i2;      // no errors, keep result
-        }
-    }

branches/dmdfe-2.0/declaration.h

@@ -422 +422 @@
-                    // this one is overriding
-    int inferRetType;           // !=0 if return type is to be inferred
-
+   
-
-    // Things that should really go into Scope

branches/dmdfe-2.0/dsymbol.c

@@ -266 +266 @@
- *  flags:  1   don't find private members
- *      2   don't give error messages
+ *      4   return NULL if ambiguous
- * Returns:
- *  NULL if not found
@@ -664 +665 @@
-               )
-            {
+            if (flags & 4)
+                return NULL;
-            if (!(flags & 2))
-                ss->multiplyDefined(loc, s, s2);
@@ -776 +779 @@
-
-
+/*******************************************
+ * Look for member of the form:
+ *  const(MemberInfo)[] getMembers(string);
+ * Returns NULL if not found
+ */
+
+#if V2
+FuncDeclaration *ScopeDsymbol::findGetMembers()
+{
+    Dsymbol *s = search_function(this, Id::getmembers);
+    FuncDeclaration *fdx = s ? s->isFuncDeclaration() : NULL;
+
+#if 0  // Finish
+    static TypeFunction *tfgetmembers;
+
+    if (!tfgetmembers)
+    {
+    Scope sc;
+    Arguments *arguments = new Arguments;
+    Arguments *arg = new Argument(STCin, Type::tchar->constOf()->arrayOf(), NULL, NULL);
+    arguments->push(arg);
+
+    Type *tret = NULL;
+    tfgetmembers = new TypeFunction(arguments, tret, 0, LINKd);
+    tfgetmembers = (TypeFunction *)tfgetmembers->semantic(0, &sc);
+    }
+    if (fdx)
+    fdx = fdx->overloadExactMatch(tfgetmembers);
+#endif
+    if (fdx && fdx->isVirtual())
+    fdx = NULL;
+
+    return fdx;
+}
+#endif
+
+
-/****************************** WithScopeSymbol ******************************/
-
@@ -873 +913 @@
-    {
-        VarDeclaration *v = new VarDeclaration(loc, Type::tsize_t, Id::dollar, NULL);
+
+        if (ce->op == TOKvar)
+        {   // if ce is const, get its initializer
+        ce = fromConstInitializer(WANTvalue | WANTinterpret, ce);
+        }
-
-        if (ce->op == TOKstring)

branches/dmdfe-2.0/dsymbol.h

@@ -227 +227 @@
-    Dsymbol *nameCollision(Dsymbol *s);
-    char *kind();
+    FuncDeclaration *findGetMembers();
-
-    void emitMemberComments(Scope *sc);

branches/dmdfe-2.0/enum.c

@@ -104 +104 @@
-        assert(e->dyncast() == DYNCAST_EXPRESSION);
-        e = e->semantic(sce);
-
+ | WANTinterpret
-        // Need to copy it because we're going to change the type
-        e = e->copy();
-        e = e->implicitCastTo(sc, memtype);
-
+ | WANTinterpret
-        number = e->toInteger();
-        e->type = t;

branches/dmdfe-2.0/expression.c

@@ -635 +635 @@
-    {   Expression *arg = (Expression *)arguments->data[i];
-
-        if (i)
-        buf->writeByte(',');
-        if (arg)
+        {   if (i)
+            buf->writeByte(',');
-        expToCBuffer(buf, hgs, arg, PREC_assign);
+        }
-    }
-    }
@@ -1100 +1101 @@
-
-        default:
-        print();
-        type->print();
-        assert(0);
@@ -1683 +1683 @@
-        else
-        {
-        //printf("test1 %s\n", s->toChars());
-        e = new DsymbolExp(loc, s);
-        }
@@ -1800 +1799 @@
-        }
-    }
+#if 0
-    if ((v->isConst() || v->isInvariant()) && type->toBasetype()->ty != Tsarray)
-    {   // Replace v with its initializer
@@ -1828 +1828 @@
-        }
-    }
+#endif
-    e = new VarExp(loc, v);
-    e->type = type;
@@ -3556 +3557 @@
-    if (v)
-    {
+#if 0
-    if ((v->isConst() || v->isInvariant()) &&
-        type->toBasetype()->ty != Tsarray && v->init)
@@ -3566 +3568 @@
-        }
-    }
+#endif
-    v->checkNestedReference(sc, loc);
-    }
@@ -4028 +4031 @@
-/************************************************************/
-
-ftypeExp::Iftype
-
-ftype
+sExp::Is
+, TemplateParameters *parameters
+s
-{
-    this->targ = targ;
@@ -4037 +4040 @@
-    this->tspec = tspec;
-    this->tok2 = tok2;
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    targ->syntaxCopy(),
-    id,
-    tok,
-    tspec ? tspec->syntaxCopy() : NULL,
-
-
-
-
+
+
+
+
+
-{   Type *tded;
-
-
+
+
+
+
+
-    if (id && !(sc->flags & SCOPEstaticif))
-    error("can only declare type aliases within static if conditionals");
@@ -4139 +4160 @@
-
-        case TOKfunction:
-
+
+
-            goto Lno;
-        tded = targ;
@@ -4189 +4211 @@
-
-    MATCH m;
-
-
-
-
-
+
-
-    Objects dedtypes;
-1
-data[0] = NULL
-
-&
+parameters->dim
+zero()
+
+
-    if (m == MATCHnomatch ||
-        (m != MATCHexact && tok == TOKequal))
@@ -4205 +4223 @@
-    else
-    {
-        assert(dedtypes.dim == 1);
-        tded = (Type *)dedtypes.data[0];
-        if (!tded)
-        tded = targ;
+
+        Objects tiargs;
+        tiargs.setDim(1);
+        tiargs.data[0] = (void *)targ;
+
+        for (int i = 1; i < parameters->dim; i++)
+        {   TemplateParameter *tp = (TemplateParameter *)parameters->data[i];
+        Declaration *s;
+
+        m = tp->matchArg(sc, &tiargs, i, parameters, &dedtypes, &s);
+        if (m == MATCHnomatch)
+            goto Lno;
+        s->semantic(sc);
+        if (!sc->insert(s))
+            error("declaration %s is already defined", s->toChars());
+#if 0
+        Object *o = (Object *)dedtypes.data[i];
+        Dsymbol *s = TemplateDeclaration::declareParameter(loc, sc, tp, o);
+#endif
+        if (sc->sd)
+            s->addMember(sc, sc->sd, 1);
+        }
+
-        goto Lyes;
-    }
@@ -4245 +4285 @@
-    Dsymbol *s = new AliasDeclaration(loc, id, tded);
-    s->semantic(sc);
-
+
+
-    if (sc->sd)
-        s->addMember(sc, sc->sd, 1);
-    }
-1
+loc, 1, Type::tbool
-
-Lno:
-0
-
-
-ftype
+loc, 0, Type::tbool
+
+
+s
-{
-    buf->writestring("is(");
-    targ->toCBuffer(buf, id, hgs);
-
+
+
+
+
+
-    {
-    if (tok == TOKcolon)
@@ -4266 +4311 @@
-        buf->writestring(" == ");
-    tspec->toCBuffer(buf, NULL, hgs);
+    }
+    if (parameters)
+    {   // First parameter is already output, so start with second
+    for (int i = 1; i < parameters->dim; i++)
+    {
+        buf->writeByte(',');
+        TemplateParameter *tp = (TemplateParameter *)parameters->data[i];
+        tp->toCBuffer(buf, hgs);
+    }
-    }
-    buf->writeByte(')');
@@ -4757 +4811 @@
-        }
-        type = v->type;
+#if 0
-        if (v->isConst() || v->isInvariant())
-        {
@@ -4781 +4836 @@
-            }
-        }
+#endif
-        if (v->needThis())
-        {
@@ -5521 +5577 @@
-        if (search_function(ad, Id::call))
-        goto L1;    // overload of opCall, therefore it's a call
+
+        if (e1->op != TOKtype)
+        error("%s %s does not overload ()", ad->kind(), ad->toChars());
-        /* It's a struct literal
-         */
@@ -6881 +6940 @@
-    {
-        e2 = e2->implicitCastTo(sc, Type::tsize_t);
-
+ | WANTinterpret
-        uinteger_t index = e2->toUInteger();
-        size_t length;

branches/dmdfe-2.0/expression.h

@@ -61 +61 @@
-Expression *resolveProperties(Scope *sc, Expression *e);
-void accessCheck(Loc loc, Scope *sc, Expression *e, Declaration *d);
-AggregateDeclaration
+ScopeDsymbol
-void inferApplyArgTypes(enum TOK op, Arguments *arguments, Expression *aggr);
-void argExpTypesToCBuffer(OutBuffer *buf, Expressions *arguments, HdrGenState *hgs);
@@ -67 +67 @@
-void expandTuples(Expressions *exps);
-FuncDeclaration *hasThis(Scope *sc);
+Expression *fromConstInitializer(int result, Expression *e);
-
-struct Expression : Object
@@ -602 +603 @@
-};
-
-ftype
+s
-{
-    /* is(targ id tok tspec)
@@ -612 +613 @@
-    Type *tspec;    // can be NULL
-    enum TOK tok2;  // 'struct', 'union', 'typedef', etc.
-
-
+
+
+
+
-    Expression *syntaxCopy();
-    Expression *semantic(Scope *sc);

branches/dmdfe-2.0/func.c

@@ -254 +254 @@
-    {
-        //printf("\tnot virtual\n");
-return
+goto Ldone
-    }
-
@@ -284 +284 @@
-            if (fdv->isFinal())
-                error("cannot override final function %s", fdv->toPrettyChars());
+
+            if (!isOverride() && global.params.warnings)
+                error("overrides base class function %s, but is not marked with 'override'", fdv->toPrettyChars());
+
-            if (fdv->toParent() == parent)
-            {
@@ -433 +437 @@
-    if (introducing && isOverride())
-    {
-function %s does not override any", toChars()
+does not override any function"
-    }
-
@@ -525 +529 @@
-    }
-
+Ldone:
-    /* Save scope for possible later use (if we need the
-     * function internals)
@@ -2114 +2119 @@
-
-StaticCtorDeclaration::StaticCtorDeclaration(Loc loc, Loc endloc)
-
+
+