Changeset 296

Timestamp:

12/15/09 23:54:38 (15 years ago)

Author:

walter

Message:

bugzilla 3617 CTFE: wrong code for if(x) where x is int or smaller

Files:

• branches/dmd-1.x/src/expression.c (modified) (1 diff)
• trunk/src/expression.c (modified) (1 diff)

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

@@ -1472 +1472 @@
-    toInteger();
-    t = type->toBasetype();
-    if (t->ty == Tuns64)
-    return (real_t)(d_uns64)value;
-    else
-    return (real_t)(d_int64)value;
-}
-
-real_t IntegerExp::toImaginary()
-{
-    return (real_t) 0;
-}
-
-complex_t IntegerExp::toComplex()
-{
-    return toReal();
-}
-
-int IntegerExp::isBool(int result)
-{
-
+
+
-}
-
-Expression *IntegerExp::semantic(Scope *sc)
-{
-    if (!type)
-    {
-    // Determine what the type of this number is
-    dinteger_t number = value;
-
-    if (number & 0x8000000000000000LL)
-        type = Type::tuns64;
-    else if (number & 0xFFFFFFFF80000000LL)
-        type = Type::tint64;
-    else
-        type = Type::tint32;
-    }
-    else
-    {   if (!type->deco)
-        type = type->semantic(loc, sc);
-    }

trunk/src/expression.c

@@ -1556 +1556 @@
-    toInteger();
-    t = type->toBasetype();
-    if (t->ty == Tuns64)
-    return (real_t)(d_uns64)value;
-    else
-    return (real_t)(d_int64)value;
-}
-
-real_t IntegerExp::toImaginary()
-{
-    return (real_t) 0;
-}
-
-complex_t IntegerExp::toComplex()
-{
-    return toReal();
-}
-
-int IntegerExp::isBool(int result)
-{
-
+
+
-}
-
-Expression *IntegerExp::semantic(Scope *sc)
-{
-    if (!type)
-    {
-    // Determine what the type of this number is
-    dinteger_t number = value;
-
-    if (number & 0x8000000000000000LL)
-        type = Type::tuns64;
-    else if (number & 0xFFFFFFFF80000000LL)
-        type = Type::tint64;
-    else
-        type = Type::tint32;
-    }
-    else
-    {   if (!type->deco)
-        type = type->semantic(loc, sc);
-    }