List comparison fixed 56/16856/2
Cedric Delamarre [Fri, 17 Jul 2015 13:31:16 +0000 (15:31 +0200)]
test_run core eq_neq_priority

Change-Id: I3ebaff83167eefa2c4575471b0e53a704f2d04ec

scilab/modules/ast/src/cpp/operations/types_comparison_eq.cpp
scilab/modules/ast/src/cpp/operations/types_comparison_ne.cpp

index d840be7..841ad27 100644 (file)
@@ -3657,7 +3657,7 @@ types::InternalType* compequal_M_M<Struct, Struct, Bool>(types::Struct* _pL, typ
 template<class T, class U, class O>
 InternalType* compequal_LT_LT(T *_pL, U *_pR)
 {
-    if ((_pL->getType() != _pR->getType()) && (_pL->getType() == GenericType::ScilabList || _pR->getType() == GenericType::ScilabList))
+    if (_pL->getType() != GenericType::ScilabList || _pR->getType() != GenericType::ScilabList)
     {
         //try to find overload function, if symbol exist, return NULL to let opexep to call it.
         //otherwise do a "binary" comparison
index 6c24cff..237e9f4 100644 (file)
@@ -3614,7 +3614,7 @@ types::InternalType* compnoequal_M_M<Struct, Struct, Bool>(types::Struct* _pL, t
 template<class T, class U, class O>
 InternalType* compnoequal_LT_LT(T *_pL, U *_pR)
 {
-    if ((_pL->getType() != _pR->getType()) && (_pL->getType() == GenericType::ScilabList || _pR->getType() == GenericType::ScilabList))
+    if (_pL->getType() != GenericType::ScilabList || _pR->getType() != GenericType::ScilabList)
     {
         //try to find overload function, if symbol exist, return NULL to let opexep to call it.
         //otherwise do a "binary" comparison