Remove remnants of bit from the compiler.

michelf · Jun 9, 2011 · 4fb6987 · 4fb6987
1 parent cacbd0a
commit 4fb6987
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 48 deletions.
diff --git a/src/cast.c b/src/cast.c
@@ -203,7 +203,6 @@ MATCH IntegerExp::implicitConvTo(Type *t)
 
     switch (ty)
     {
-        case Tbit:
         case Tbool:
             value &= 1;
             ty = Tint32;
@@ -248,7 +247,6 @@ MATCH IntegerExp::implicitConvTo(Type *t)
     // Only allow conversion if no change in value
     switch (toty)
     {
-        case Tbit:
         case Tbool:
             if ((value & 1) != value)
                 goto Lno;
@@ -1911,7 +1909,6 @@ Expression *Expression::integralPromotions(Scope *sc)
         case Tuns8:
         case Tint16:
         case Tuns16:
-        case Tbit:
         case Tbool:
         case Tchar:
         case Twchar:

diff --git a/src/expression.c b/src/expression.c
@@ -1574,7 +1574,6 @@ dinteger_t IntegerExp::toInteger()
     {
         switch (t->ty)
         {
-            case Tbit:
             case Tbool:         value = (value != 0);           break;
             case Tint8:         value = (d_int8)  value;        break;
             case Tchar:
@@ -1766,7 +1765,6 @@ void IntegerExp::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
                 buf->printf("%juLU", v);
                 break;
 
-            case Tbit:
             case Tbool:
                 buf->writestring((char *)(v ? "true" : "false"));
                 break;
@@ -8191,6 +8189,7 @@ Expression *CastExp::semantic(Scope *sc)
     {   // Disallow unsafe casts
         Type *tob = to->toBasetype();
         Type *t1b = e1->type->toBasetype();
+
         if (!t1b->isMutable() && tob->isMutable())
         {   // Cast not mutable to mutable
           Lunsafe:
@@ -9578,7 +9577,7 @@ Expression *AddAssignExp::semantic(Scope *sc)
         e1->checkNoBool();
         if (tb1->ty == Tpointer && tb2->isintegral())
             e = scaleFactor(sc);
-        else if (tb1->ty == Tbit || tb1->ty == Tbool)
+        else if (tb1->ty == Tbool)
         {
 #if 0
             // Need to rethink this

diff --git a/src/glue.c b/src/glue.c
@@ -1075,7 +1075,6 @@ unsigned Type::totym()
         case Tcomplex32: t = TYcfloat;  break;
         case Tcomplex64: t = TYcdouble; break;
         case Tcomplex80: t = TYcldouble; break;
-        //case Tbit:    t = TYuchar;    break;
         case Tbool:     t = TYbool;     break;
         case Tchar:     t = TYchar;     break;
 #if TARGET_LINUX || TARGET_OSX || TARGET_FREEBSD || TARGET_OPENBSD || TARGET_SOLARIS

diff --git a/src/impcnvgen.c b/src/impcnvgen.c
@@ -23,7 +23,6 @@ int integral_promotion(int t)
     {
         case Tchar:
         case Twchar:
-        //case Tbit:
         case Tbool:
         case Tint8:
         case Tuns8:
@@ -51,29 +50,6 @@ void init()
         impcnvType1[t1][t2] = nt1;      \
         impcnvType2[t1][t2] = nt2;
 
-    /* ======================= */
-
-#if 0
-    X(Tbit,Tbit,    Tint32,Tint32,  Tint32)
-    X(Tbit,Tint8,   Tint32,Tint32,  Tint32)
-    X(Tbit,Tuns8,   Tint32,Tint32,  Tint32)
-    X(Tbit,Tint16,  Tint32,Tint32,  Tint32)
-    X(Tbit,Tuns16,  Tint32,Tint32,  Tint32)
-    X(Tbit,Tint32,  Tint32,Tint32,  Tint32)
-    X(Tbit,Tuns32,  Tuns32,Tuns32,  Tuns32)
-    X(Tbit,Tint64,  Tint64,Tint64,  Tint64)
-    X(Tbit,Tuns64,  Tuns64,Tuns64,  Tuns64)
-
-    X(Tbit,Tfloat32,     Tfloat32,Tfloat32,     Tfloat32)
-    X(Tbit,Tfloat64,     Tfloat64,Tfloat64,     Tfloat64)
-    X(Tbit,Tfloat80,     Tfloat80,Tfloat80,     Tfloat80)
-    X(Tbit,Timaginary32, Tfloat32,Timaginary32, Tfloat32)
-    X(Tbit,Timaginary64, Tfloat64,Timaginary64, Tfloat64)
-    X(Tbit,Timaginary80, Tfloat80,Timaginary80, Tfloat80)
-    X(Tbit,Tcomplex32,   Tfloat32,Tcomplex32,   Tcomplex32)
-    X(Tbit,Tcomplex64,   Tfloat64,Tcomplex64,   Tcomplex64)
-    X(Tbit,Tcomplex80,   Tfloat80,Tcomplex80,   Tcomplex80)
-#endif
 
     /* ======================= */
 
@@ -322,17 +298,6 @@ void init()
 
 #define Y(t1,t2)        impcnvWarn[t1][t2] = 1;
 
-#if 0
-    Y(Tint8, Tbit)
-    Y(Tuns8, Tbit)
-    Y(Tint16, Tbit)
-    Y(Tuns16, Tbit)
-    Y(Tint32, Tbit)
-    Y(Tuns32, Tbit)
-    Y(Tint64, Tbit)
-    Y(Tuns64, Tbit)
-#endif
-
     Y(Tuns8, Tint8)
     Y(Tint16, Tint8)
     Y(Tuns16, Tint8)

diff --git a/src/lexer.h b/src/lexer.h
@@ -206,7 +206,6 @@ enum TOK
         case TOKcomplex32: t = Type::tcomplex32; goto LabelX;   \
         case TOKcomplex64: t = Type::tcomplex64; goto LabelX;   \
         case TOKcomplex80: t = Type::tcomplex80; goto LabelX;   \
-        case TOKbit:     t = Type::tbit;     goto LabelX;       \
         case TOKbool:    t = Type::tbool;    goto LabelX;       \
         case TOKchar:    t = Type::tchar;    goto LabelX;       \
         case TOKwchar:   t = Type::twchar; goto LabelX; \

diff --git a/src/mtype.c b/src/mtype.c
@@ -234,7 +234,6 @@ void Type::init()
     mangleChar[Tdchar] = 'w';
 
     // '@' shouldn't appear anywhere in the deco'd names
-    mangleChar[Tbit] = '@';
     mangleChar[Tinstance] = '@';
     mangleChar[Terror] = '@';
     mangleChar[Ttypeof] = '@';

diff --git a/src/mtype.h b/src/mtype.h
@@ -87,7 +87,6 @@ enum ENUMTY
 
     Tcomplex64,
     Tcomplex80,
-    Tbit,
     Tbool,
     Tchar,
     Twchar,
@@ -164,7 +163,6 @@ struct Type : Object
     #define tcomplex64  basic[Tcomplex64]
     #define tcomplex80  basic[Tcomplex80]
 
-    #define tbit        basic[Tbit]
     #define tbool       basic[Tbool]
     #define tchar       basic[Tchar]
     #define twchar      basic[Twchar]
@@ -380,7 +378,6 @@ struct TypeBasic : Type
     void toCppMangle(OutBuffer *buf, CppMangleState *cms);
 #endif
     int isintegral();
-    int isbit();
     int isfloating();
     int isreal();
     int isimaginary();
@@ -791,7 +788,6 @@ struct TypeTypedef : Type
     void toCBuffer2(OutBuffer *buf, HdrGenState *hgs, int mod);
     Expression *dotExp(Scope *sc, Expression *e, Identifier *ident);
     Expression *getProperty(Loc loc, Identifier *ident);
-    int isbit();
     int isintegral();
     int isfloating();
     int isreal();