Remove dead TOKtobool and Bool

dlang · Dec 22, 2013 · d65bd1d · d65bd1d
1 parent ec34f77
commit d65bd1d
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 13 deletions.
diff --git a/src/constfold.c b/src/constfold.c
@@ -116,14 +116,6 @@ Expression *Not(Type *type, Expression *e1)
     return e;
 }
 
-Expression *Bool(Type *type, Expression *e1)
-{   Expression *e;
-    Loc loc = e1->loc;
-
-    e = new IntegerExp(loc, e1->isBool(1), type);
-    return e;
-}
-
 Expression *Add(Type *type, Expression *e1, Expression *e2)
 {   Expression *e;
     Loc loc = e1->loc;

diff --git a/src/expression.h b/src/expression.h
@@ -1885,7 +1885,6 @@ Expression *expType(Type *type, Expression *e);
 Expression *Neg(Type *type, Expression *e1);
 Expression *Com(Type *type, Expression *e1);
 Expression *Not(Type *type, Expression *e1);
-Expression *Bool(Type *type, Expression *e1);
 Expression *Cast(Type *type, Type *to, Expression *e1);
 Expression *ArrayLength(Type *type, Expression *e1);
 Expression *Ptr(Type *type, Expression *e1);

diff --git a/src/interpret.c b/src/interpret.c
@@ -3009,7 +3009,9 @@ Expression *UnaExp::interpret(InterState *istate,  CtfeGoal goal)
     case TOKneg:    e = Neg(type, e1); break;
     case TOKtilde:  e = Com(type, e1); break;
     case TOKnot:    e = Not(type, e1); break;
+#if DMDV1
     case TOKtobool: e = Bool(type, e1); break;
+#endif
     case TOKvector: e = this; break; // do nothing
     default: assert(0);
     }

diff --git a/src/lexer.c b/src/lexer.c
@@ -2830,7 +2830,6 @@ void Lexer::initKeywords()
     Token::tochars[TOKequal]            = "==";
     Token::tochars[TOKnotequal]         = "!=";
     Token::tochars[TOKnotidentity]      = "!is";
-    Token::tochars[TOKtobool]           = "!!";
 
     Token::tochars[TOKunord]            = "!<>=";
     Token::tochars[TOKue]               = "!<>";
@@ -2842,7 +2841,6 @@ void Lexer::initKeywords()
     Token::tochars[TOKug]               = "!<=";
 
     Token::tochars[TOKnot]              = "!";
-    Token::tochars[TOKtobool]           = "!!";
     Token::tochars[TOKshl]              = "<<";
     Token::tochars[TOKshr]              = ">>";
     Token::tochars[TOKushr]             = ">>>";

diff --git a/src/lexer.h b/src/lexer.h
@@ -78,7 +78,6 @@ enum TOK
         TOKequal,       TOKnotequal,
         TOKidentity,    TOKnotidentity,
         TOKindex,       TOKis,
-        TOKtobool,
 
 // 60
         // NCEG floating point compares

diff --git a/src/parse.c b/src/parse.c
@@ -7222,7 +7222,6 @@ void initPrecedence()
     precedence[TOKneg] = PREC_unary;
     precedence[TOKuadd] = PREC_unary;
     precedence[TOKnot] = PREC_unary;
-    precedence[TOKtobool] = PREC_add;
     precedence[TOKtilde] = PREC_unary;
     precedence[TOKdelete] = PREC_unary;
     precedence[TOKnew] = PREC_unary;