use shortcut visitor in whileexp condition evaluation

Change-Id: I384038dcc77ff55307199740ce6bf15af9fd6c2b

diff --git a/scilab/modules/ast/src/cpp/ast/runvisitor.cpp b/scilab/modules/ast/src/cpp/ast/runvisitor.cpp
index 13242f6..55b42ed 100644 (file)
--- a/scilab/modules/ast/src/cpp/ast/runvisitor.cpp
+++ b/scilab/modules/ast/src/cpp/ast/runvisitor.cpp
@@ -315,9 +315,17 @@ void RunVisitorT<T>::visitprivate(const IfExp  &e)
 template <class T>
 void RunVisitorT<T>::visitprivate(const WhileExp  &e)
 {
+
+    //Create local exec visitor
+    ShortCutVisitor SCTest;
+
+    //manage & and | like && and ||
+    e.getTest().accept(SCTest);
     //condition
     e.getTest().accept(*this);
+
     InternalType* pIT = getResult();
+
     while (pIT->isTrue())
     {
         pIT->killMe();