fix row concatenation with overloaded type 25/17325/2
Antoine ELIAS [Wed, 14 Oct 2015 12:01:19 +0000 (14:01 +0200)]
Change-Id: I2eb6f33e313246c58716ce282a0444dda1270df9

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

index 108bfe2..25ea832 100644 (file)
@@ -144,6 +144,15 @@ void RunVisitorT<T>::visitprivate(const MatrixExp &e)
 
                     if (pGT->isDouble() && pGT->getAs<types::Double>()->isEmpty())
                     {
+                        if (poResult && (poResult->isList() || poResult->isStruct()))
+                        {
+                            //in case of [list(); [], ...]
+
+                            //we don't know what to do with [], keep it as "normal" value and continue process
+                            poRow = pGT;
+                            continue;
+                        }
+
                         pGT->killMe();
                         continue;
                     }