[ast] improved polynomial display with unicode superscripts

[scilab.git] / scilab / modules / ast / includes / types / polynom.hxx

diff --git a/scilab/modules/ast/includes/types/polynom.hxx b/scilab/modules/ast/includes/types/polynom.hxx
index 99f7454..b548b17 100644 (file)
--- a/scilab/modules/ast/includes/types/polynom.hxx
+++ b/scilab/modules/ast/includes/types/polynom.hxx
@@ -2,11 +2,14 @@
 *  Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
 *  Copyright (C) 2008-2008 - DIGITEO - Antoine ELIAS
 *
-*  This file must be used under the terms of the CeCILL.
-*  This source file is licensed as described in the file COPYING, which
-*  you should have received as part of this distribution.  The terms
-*  are also available at
-*  http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+ * Copyright (C) 2012 - 2016 - Scilab Enterprises
+ *
+ * This file is hereby licensed under the terms of the GNU GPL v2.0,
+ * pursuant to article 5.3.4 of the CeCILL v.2.1.
+ * This file was originally licensed under the terms of the CeCILL v2.1,
+ * and continues to be available under such terms.
+ * For more information, see the COPYING file which you should have received
+ * along with this program.
 *
 */
 
@@ -45,35 +48,35 @@ public :
     virtual                 ~Polynom();
 
     // FIXME : Should not return NULL
-    Polynom*                clone();
+    Polynom*                clone() override;
 
     Polynom*                setCoef(int _iRows, int _iCols, Double *_pdblCoef);
     Polynom*                setCoef(int _iIdx, Double *_pdblCoef);
 
-    virtual Polynom*        setComplex(bool _bComplex);
+    virtual Polynom*        setComplex(bool _bComplex) override;
 
-    inline ScilabType       getType(void)
+    inline ScilabType       getType(void) override
     {
         return ScilabPolynom;
     }
 
-    inline ScilabId         getId(void)
+    inline ScilabId         getId(void) override
     {
         return isScalar() ? isComplex() ? IdScalarPolynomComplex
                : IdScalarPolynom
-       : isComplex() ? IdPolynomComplex
+               : isComplex() ? IdPolynomComplex
                : IdPolynom;
     }
 
-    bool isComplex(void);
+    bool isComplex(void) override;
 
-    bool isDollar();
-    inline bool             isPoly()
+    bool isDollar() override;
+    inline bool             isPoly() override
     {
         return true;
     }
 
-    void                    whoAmI(void);
+    void                    whoAmI(void) override;
     std::wstring&           getVariableName();
     void                    setVariableName(const std::wstring&);
     bool                    getSizes(int *_piSizes);
@@ -86,38 +89,37 @@ public :
     Double*                 extractCoef(int _iRank);
     bool                    insertCoef(int _iRank, Double* _pCoef);
     void                    setZeros();
-    Polynom*                insert(typed_list* _pArgs, InternalType* _pSource);
+    Polynom*                insert(typed_list* _pArgs, InternalType* _pSource) override;
 
-    Polynom*                set(int _iPos, SinglePoly* _pS);
-    Polynom*                set(int _iRows, int _iCols, SinglePoly* _pS);
-    Polynom*                set(SinglePoly** _pS);
+    Polynom*                set(int _iPos, SinglePoly* _pS) override;
+    Polynom*                set(int _iRows, int _iCols, SinglePoly* _pS) override;
+    Polynom*                set(SinglePoly** _pS) override;
 
-    std::wstring            getRowString(int* _piDims, int _iDims, bool _bComplex);
-    std::wstring            getColString(int* _piDims, int _iDims, bool _bComplex);
     std::wstring            getMatrixString(int* _piDims, int _iDims, bool _bComplex);
 
-
-    bool                    operator==(const InternalType& it);
-    bool                    operator!=(const InternalType& it);
+    bool                    operator==(const InternalType& it) override;
+    bool                    operator!=(const InternalType& it) override;
 
     /* return type as string ( double, int, cell, list, ... )*/
-    virtual std::wstring    getTypeStr()
+    virtual std::wstring    getTypeStr() const override
     {
         return L"polynomial";
     }
     /* return type as short string ( s, i, ce, l, ... )*/
-    virtual std::wstring    getShortTypeStr()
+    virtual std::wstring    getShortTypeStr() const override
     {
         return L"p";
     }
 
-    bool isTrue()
+    bool isTrue() override
     {
         return false;
     }
 
-    bool transpose(InternalType *& out);
-    bool adjoint(InternalType *& out);
+    bool getMemory(long long* _piSize, long long* _piSizePlusType) override;
+
+    bool transpose(InternalType *& out) override;
+    bool adjoint(InternalType *& out) override;
 
     static Polynom* Dollar();
 
@@ -128,13 +130,13 @@ protected :
 private :
     virtual bool            subMatrixToString(std::wostringstream& ostr, int* _piDims, int _iDims) override;
 
-    virtual SinglePoly*     getNullValue();
-    virtual Polynom*        createEmpty(int _iDims, int* _piDims, bool _bComplex = false);
-    virtual SinglePoly*     copyValue(SinglePoly* _pData);
-    virtual void            deleteAll();
-    virtual void            deleteImg();
-    virtual SinglePoly**    allocData(int _iSize);
-    virtual void            deleteData(SinglePoly* data);
+    virtual SinglePoly*     getNullValue() override;
+    virtual Polynom*        createEmpty(int _iDims, int* _piDims, bool _bComplex = false) override;
+    virtual SinglePoly*     copyValue(SinglePoly* _pData) override;
+    virtual void            deleteAll() override;
+    virtual void            deleteImg() override;
+    virtual SinglePoly**    allocData(int _iSize) override;
+    virtual void            deleteData(SinglePoly* data) override;
 };
 }