Changeset 222

Timestamp:

10/28/09 18:27:01 (15 years ago)

Author:

walter

Message:

bugzilla 3035

Files:

• trunk/src/attrib.c (modified) (1 diff)
• trunk/src/expression.c (modified) (2 diffs)
• trunk/src/mtype.c (modified) (1 diff)
• trunk/src/statement.c (modified) (1 diff)
• trunk/src/traits.c (modified) (1 diff)

trunk/src/attrib.c

@@ -877 +877 @@
-            sc->module->members->push(pragma);
-        }
-    }
-#endif // TARGET_NET
-}
-
-void PragmaDeclaration::semantic(Scope *sc)
-{   // Should be merged with PragmaStatement
-
-    //printf("\tPragmaDeclaration::semantic '%s'\n",toChars());
-    if (ident == Id::msg)
-    {
-    if (args)
-    {
-        for (size_t i = 0; i < args->dim; i++)
-        {
-        Expression *e = (Expression *)args->data[i];
-
-        e = e->semantic(sc);
-        e = e->optimize(WANTvalue | WANTinterpret);
-
-
-
-
-
-
-
+
-        }
-        fprintf(stdmsg, "\n");
-    }
-    goto Lnodecl;
-    }
-    else if (ident == Id::lib)
-    {
-    if (!args || args->dim != 1)
-        error("string expected for library name");
-    else
-    {
-        Expression *e = (Expression *)args->data[0];
-
-        e = e->semantic(sc);
-        e = e->optimize(WANTvalue | WANTinterpret);
-        args->data[0] = (void *)e;
-        if (e->op != TOKstring)
-        error("string expected for library name, not '%s'", e->toChars());
-        else if (global.params.verbose)
-        {

trunk/src/expression.c

@@ -1195 +1195 @@
-{
-    // Default is 'yes' - do nothing
-
-#ifdef DEBUG
-    if (!type)
-    dump(0);
-#endif
-
-    if (!type->checkBoolean())
-    {
-    error("expression %s of type %s does not have a boolean value", toChars(), type->toChars());
-    }
-    return this;
-}
-
-/****************************
- */
-
-Expression *Expression::checkToPointer()
-{
-    Type *tb;
-
-    //printf("Expression::checkToPointer()\n");
-    Expression *e = this;
-
-#if !SARRAYVALUE
-    // If C static array, convert to pointer
-    Type *tb = type->toBasetype();
-    if (tb->ty == Tsarray)
-    {   TypeSArray *ts = (TypeSArray *)tb;
-    if (ts->size(loc) == 0)
-        e = new NullExp(loc);
-    else
-        e = new AddrExp(loc, this);
-    e->type = ts->next->pointerTo();
-    }
-#endif
-    return e;
-}
-
-/******************************
- * Take address of expression.
@@ -2803 +2801 @@
-        assert(0);
-    }
-    }
-    return len1 - len2;
-}
-
-int StringExp::isBool(int result)
-{
-    return result ? TRUE : FALSE;
-}
-
-#if DMDV2
-int StringExp::isLvalue()
-{
-    return 1;
-}
-#endif
-
-Expression *StringExp::toLvalue(Scope *sc, Expression *e)
-{
+    //printf("StringExp::toLvalue(%s)\n", toChars());
-    return this;
-}
-
-unsigned StringExp::charAt(size_t i)
-{   unsigned value;
-
-    switch (sz)
-    {
-    case 1:
-        value = ((unsigned char *)string)[i];
-        break;
-
-    case 2:
-        value = ((unsigned short *)string)[i];
-        break;
-
-    case 4:
-        value = ((unsigned int *)string)[i];
-        break;
-

trunk/src/mtype.c

@@ -4154 +4154 @@
-    {   Argument *arg = Argument::getNth(tf->parameters, i);
-
-        tf->inuse++;
-        arg->type = arg->type->semantic(loc, argsc);
-        if (tf->inuse == 1) tf->inuse--;
-
-        arg->type = arg->type->addStorageClass(arg->storageClass);
-
-        if (arg->storageClass & (STCauto | STCalias | STCstatic))
-        {
-        if (!arg->type)
-            continue;
-        }
-
-        Type *t = arg->type->toBasetype();
-
-        if (arg->storageClass & (STCout | STCref | STClazy))
-        {
-        //if (t->ty == Tsarray)
-            //error(loc, "cannot have out or ref parameter of type %s", t->toChars());
-
-/invariant
+ & (STCconst | STCimmutable)
+ or immutable
-        }
-        if (!(arg->storageClass & STClazy) && t->ty == Tvoid)
-        error(loc, "cannot have parameter of type %s", arg->type->toChars());
-
-        if (arg->defaultArg)
-        {
-        arg->defaultArg = arg->defaultArg->semantic(argsc);
-        arg->defaultArg = resolveProperties(argsc, arg->defaultArg);
-        arg->defaultArg = arg->defaultArg->implicitCastTo(argsc, arg->type);
-        }
-
-        /* If arg turns out to be a tuple, the number of parameters may
-         * change.
-         */
-        if (t->ty == Ttuple)
-        {   dim = Argument::dim(tf->parameters);
-        i--;
-        }
-    }
-    argsc->pop();

trunk/src/statement.c

@@ -2478 +2478 @@
-    b = body->syntaxCopy();
-    PragmaStatement *s = new PragmaStatement(loc,
-        ident, Expression::arraySyntaxCopy(args), b);
-    return s;
-}
-
-Statement *PragmaStatement::semantic(Scope *sc)
-{   // Should be merged with PragmaDeclaration
-    //printf("PragmaStatement::semantic() %s\n", toChars());
-    //printf("body = %p\n", body);
-    if (ident == Id::msg)
-    {
-        if (args)
-        {
-            for (size_t i = 0; i < args->dim; i++)
-            {
-                Expression *e = (Expression *)args->data[i];
-
-                e = e->semantic(sc);
-        e = e->optimize(WANTvalue | WANTinterpret);
-
-
-
-
-
-
-
+
-            }
-            fprintf(stdmsg, "\n");
-        }
-    }
-    else if (ident == Id::lib)
-    {
-#if 1
-    /* Should this be allowed?
-     */
-    error("pragma(lib) not allowed as statement");
-#else
-    if (!args || args->dim != 1)
-        error("string expected for library name");
-    else
-    {
-        Expression *e = (Expression *)args->data[0];
-
-        e = e->semantic(sc);
-        e = e->optimize(WANTvalue | WANTinterpret);
-        args->data[0] = (void *)e;

trunk/src/traits.c

@@ -323 +323 @@
-
-    for (size_t i = 0; i < dim; i++)
-    {   Object *o = (Object *)args->data[i];
-        Expression *e;
-
-        unsigned errors = global.errors;
-        global.gag++;
-
-        Type *t = isType(o);
-        if (t)
-        {   Dsymbol *s;
-        t->resolve(loc, sc, &e, &t, &s);
-        if (t)
-            t->semantic(loc, sc);
-        else if (e)
-            e->semantic(sc);
-        }
-        else
-        {   e = isExpression(o);
-        if (e)
-
+
+
-        }
-
-        global.gag--;
-        if (errors != global.errors)
-        {   if (global.gag == 0)
-            global.errors = errors;
-        goto Lfalse;
-        }
-    }
-    goto Ltrue;
-    }
-    else if (ident == Id::isSame)
-    {   /* Determine if two symbols are the same
-     */
-    if (dim != 2)
-        goto Ldimerror;
-    TemplateInstance::semanticTiargs(loc, sc, args, 0);
-    Object *o1 = (Object *)args->data[0];
-    Object *o2 = (Object *)args->data[1];
-    Dsymbol *s1 = getDsymbol(o1);
-    Dsymbol *s2 = getDsymbol(o2);
-
+    //printf("isSame: %s, %s\n", o1->toChars(), o2->toChars());
-#if 0
-    printf("o1: %p\n", o1);
-    printf("o2: %p\n", o2);
-    if (!s1)
-    {   Expression *ea = isExpression(o1);
-        if (ea)
-        printf("%s\n", ea->toChars());
-        Type *ta = isType(o1);
-        if (ta)
-        printf("%s\n", ta->toChars());
-        goto Lfalse;
-    }
-    else
-        printf("%s %s\n", s1->kind(), s1->toChars());
-#endif
-    if (!s1 && !s2)
-    {   Expression *ea1 = isExpression(o1);
-        Expression *ea2 = isExpression(o2);
-
-
+
+
+
+
+
-    }
-
-    if (!s1 || !s2)
-        goto Lfalse;
-
-    s1 = s1->toAlias();
-    s2 = s2->toAlias();
-
-    if (s1 == s2)
-        goto Ltrue;
-    else
-        goto Lfalse;
-    }
-    else
-    {   error("unrecognized trait %s", ident->toChars());
-    goto Lfalse;
-    }
-
-    return NULL;
-