Changeset 311

Timestamp:

02/06/07 01:11:12 (2 years ago)

Author:

Gregor

Message:

*: Frontend updated to 1.005

Files:

• branches/rebuild/rebuild/Makefile (modified) (2 diffs)
• branches/rebuild/rebuild/attrib.c (modified) (4 diffs)
• branches/rebuild/rebuild/attrib.h (modified) (1 diff)
• branches/rebuild/rebuild/cast.c (modified) (3 diffs)
• branches/rebuild/rebuild/cond.c (modified) (1 diff)
• branches/rebuild/rebuild/constfold.c (modified) (1 diff)
• branches/rebuild/rebuild/dsymbol.c (modified) (4 diffs)
• branches/rebuild/rebuild/dsymbol.h (modified) (2 diffs)
• branches/rebuild/rebuild/expression.c (modified) (11 diffs)
• branches/rebuild/rebuild/expression.h (modified) (5 diffs)
• branches/rebuild/rebuild/func.c (modified) (5 diffs)
• branches/rebuild/rebuild/idgen.c (modified) (1 diff)
• branches/rebuild/rebuild/inline.c (modified) (3 diffs)
• branches/rebuild/rebuild/lexer.c (modified) (7 diffs)
• branches/rebuild/rebuild/lexer.h (modified) (1 diff)
• branches/rebuild/rebuild/mars.c (modified) (2 diffs)
• branches/rebuild/rebuild/module.c (modified) (1 diff)
• branches/rebuild/rebuild/mtype.c (modified) (8 diffs)
• branches/rebuild/rebuild/mtype.h (modified) (10 diffs)
• branches/rebuild/rebuild/optimize.c (modified) (1 diff)
• branches/rebuild/rebuild/parse.c (modified) (9 diffs)
• branches/rebuild/rebuild/parse.h (modified) (2 diffs)
• branches/rebuild/rebuild/scope.c (modified) (5 diffs)
• branches/rebuild/rebuild/statement.c (modified) (10 diffs)
• branches/rebuild/rebuild/statement.h (modified) (2 diffs)
• branches/rebuild/rebuild/template.c (modified) (20 diffs)
• branches/rebuild/rebuild/template.h (modified) (1 diff)

branches/rebuild/rebuild/Makefile

@@ -13 +13 @@
-ARFLAGS=rc
-RANLIB=$(CROSS)ranlib
+
+PREFIX=/usr
-
-OBJS=\
@@ -111 +113 @@
-    $(CXX) $(CXXFLAGS) -D_DH -DIN_DMDFE -c $< -o $@
-
+install:
+    mkdir -p $(PREFIX)/bin
+    mkdir -p $(PREFIX)/etc/rebuild
+    cp -pf rebuild$(EXEEXT) $(PREFIX)/bin
+    cp -pRf rebuild.conf/* $(PREFIX)/etc/rebuild/
+
-clean:
-    rm -f rebuild$(EXEEXT) libdmd.a $(OBJS)

branches/rebuild/rebuild/attrib.c

@@ -1 +1 @@
-
-// Compiler implementation of the D programming language
-6
+7
-// All Rights Reserved
-// written by Walter Bright
@@ -30 +30 @@
-#include "aggregate.h"
-#include "module.h"
+#include "parse.h"
-#include "config.h"
-
@@ -765 +766 @@
-        if (e->op != TOKstring)
-        error("string expected for library name, not '%s'", e->toChars());
+        else if (global.params.verbose)
+        {
+        StringExp *se = (StringExp *)e;
+        char *name = (char *)mem.malloc(se->len + 1);
+        memcpy(name, se->string, se->len);
+        name[se->len] = 0;
+        printf("library   %s\n", name);
+        mem.free(name);
+        }
-    }
-    goto Lnodecl;
@@ -1128 +1138 @@
-
-
+/***************************** CompileDeclaration *****************************/
+
+CompileDeclaration::CompileDeclaration(Loc loc, Expression *exp)
+    : AttribDeclaration(NULL)
+{
+    this->exp = exp;
+    this->sd = NULL;
+}
+
+Dsymbol *CompileDeclaration::syntaxCopy(Dsymbol *s)
+{
+    //printf("CompileDeclaration::syntaxCopy('%s')\n", toChars());
+    CompileDeclaration *sc = new CompileDeclaration(loc, exp->syntaxCopy());
+    return sc;
+}
+
+int CompileDeclaration::addMember(Scope *sc, ScopeDsymbol *sd, int memnum)
+{
+    this->sd = sd;
+    return memnum;
+}
+
+void CompileDeclaration::semantic(Scope *sc)
+{
+    //printf("CompileDeclaration::semantic()\n");
+    exp = exp->semantic(sc);
+    exp = resolveProperties(sc, exp);
+    exp = exp->optimize(WANTvalue);
+    if (exp->op != TOKstring)
+    {   error("argument to mixin must be a string, not (%s)", exp->toChars());
+    return;
+    }
+    StringExp *se = (StringExp *)exp;
+    se = se->toUTF8(sc);
+    Parser p(sc->module, (unsigned char *)se->string, se->len, 0);
+    p.loc = loc;
+    decl = p.parseDeclDefs(0);
+    if (p.token.value != TOKeof)
+    {
+    error("incomplete mixin declaration (%s)", se->toChars());
+    }
+
+    AttribDeclaration::addMember(sc, sd, 0);
+    AttribDeclaration::semantic(sc);
+}
+
+void CompileDeclaration::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
+{
+    buf->writestring("mixin(");
+    exp->toCBuffer(buf, hgs);
+    buf->writestring(");");
+    buf->writenl();
+}

branches/rebuild/rebuild/attrib.h

@@ -151 +151 @@
-};
-
+// Mixin declarations
+
+struct CompileDeclaration : AttribDeclaration
+{
+    Expression *exp;
+
+    ScopeDsymbol *sd;
+
+    CompileDeclaration(Loc loc, Expression *exp);
+    Dsymbol *syntaxCopy(Dsymbol *s);
+    int addMember(Scope *sc, ScopeDsymbol *sd, int memnum);
+    void semantic(Scope *sc);
+    void toCBuffer(OutBuffer *buf, HdrGenState *hgs);
+};
+
-#endif /* DMD_ATTRIB_H */

branches/rebuild/rebuild/cast.c

@@ -50 +50 @@
-    return castTo(sc, t);
-    }
+
+    Expression *e = optimize(WANTflags | WANTvalue);
+    if (e != this)
+    return e->implicitCastTo(sc, t);
+
-#if 0
-print();
@@ -70 +75 @@
-    //error("forward reference to type %s", t->toChars());
-    }
-
-
-
-
+
+
+
+
+
-    return castTo(sc, t);
-}
@@ -628 +634 @@
-
-    tb = t->toBasetype();
+    //printf("\ttype = %s\n", type->toChars());
-    if (tb->ty == Tdelegate && type->toBasetype()->ty != Tdelegate)
-    return Expression::castTo(sc, t);

branches/rebuild/rebuild/cond.c

@@ -320 +320 @@
-        parameters.data[0] = (void *)&tp;
-
-Array
+Objects
-        dedtypes.setDim(1);
-

branches/rebuild/rebuild/constfold.c

@@ -907 +907 @@
-    real_t r2;
-
+    //printf("EqualExp::constFold() %s\n", toChars());
-    assert(op == TOKequal || op == TOKnotequal);
-    e1 = e1->constFold();

branches/rebuild/rebuild/dsymbol.c

@@ -1 +1 @@
-
-// Compiler implementation of the D programming language
-6
+7
-// All Rights Reserved
-// written by Walter Bright
@@ -737 +737 @@
-    exp = e;
-    type = NULL;
+    td = NULL;
-}
-
@@ -744 +745 @@
-    exp = NULL;
-    type = t;
+    td = NULL;
+}
+
+ArrayScopeSymbol::ArrayScopeSymbol(TupleDeclaration *s)
+    : ScopeDsymbol()
+{
+    exp = NULL;
+    type = NULL;
+    td = s;
-}
-
@@ -754 +764 @@
-
-    L1:
+
+    if (td)
+    {
+        VarDeclaration *v = new VarDeclaration(0, Type::tsize_t, Id::dollar, NULL);
+        Expression *e = new IntegerExp(0, td->objects->dim, Type::tsize_t);
+        v->init = new ExpInitializer(0, e);
+        v->storage_class |= STCconst;
+        return v;
+    }
+
-    if (type)
-    {

branches/rebuild/rebuild/dsymbol.h

@@ -1 +1 @@
-
-// Compiler implementation of the D programming language
-6
+7
-// All Rights Reserved
-// written by Walter Bright
@@ -250 +250 @@
-    Expression *exp;    // IndexExp or SliceExp
-    TypeTuple *type;    // for tuple[length]
+    TupleDeclaration *td;   // for tuples of objects
-
-    ArrayScopeSymbol(Expression *e);
-    ArrayScopeSymbol(TypeTuple *t);
+    ArrayScopeSymbol(TupleDeclaration *td);
-    Dsymbol *search(Loc loc, Identifier *ident, int flags);
-

branches/rebuild/rebuild/expression.c

@@ -1 +1 @@
-
-// Compiler implementation of the D programming language
-6
+7
-// All Rights Reserved
-// written by Walter Bright
@@ -58 +58 @@
-#include "attrib.h"
-#include "hdrgen.h"
+#include "parse.h"
-
-//Expression *createTypeInfoArray(Scope *sc, Expression *args[], int dim);
@@ -1913 +1914 @@
-#endif
-    if (type)
-
+//
-    return this;
-    }
@@ -2258 +2259 @@
-    }
-    type = type->semantic(loc, sc);
+    }
+    return this;
+}
+
+/****************************************
+ * Convert string to char[].
+ */
+
+StringExp *StringExp::toUTF8(Scope *sc)
+{
+    if (sz != 1)
+    {   // Convert to UTF-8 string
+    committed = 0;
+    Expression *e = castTo(sc, Type::tchar->arrayOf());
+    e = e->optimize(WANTvalue);
+    assert(e->op == TOKstring);
+    StringExp *se = (StringExp *)e;
+    assert(se->sz == 1);
+    return se;
-    }
-    return this;
@@ -3134 +3154 @@
-        {
-        //ei->exp->implicitCastTo(sc, type)->print();
-printf("test3: %s\n", ei->exp->toChars());
-        return ei->exp->implicitCastTo(sc, type);
-        }
@@ -3728 +3747 @@
-    parameters.data[0] = (void *)&tp;
-
-Array
+Objects
-    dedtypes.setDim(1);
-    dedtypes.data[0] = NULL;
@@ -3994 +4013 @@
-/************************************************************/
-
+CompileExp::CompileExp(Loc loc, Expression *e)
+    : UnaExp(loc, TOKmixin, sizeof(CompileExp), e)
+{
+}
+
+Expression *CompileExp::semantic(Scope *sc)
+{
+#if LOGSEMANTIC
+    printf("CompileExp::semantic('%s')\n", toChars());
+#endif
+    UnaExp::semantic(sc);
+    e1 = resolveProperties(sc, e1);
+    e1 = e1->optimize(WANTvalue);
+    if (e1->op != TOKstring)
+    {   error("argument to mixin must be a string, not (%s)", e1->toChars());
+    return this;
+    }
+    StringExp *se = (StringExp *)e1;
+    se = se->toUTF8(sc);
+    Parser p(sc->module, (unsigned char *)se->string, se->len, 0);
+    p.loc = loc;
+    Expression *e = p.parseExpression();
+    if (p.token.value != TOKeof)
+    error("incomplete mixin expression (%s)", se->toChars());
+    return e->semantic(sc);
+}
+
+void CompileExp::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
+{
+    buf->writestring("mixin(");
+    expToCBuffer(buf, hgs, e1, PREC_assign);
+    buf->writeByte(')');
+}
+
+/************************************************************/
+
+FileExp::FileExp(Loc loc, Expression *e)
+    : UnaExp(loc, TOKmixin, sizeof(FileExp), e)
+{
+}
+
+Expression *FileExp::semantic(Scope *sc)
+{
+#if LOGSEMANTIC
+    printf("FileExp::semantic('%s')\n", toChars());
+#endif
+    UnaExp::semantic(sc);
+    e1 = resolveProperties(sc, e1);
+    e1 = e1->optimize(WANTvalue);
+    if (e1->op != TOKstring)
+    {   error("file name argument must be a string, not (%s)", e1->toChars());
+    return this;
+    }
+    StringExp *se = (StringExp *)e1;
+    se = se->toUTF8(sc);
+
+    if (global.params.verbose)
+    printf("file      %s\n", se->string);
+
+    File f((char *)se->string);
+    if (f.read())
+    {   error("cannot read file %s", f.toChars());
+    se = new StringExp(loc, "");
+    }
+    else
+    {
+    f.ref = 1;
+    se = new StringExp(loc, f.buffer, f.len);
+    }
+    return se->semantic(sc);
+}
+
+void FileExp::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
+{
+    buf->writestring("import(");
+    expToCBuffer(buf, hgs, e1, PREC_assign);
+    buf->writeByte(')');
+}
+
+/************************************************************/
+
-AssertExp::AssertExp(Loc loc, Expression *e, Expression *msg)
-    : UnaExp(loc, TOKassert, sizeof(AssertExp), e)
@@ -4075 +4175 @@
-
-//{ static int z; fflush(stdout); if (++z == 10) *(char*)0=0; }
+
+#if 0
+    /* Don't do semantic analysis if we'll be converting
+     * it to a string.
+     */
+    if (ident == Id::stringof)
+    {   char *s = e1->toChars();
+    e = new StringExp(loc, s, strlen(s), 'c');
+    e = e->semantic(sc);
+    return e;
+    }
+#endif
-
-    /* Special case: rewrite this.id and super.id
@@ -4272 +4384 @@
-         ident != Id::init && ident != Id::__sizeof &&
-         ident != Id::alignof && ident != Id::offsetof &&
-
+ && ident != Id::stringof
-    {
-    e = new PtrExp(loc, e1);
@@ -5646 +5758 @@
-}
-
+void CastExp::checkEscape()
+{   Type *tb = type->toBasetype();
+    if (tb->ty == Tarray && e1->op == TOKvar &&
+    e1->type->toBasetype()->ty == Tsarray)
+    {   VarExp *ve = (VarExp *)e1;
+    VarDeclaration *v = ve->var->isVarDeclaration();
+    if (v)
+    {
+        if (!v->isDataseg())
+        error("escaping reference to local %s", v->toChars());
+    }
+    }
+}
+
-void CastExp::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
-{
@@ -7754 +7880 @@
-    Type *t2;
-
+    //printf("EqualExp::semantic('%s')\n", toChars());
-    if (type)
-    return this;

branches/rebuild/rebuild/expression.h

@@ -1 +1 @@
-
-// Compiler implementation of the D programming language
-6
+7
-// All Rights Reserved
-// written by Walter Bright
@@ -285 +285 @@
-    char *toChars();
-    Expression *semantic(Scope *sc);
+    StringExp *toUTF8(Scope *sc);
-    int implicitConvTo(Type *t);
-    Expression *castTo(Scope *sc, Type *t);
@@ -453 +454 @@
-    void scanForNestedRef(Scope *sc);
-
-//
+
-    Expression *doInline(InlineDoState *ids);
-    //Expression *inlineScan(InlineScanState *iss);
@@ -588 +589 @@
-/****************************************************************/
-
+struct CompileExp : UnaExp
+{
+    CompileExp(Loc loc, Expression *e);
+    Expression *semantic(Scope *sc);
+    void toCBuffer(OutBuffer *buf, HdrGenState *hgs);
+};
+
+struct FileExp : UnaExp
+{
+    FileExp(Loc loc, Expression *e);
+    Expression *semantic(Scope *sc);
+    void toCBuffer(OutBuffer *buf, HdrGenState *hgs);
+};
+
-struct AssertExp : UnaExp
-{
@@ -772 +787 @@
-    Expression *optimize(int result);
-    int checkSideEffect(int flag);
+    void checkEscape();
-    void toCBuffer(OutBuffer *buf, HdrGenState *hgs);
-    Expression *constFold();

branches/rebuild/rebuild/func.c

@@ -930 +930 @@
-
-        // Verify that all the ctorinit fields got initialized
-
+2
-        {
-            for (int i = 0; i < cd->fields.dim; i++)
@@ -1644 +1644 @@
-int FuncDeclaration::isAbstract()
-{
- && !fbody
+
-}
-
@@ -1940 +1940 @@
-{
-    ClassDeclaration *cd;
-    Type *tret;
-
-    sc = sc->push();
-    sc->stc &= ~STCstatic;      // not a static destructor
-
-    parent = sc->parent;
@@ -1955 +1951 @@
-    cd->dtors.push(this);
-    type = new TypeFunction(NULL, Type::tvoid, FALSE, LINKd);
+
+    sc = sc->push();
+    sc->stc &= ~STCstatic;      // not a static destructor
+    sc->linkage = LINKd;
-
-    FuncDeclaration::semantic(sc);
@@ -2179 +2179 @@
-    type = new TypeFunction(NULL, Type::tvoid, FALSE, LINKd);
-
+    sc = sc->push();
+    sc->stc &= ~STCstatic;      // not a static invariant
-    sc->incontract++;
+    sc->linkage = LINKd;
+
-    FuncDeclaration::semantic(sc);
-
+
+
-}
-

branches/rebuild/rebuild/idgen.c

@@ -46 +46 @@
-    { "alignof" },
-    { "mangleof" },
+    { "stringof" },
-    { "tupleof" },
-    { "length" },

branches/rebuild/rebuild/inline.c

@@ -147 +147 @@
-int Expression::inlineCost(InlineCostState *ics)
-{
+    return 1;
+}
+
+int VarExp::inlineCost(InlineCostState *ics)
+{
+    //printf("VarExp::inlineCost() %s\n", toChars());
-    return 1;
-}
@@ -471 +477 @@
-Expression *ThisExp::doInline(InlineDoState *ids)
-{
+    //if (!ids->vthis)
+    //error("no 'this' when inlining %s", ids->parent->toChars());
-    assert(ids->vthis);
-
@@ -1133 +1141 @@
-
-#if CANINLINE_LOG
-'%s')\n"
+hasthis = %d, '%s')\n", hasthis
-#endif
+
+    if (needThis() && !hasthis)
+    return 0;
-
-    if (inlineNest || (!semanticRun && !hdrscan))

branches/rebuild/rebuild/lexer.c

@@ -1 +1 @@
-
-// Compiler implementation of the D programming language
-6
+7
-// All Rights Reserved
-// written by Walter Bright
@@ -1001 +1001 @@
-        if (*p == '=')
-        {   p++;
-
+ && global.params.Dversion == 1
-            {   p++;
-            t->value = TOKnotidentity;  // !==
@@ -1043 +1043 @@
-        if (*p == '=')
-        {   p++;
-
+ && global.params.Dversion == 1
-            {   p++;
-            t->value = TOKidentity;     // ===
@@ -2507 +2507 @@
-    {   "typeof",   TOKtypeof   },
-    {   "typeid",   TOKtypeid   },
-    {   "iftype",   TOKiftype   },
-
-    {   "template", TOKtemplate },
@@ -2526 +2525 @@
-    {   "real",     TOKfloat80  },
-
-/*  {   "bit",      TOKbit      }, */
-    {   "bool",     TOKbool     },
-    {   "char",     TOKchar     },
@@ -2565 +2563 @@
-    {   "foreach_reverse",  TOKforeach_reverse  },
-    {   "scope",    TOKscope    },
-    {   "on_scope_exit",    TOKon_scope_exit },
-    {   "on_scope_failure", TOKon_scope_failure },
-    {   "on_scope_success", TOKon_scope_success },
-
-    {   "struct",   TOKstruct   },
@@ -2577 +2572 @@
-    {   "mixin",    TOKmixin    },
-    {   "static",   TOKstatic   },
-    /*{ "virtual",  TOKvirtual  },*/
-    {   "final",    TOKfinal    },
-    {   "const",    TOKconst    },

branches/rebuild/rebuild/lexer.h

@@ -65 +65 @@
-    TOKpragma,  TOKdsymbol,
-    TOKtypeid,  TOKuadd,
-iftype, TOK
+
-    TOKnewanonclass, TOKcomment,
-    TOKarrayliteral,

branches/rebuild/rebuild/mars.c

@@ -57 +57 @@
-    doc_ext  = "html";
-    ddoc_ext = "ddoc";
+
-    obj_ext  = "o";
-
+
-    copyright = "Copyright (c) 1999-2007 by Digital Mars and Gregor Richards,";
-    written = "written by Walter Bright and Gregor Richards";
-4
+5
-    global.structalign = 8;
-    cmodules = NULL;
@@ -251 +252 @@
-    global.params.useInline = 0;
-    global.params.obj = 1;
+    global.params.Dversion = 2;
-
-    global.params.linkswitches = new Array();

branches/rebuild/rebuild/module.c

@@ -289 +289 @@
-    result = sdi;
-    else if (FileName::exists(sd))
-
+ 
-    else if (FileName::absolute(filename))
-    ;

branches/rebuild/rebuild/mtype.c

@@ -540 +540 @@
-    e = e->semantic(&sc);
-    }
+    else if (ident == Id::stringof)
+    {   char *s = toChars();
+    e = new StringExp(loc, s, strlen(s), 'c');
+    Scope sc;
+    e = e->semantic(&sc);
+    }
-    else
-    {
@@ -613 +619 @@
-        error(e->loc, ".typeinfo deprecated, use typeid(type)"); */
-    e = getTypeInfo(sc);
+    return e;
+    }
+    if (ident == Id::stringof)
+    {   char *s = e->toChars();
+    e = new StringExp(e->loc, s, strlen(s), 'c');
+    Scope sc;
+    e = e->semantic(&sc);
-    return e;
-    }
@@ -1653 +1666 @@
-    *pe = e;
-    }
+    else if (*ps)
+    {   Dsymbol *s = *ps;
+    TupleDeclaration *td = s->isTupleDeclaration();
+    if (td)
+    {
+        ScopeDsymbol *sym = new ArrayScopeSymbol(td);
+        sym->parent = sc->scopesym;
+        sc = sc->push(sym);
+
+        dim = dim->semantic(sc);
+        dim = dim->constFold();
+        uinteger_t d = dim->toUInteger();
+
+        sc = sc->pop();
+
+        if (d >= td->objects->dim)
+        {   error(loc, "tuple index %ju exceeds %u", d, td->objects->dim);
+        goto Ldefault;
+        }
+
+        /* Create a new TupleDeclaration which
+         * is a slice [d..d+1] out of the old one.
+         * Do it this way because TemplateInstance::semanticTiargs()
+         * can handle unresolved Objects this way.
+         */
+        Objects *objects = new Objects;
+        objects->setDim(1);
+        objects->data[0] = td->objects->data[(size_t)d];
+
+        TupleDeclaration *tds = new TupleDeclaration(loc, td->ident, objects);
+        *ps = tds;
+    }
+    else
+        goto Ldefault;
+    }
-    else
+    {
+     Ldefault:
-    Type::resolve(loc, sc, pe, pt, ps);
+    }
-}
-
@@ -2971 +3022 @@
-    VarDeclaration *v;
-    EnumMember *em;
+    TupleDeclaration *td;
-    Type *t;
-    Expression *e;
@@ -3935 +3987 @@
-    return 0;       // assume not
-    }
-
+
+
+
+
+
+
+
+
+
-}
-
@@ -4773 +4833 @@
-    *pe = e;
-    }
+    else if (*ps)
+    {   Dsymbol *s = *ps;
+    TupleDeclaration *td = s->isTupleDeclaration();
+    if (td)
+    {
+        /* It's a slice of a TupleDeclaration
+         */
+        ScopeDsymbol *sym = new ArrayScopeSymbol(td);
+        sym->parent = sc->scopesym;
+        sc = sc->push(sym);
+
+        lwr = lwr->semantic(sc);
+        lwr = lwr->constFold();
+        uinteger_t i1 = lwr->toUInteger();
+
+        upr = upr->semantic(sc);
+        upr = upr->constFold();
+        uinteger_t i2 = upr->toUInteger();
+
+        sc = sc->pop();
+
+        if (!(i1 <= i2 && i2 <= td->objects->dim))
+        {   error(loc, "slice [%ju..%ju] is out of range of [0..%u]", i1, i2, td->objects->dim);
+        goto Ldefault;
+        }
+
+        if (i1 == 0 && i2 == td->objects->dim)
+        {
+        *ps = td;
+        return;
+        }
+
+        /* Create a new TupleDeclaration which
+         * is a slice [i1..i2] out of the old one.
+         */
+        Objects *objects = new Objects;
+        objects->setDim(i2 - i1);
+        for (size_t i = 0; i < objects->dim; i++)
+        {
+        objects->data[i] = td->objects->data[(size_t)i1 + i];
+        }
+
+        TupleDeclaration *tds = new TupleDeclaration(loc, td->ident, objects);
+        *ps = tds;
+    }
+    else
+        goto Ldefault;
+    }
-    else
+    {
+     Ldefault:
-    Type::resolve(loc, sc, pe, pt, ps);
+    }
-}
-
@@ -4980 +5091 @@
-    for (size_t i = 0; i < args->dim; i++)
-    {   Argument *arg = (Argument *)args->data[i];
-
-
-
-
+
+
+
+
+
-        }
-        else
@@ -5008 +5120 @@
-    for (size_t i = 0; i < args->dim; i++)
-    {   Argument *arg = (Argument *)args->data[i];
-
-
-
-
+
+
+
+
+
-        if (arg)
-        return arg;

branches/rebuild/rebuild/mtype.h

@@ -232 +232 @@
-    virtual int isZeroInit();       // if initializer is 0
-    Identifier *getTypeInfoIdent(int internal);
-Array *a
+Objects *ded
-    virtual void resolve(Loc loc, Scope *sc, Expression **pe, Type **pt, Dsymbol **ps);
-    Expression *getInternalTypeInfo(Scope *sc);
@@ -305 +305 @@
-    Expression *defaultInit();
-    dt_t **toDtElem(dt_t **pdt, Expression *e);
-Array *a
+Objects *ded
-    Expression *toExpression();
-    int hasPointers();
@@ -343 +343 @@
-    Expression *dotExp(Scope *sc, Expression *e, Identifier *ident);
-    Expression *defaultInit();
-Array *a
+Objects *ded
-    int checkBoolean();
-    int hasPointers();
@@ -396 +396 @@
-    void toDecoBuffer(OutBuffer *buf);
-    void toCBuffer2(OutBuffer *buf, Identifier *ident, HdrGenState *hgs);
-Array *a
+Objects *ded
-    Type *reliesOnTident();
-
@@ -442 +442 @@
-    Dsymbol *toDsymbol(Scope *sc);
-    Type *semantic(Loc loc, Scope *sc);
-Array *a
+Objects *ded
-    Type *reliesOnTident();
-    Expression *toExpression();
@@ -460 +460 @@
-    void resolve(Loc loc, Scope *sc, Expression **pe, Type **pt, Dsymbol **ps);
-    Type *semantic(Loc loc, Scope *sc);
-Array *a
+Objects *ded
-};
-
@@ -494 +494 @@
-    int isZeroInit();
-    int checkBoolean();
-Array *a
+Objects *ded
-    int hasPointers();
-};
@@ -521 +521 @@
-    Expression *defaultInit();
-    int isZeroInit();
-Array *a
+Objects *ded
-    int hasPointers();
-};
@@ -553 +553 @@
-    Expression *defaultInit();
-    int isZeroInit();
-Array *a
+Objects *ded
-    int hasPointers();
-};
@@ -575 +575 @@
-    Expression *defaultInit();
-    int isZeroInit();
-Array *a
+Objects *ded
-    int isauto();
-    int checkBoolean();

branches/rebuild/rebuild/optimize.c

@@ -355 +355 @@
-        Expression *v = eq.constFold();
-        value = v->toInteger();
-
+ == 0
-            break;
-        }