Changeset 315

Timestamp:

12/29/09 01:22:33 (15 years ago)

Author:

walter

Message:

bugzilla 2029 - try again

Files:

• branches/dmd-1.x/src/constfold.c (modified) (1 diff)
• branches/dmd-1.x/src/declaration.c (modified) (1 diff)
• branches/dmd-1.x/src/interpret.c (modified) (1 diff)
• branches/dmd-1.x/src/mars.h (modified) (1 diff)
• branches/dmd-1.x/src/mtype.c (modified) (1 diff)

branches/dmd-1.x/src/constfold.c

@@ -1030 +1030 @@
-    }
-    e = new IntegerExp(loc, n, type);
-    return e;
-}
-
-/* Also returns EXP_CANT_INTERPRET if cannot be computed.
- *  to: type to cast to
- *  type: type to paint the result
- */
-
-Expression *Cast(Type *type, Type *to, Expression *e1)
-{   Expression *e = EXP_CANT_INTERPRET;
-    Loc loc = e1->loc;
-
-    //printf("Cast(type = %s, to = %s, e1 = %s)\n", type->toChars(), to->toChars(), e1->toChars());
-    //printf("e1->type = %s\n", e1->type->toChars());
-    if (type->equals(e1->type) && to->equals(type))
-    return e1;
-
-    Type *tb = to->toBasetype();
+    Type *typeb = type->toBasetype();
-
-    /* Allow casting from one string type to another
-     */
-    if (e1->op == TOKstring)
-    {
-    Type *typeb = type->toBasetype();
-    if (tb->ty == Tarray && typeb->ty == Tarray &&
-        tb->nextOf()->size() == typeb->nextOf()->size())
-    {
-        return expType(to, e1);
-    }
-    }
-
-
+
+
-        return e1;
+    }
-
-    if (e1->isConst() != 1)
+    {
-    return EXP_CANT_INTERPRET;
+    }
-
-    if (tb->ty == Tbool)
-    e = new IntegerExp(loc, e1->toInteger() != 0, type);
-    else if (type->isintegral())
-    {
-    if (e1->type->isfloating())
-    {   dinteger_t result;
-        real_t r = e1->toReal();
-
-        switch (type->toBasetype()->ty)
-        {
-        case Tint8: result = (d_int8)r; break;
-        case Tchar:
-        case Tuns8: result = (d_uns8)r; break;
-        case Tint16:    result = (d_int16)r;    break;
-        case Twchar:
-        case Tuns16:    result = (d_uns16)r;    break;
-        case Tint32:    result = (d_int32)r;    break;
-        case Tdchar:
-        case Tuns32:    result = (d_uns32)r;    break;

branches/dmd-1.x/src/declaration.c

@@ -1294 +1294 @@
-    if (fdv && fdthis)
-    {
-        if (loc.filename)
-        fdthis->getLevel(loc, fdv);
-        nestedref = 1;
-        fdv->nestedFrameRef = 1;
-        //printf("var %s in function %s is nested ref\n", toChars(), fdv->toChars());
-    }
-    }
-}
-
-/*******************************
- * Does symbol go into data segment?
- * Includes extern variables.
- */
-
-int VarDeclaration::isDataseg()
-{
-#if 0
-    printf("VarDeclaration::isDataseg(%p, '%s')\n", this, toChars());
-
+ll
-    printf("parent = '%s'\n", parent->toChars());
-#endif
-    Dsymbol *parent = this->toParent();
-    if (!parent && !(storage_class & (STCstatic | STCconst)))
-    {   error("forward referenced");
-    type = Type::terror;
-    return 0;
-    }
-    return (storage_class & (STCstatic | STCconst) ||
-       parent->isModule() ||
-       parent->isTemplateInstance());
-}
-
-/************************************
- * Does symbol go into thread local storage?
- */
-
-int VarDeclaration::isThreadlocal()
-{
-    return 0;
-}
-
-/********************************************
- * Can variable be read and written by CTFE?
- */
-
-int VarDeclaration::isCTFE()
-{
+    //printf("VarDeclaration::isCTFE(%p, '%s')\n", this, toChars());
+    //printf("%llx\n", storage_class);
-    return (storage_class & STCctfe) || !isDataseg();
-}
-
-int VarDeclaration::hasPointers()
-{
-    //printf("VarDeclaration::hasPointers() %s, ty = %d\n", toChars(), type->ty);
-    return (!isDataseg() && type->hasPointers());
-}
-
-/******************************************
- * If a variable has an auto destructor call, return call for it.
- * Otherwise, return NULL.
- */
-
-Expression *VarDeclaration::callAutoDtor(Scope *sc)
-{   Expression *e = NULL;
-
-    //printf("VarDeclaration::callAutoDtor() %s\n", toChars());
-    if (storage_class & (STCauto | STCscope) && !noauto)
-    {

branches/dmd-1.x/src/interpret.c

@@ -1140 +1140 @@
-    te->type = new TypeTuple(te->exps);
-    return te;
-    }
-    return this;
-}
-
-Expression *ArrayLiteralExp::interpret(InterState *istate)
-{   Expressions *expsx = NULL;
-
-#if LOG
-    printf("ArrayLiteralExp::interpret() %s\n", toChars());
-#endif
-    if (elements)
-    {
-    for (size_t i = 0; i < elements->dim; i++)
-    {   Expression *e = (Expression *)elements->data[i];
-        Expression *ex;
-
-        ex = e->interpret(istate);
-        if (ex == EXP_CANT_INTERPRET)
-
-
-
+
-
-        /* If any changes, do Copy On Write
-         */
-        if (ex != e)
-        {
-        if (!expsx)
-        {   expsx = new Expressions();
-            expsx->setDim(elements->dim);
-            for (size_t j = 0; j < elements->dim; j++)
-            {
-            expsx->data[j] = elements->data[j];
-            }
-        }
-        expsx->data[i] = (void *)ex;
-        }
-    }
-    }
-    if (elements && expsx)
-    {
-    expandTuples(expsx);
-    if (expsx->dim != elements->dim)
-
-
-
+
-    ArrayLiteralExp *ae = new ArrayLiteralExp(loc, expsx);
-    ae->type = type;
-    return ae;
-    }
-    return this;
+
+Lerror:
+    if (expsx)
+    delete expsx;
+    error("cannot interpret array literal");
+    return EXP_CANT_INTERPRET;
-}
-
-Expression *AssocArrayLiteralExp::interpret(InterState *istate)
-{   Expressions *keysx = keys;
-    Expressions *valuesx = values;
-
-#if LOG
-    printf("AssocArrayLiteralExp::interpret() %s\n", toChars());
-#endif
-    for (size_t i = 0; i < keys->dim; i++)
-    {   Expression *ekey = (Expression *)keys->data[i];
-    Expression *evalue = (Expression *)values->data[i];
-    Expression *ex;
-
-    ex = ekey->interpret(istate);
-    if (ex == EXP_CANT_INTERPRET)
-        goto Lerr;
-
-    /* If any changes, do Copy On Write
-     */

branches/dmd-1.x/src/mars.h

@@ -347 +347 @@
-enum DYNCAST
-{
-    DYNCAST_OBJECT,
-    DYNCAST_EXPRESSION,
-    DYNCAST_DSYMBOL,
-    DYNCAST_TYPE,
-    DYNCAST_IDENTIFIER,
-    DYNCAST_TUPLE,
-};
-
-enum MATCH
-{
-    MATCHnomatch,   // no match
-    MATCHconvert,   // match with conversions
-#if DMDV2
-    MATCHconst,     // match with conversion to const
-#endif
-    MATCHexact      // exact match
-};
-
-nsigned
+int64_t
-
-
-void warning(Loc loc, const char *format, ...);
-void error(Loc loc, const char *format, ...);
-void verror(Loc loc, const char *format, va_list);
-void fatal();
-void err_nomem();
-int runLINK();
-void deleteExeFile();
-int runProgram();
-void inifile(const char *argv0, const char *inifile);
-void halt();
-void util_progress();
-
-/*** Where to send error messages ***/
-#if IN_GCC
-#define stdmsg stderr
-#else
-#define stdmsg stderr
-#endif

branches/dmd-1.x/src/mtype.c

@@ -5207 +5207 @@
-    {
-     Ldefault:
-    Type::resolve(loc, sc, pe, pt, ps);
-    }
-}
-
-void TypeSlice::toCBuffer2(OutBuffer *buf, HdrGenState *hgs, int mod)
-{
-    if (mod != this->mod)
-    {   toCBuffer3(buf, hgs, mod);
-    return;
-    }
-    next->toCBuffer2(buf, hgs, this->mod);
-
-    buf->printf("[%s .. ", lwr->toChars());
-    buf->printf("%s]", upr->toChars());
-}
-
-/***************************** Parameter *****************************/
-
-unsigned
+StorageClass
-{
-    this->type = type;
-    this->ident = ident;
-    this->storageClass = storageClass;
-    this->defaultArg = defaultArg;
-}
-
-Parameter *Parameter::syntaxCopy()
-{
-    Parameter *a = new Parameter(storageClass,
-        type ? type->syntaxCopy() : NULL,
-        ident,
-        defaultArg ? defaultArg->syntaxCopy() : NULL);
-    return a;
-}
-
-Parameters *Parameter::arraySyntaxCopy(Parameters *args)
-{   Parameters *a = NULL;
-
-    if (args)