Merge pull request dlang#255 from 9rnsr/fix6331

[CTFE] Cannot evaluate SliceExp on if condition
michelf · Jul 17, 2011 · ea9ace3 · ea9ace3
2 parents 48f90e0 + d836692
commit ea9ace3
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 0 deletions.
diff --git a/src/expression.c b/src/expression.c
@@ -8626,6 +8626,11 @@ Expression *SliceExp::modifiableLvalue(Scope *sc, Expression *e)
     return this;
 }
 
+int SliceExp::isBool(int result)
+{
+    return e1->isBool(result);
+}
+
 void SliceExp::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
 {
     expToCBuffer(buf, hgs, e1, precedence[op]);

diff --git a/src/expression.h b/src/expression.h
@@ -1101,6 +1101,7 @@ struct SliceExp : UnaExp
     int isLvalue();
     Expression *toLvalue(Scope *sc, Expression *e);
     Expression *modifiableLvalue(Scope *sc, Expression *e);
+    int isBool(int result);
     void toCBuffer(OutBuffer *buf, HdrGenState *hgs);
     Expression *optimize(int result);
     Expression *interpret(InterState *istate, CtfeGoal goal = ctfeNeedRvalue);

diff --git a/test/compilable/interpret3.d b/test/compilable/interpret3.d
@@ -1914,3 +1914,15 @@ int bug4448b()
 }
 
 static assert(bug4448b()==3);
+
+/**************************************************
+    6331 - evaluate SliceExp on if condition
+**************************************************/
+
+bool bug6331(string s)
+{
+    if (s[0..1])
+        return true;
+    return false;
+}
+static assert(bug6331("str"));