Revert "fix [a;b],[a,b] for the boolean" 57/14957/1
C├ędric DELAMARRE [Mon, 28 Jul 2014 08:25:35 +0000 (10:25 +0200)]
This reverts commit a576af8e035f578b141d7601b6e1175073dfa7ce.

Change-Id: Ia640fccaa7ceae38e4838cf69493cc8cfa0c50ea

scilab/modules/ast/src/cpp/ast/run_MatrixExp.cpp

index ca5a4f6..0667b84 100644 (file)
@@ -81,7 +81,9 @@ void RunVisitorT<T>::visitprivate(const MatrixExp &e)
 
                 GenericType* pGTResult = poRow->getAs<GenericType>();
 
-                if (pGT->isList() || pGTResult->isList() || (pGTResult->getType() != pGT->getType()))
+                if (pGT->isList() || pGTResult->isList() ||
+                        pGT->isBool() || pGTResult->isBool() ||
+                        pGT->isInt()  || pGTResult->isInt())
                 {
                     poRow = callOverloadMatrixExp(L"c", pGTResult, pGT);
                     continue;
@@ -146,7 +148,9 @@ void RunVisitorT<T>::visitprivate(const MatrixExp &e)
             //check dimension
             GenericType* pGTResult = poResult->getAs<GenericType>();
 
-            if (pGT->isList() || pGTResult->isList() || (pGTResult->getType() != pGT->getType()))
+            if (pGT->isList() || pGTResult->isList() ||
+                    pGT->isBool() || pGTResult->isBool() ||
+                    pGT->isInt()  || pGTResult->isInt())
             {
                 poResult = callOverloadMatrixExp(L"f", pGTResult, pGT);
                 continue;