boolean display fixed

test_run core display

Change-Id: Ife9027011bae4e5f5957a6b6172aaa27cb78a3ab

diff --git a/scilab/modules/ast/src/cpp/ast/run_AssignExp.hpp b/scilab/modules/ast/src/cpp/ast/run_AssignExp.hpp
index 189bb95..e275e8d 100644 (file)
--- a/scilab/modules/ast/src/cpp/ast/run_AssignExp.hpp
+++ b/scilab/modules/ast/src/cpp/ast/run_AssignExp.hpp
@@ -115,7 +115,7 @@ namespace ast {
                 {
                     std::wstring wstrName = pVar->getSymbol().getName();
                     std::wostringstream ostr;
-                    ostr << wstrName << L"  = " << std::endl << std::endl;
+                    ostr << L" " << wstrName << L"  = " << std::endl << std::endl;
                     scilabWriteW(ostr.str().c_str());
                     std::wostringstream ostrName;
                     ostrName << wstrName;
@@ -195,7 +195,7 @@ namespace ast {
                     if (e.isVerbose() && ConfigVariable::isPromptShow())
                     {
                         std::wostringstream ostr;
-                        ostr << *getStructNameFromExp(pCell) << L"  = " << std::endl;
+                        ostr << L" " << *getStructNameFromExp(pCell) << L"  = " << std::endl;
                         ostr << std::endl;
                         scilabWriteW(ostr.str().c_str());
 
@@ -356,7 +356,7 @@ namespace ast {
                 if (e.isVerbose() && ConfigVariable::isPromptShow())
                 {
                     std::wostringstream ostr;
-                    ostr << *getStructNameFromExp(&pCall->getName()) << L"  = " << std::endl;
+                    ostr << L" " << *getStructNameFromExp(&pCall->getName()) << L"  = " << std::endl;
                     ostr << std::endl;
                     scilabWriteW(ostr.str().c_str());
 
@@ -496,7 +496,7 @@ namespace ast {
 
                     types::InternalType* pPrint = ctx->get(symbol::Symbol(*pstName));
                     std::wostringstream ostr;
-                    ostr << *pstName << L"  = " << std::endl << std::endl;
+                    ostr << L" " << *pstName << L"  = " << std::endl << std::endl;
                     scilabWriteW(ostr.str().c_str());
 
                     std::wostringstream ostrName;

diff --git a/scilab/modules/ast/src/cpp/types/bool.cpp b/scilab/modules/ast/src/cpp/types/bool.cpp
index 2bb4e89..5f00321 100644 (file)
--- a/scilab/modules/ast/src/cpp/types/bool.cpp
+++ b/scilab/modules/ast/src/cpp/types/bool.cpp
@@ -136,7 +136,7 @@ bool Bool::subMatrixToString(std::wostringstream& ostr, int* _piDims, int /*_iDi
             _piDims[1] = 0;
             _piDims[0] = i;
             int iPos = getIndex(_piDims);
-            ostr << (get(iPos) ? L" T" : L" F");
+            ostr << (get(iPos) ? L"  T" : L"  F");
             ostr << std::endl;
         }
     }
@@ -266,7 +266,7 @@ bool Bool::subMatrixToString(std::wostringstream& ostr, int* _piDims, int /*_iDi
         {
             ostr << std::endl << L"       column " << iLastCol + 1 << L" to " << getCols() << std::endl << std::endl;
         }
-        ostr << ostemp.str();
+        ostr << L" " << ostemp.str();
     }
 
     return true;

diff --git a/scilab/modules/core/tests/unit_tests/display.dia.ref b/scilab/modules/core/tests/unit_tests/display.dia.ref
index f835317..2e897fd 100644 (file)
--- a/scilab/modules/core/tests/unit_tests/display.dia.ref
+++ b/scilab/modules/core/tests/unit_tests/display.dia.ref
@@ -7,21 +7,21 @@
 format("v",10)
 //display of numbers
 x=2.6533333
-x  = 
+ x  = 
     2.6533333
 x=[2.6533333 -0.0002]
-x  = 
+ x  = 
     2.6533333  - 0.0002
 x'
  ans  =
     2.6533333
   - 0.0002
 x=[]
-x  = 
+ x  = 
     []
 //display of polynomials
 z=poly(0,"z")
-z  = 
+ z  = 
      
     z
 num=[ (((((1)*z-2.6533333)*z+2.6887936)*z-1.2916784)*z+0.2911572)* ...
@@ -30,7 +30,7 @@ z-0.0243497
 z-0.0243497
 (((1)*z )*z )*z+1
 0]
-num  = 
+ num  = 
                                        2             3             4
   - 0.0243497 + 0.2911572z - 1.2916784z  + 2.6887936z  - 2.6533333z 
                5
@@ -47,7 +47,7 @@ den = [ ((((1)*z-1.536926)*z+0.8067352)*z-0.1682810)*z+0.0113508
 ((((1)*z-1.536926)*z+0.8067352)*z-0.1682810)*z+0.0113508
 ((1)*z )*z
 1]
-den  = 
+ den  = 
                                       2            3    4
     0.0113508 - 0.168281z + 0.8067352z  - 1.536926z  + z 
                                       2            3    4
@@ -127,7 +127,7 @@ num',den'
     1                                                    
 //display of polynomials
 z=poly(0,"z")
-z  = 
+ z  = 
      
     z
 n=1+z;d=n*n;n1=[n d];d1=[d d*d];n1=[n1 n1];d1=[d1 d1];
@@ -137,7 +137,7 @@ p1=[p,0.1+2.35*z-5.05*z**3];q1=[q,2.56+0.03*z-10.01*z*z+z**5];
 d3=[1+z**10 z**15];
 //display of rationals
 r=num./den
-r  = 
+ r  = 
            
    1   1   
    --  --  
@@ -321,16 +321,16 @@ column 4
    1 + 4z + 6z + 4z + z   
 //display of strings
 digits="abcdefghijklmnopqrstuvwxyz"
-digits  = 
+ digits  = 
  abcdefghijklmnopqrstuvwxyz
 numbers="1234567890"
-numbers  = 
+ numbers  = 
  1234567890
 majuscules="ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-majuscules  = 
+ majuscules  = 
  ABCDEFGHIJKLMNOPQRSTUVWXYZ
 symbols=",./;''[] \ =-!\$%^&*()_+~:""[]| @"
-symbols  = 
+ symbols  = 
  ,./;'[] \ =-!\$%^&*()_+~:"[]| @
 [numbers;digits]
  ans  =
@@ -643,9 +643,9 @@ list(1,2,3)
 list(list(1,list()),2)
  ans  =
        ans(1)
-        ans(1)(1)
+              ans(1)(1)
     1.
-        ans(1)(2)
+              ans(1)(2)
      ()
        ans(2)
     2.
@@ -674,21 +674,21 @@ list(1,1:$)
 list(list(1:$))
  ans  =
        ans(1)
-        ans(1)(1)
+              ans(1)(1)
  1:1:$
 list(list(1,$),list())
  ans  =
        ans(1)
-        ans(1)(1)
+              ans(1)(1)
     1.
-        ans(1)(2)
+              ans(1)(2)
      
     $
        ans(2)
      ()
 // Tlist overloaded display
 TL=tlist("x",1,2)
-TL  = 
+ TL  = 
        TL(1)
  x
        TL(2)
@@ -710,12 +710,12 @@ list(TL)
 list(list(TL))
  ans  =
        ans(1)
-        ans(1)(1)
+              ans(1)(1)
  Mydisplay
     1.
     2.
 TL=tlist("x",1:$,2)
-TL  = 
+ TL  = 
  Mydisplay
  1:1:$
     2.
@@ -728,14 +728,49 @@ list(TL)
 list(list(TL))
  ans  =
        ans(1)
-        ans(1)(1)
+              ans(1)(1)
  Mydisplay
  1:1:$
     2.
 TL(2)=TL
-TL  = 
+ TL  = 
  Mydisplay
  Mydisplay
  1:1:$
     2.
     2.
+// boolean
+%t
+ ans  =
+  T
+%f
+ ans  =
+  F
+b=[%t %t %t]
+ b  = 
+  T T T
+~b
+ ans  =
+  F F F
+bp=b'
+ bp  = 
+  T
+  T
+  T
+~bp
+ ans  =
+  F
+  F
+  F
+bb=[b; b; b]
+ bb  = 
+  T T T
+  T T T
+  T T T
+ 
+~bb
+ ans  =
+  F F F
+  F F F
+  F F F
+ 

diff --git a/scilab/modules/core/tests/unit_tests/display.tst b/scilab/modules/core/tests/unit_tests/display.tst
index ccef39c..446f5a2 100644 (file)
--- a/scilab/modules/core/tests/unit_tests/display.tst
+++ b/scilab/modules/core/tests/unit_tests/display.tst
@@ -133,3 +133,13 @@ TL=tlist("x",1:$,2)
 list(TL)
 list(list(TL))
 TL(2)=TL
+
+// boolean
+%t
+%f
+b=[%t %t %t]
+~b
+bp=b'
+~bp
+bb=[b; b; b]
+~bb