diff options
| author | Arnaud Versini <arnaud.versini@gmail.com> | 2016-01-23 18:24:55 +0100 |
|---|---|---|
| committer | Arnaud Versini <arnaud.versini@libreoffice.org> | 2016-01-24 17:43:15 +0000 |
| commit | 7d0e520e22a7b41e5ee7010bb4d1801362e15f67 (patch) | |
| tree | 867a31a148f5e989325d828179850bdc894f4e38 /basic/source/inc | |
| parent | fdcc9e0b8f083d9964d195ebcddcdeedd40b871d (diff) | |
BASIC : Remove class SbiDimList and SbiParameters
Change-Id: I039bdc786a65ad534390e7138f584cdb470428af
Reviewed-on: https://gerrit.libreoffice.org/21734
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Arnaud Versini <arnaud.versini@libreoffice.org>
Diffstat (limited to 'basic/source/inc')
| -rw-r--r-- | basic/source/inc/expr.hxx | 21 | ||||
| -rw-r--r-- | basic/source/inc/parser.hxx | 2 |
2 files changed, 5 insertions, 18 deletions
diff --git a/basic/source/inc/expr.hxx b/basic/source/inc/expr.hxx index 7bcea848589b..53a96387fb53 100644 --- a/basic/source/inc/expr.hxx +++ b/basic/source/inc/expr.hxx @@ -28,8 +28,6 @@ class SbiExprNode; class SbiExpression; class SbiExprList; -class SbiDimList; -class SbiParameters; class SbiParser; class SbiCodeGen; class SbiSymDef; @@ -159,8 +157,6 @@ public: class SbiExpression { friend class SbiExprList; - friend class SbiParameters; - friend class SbiDimList; protected: OUString aArgName; SbiParser* pParser; @@ -221,8 +217,7 @@ public: // numeric constant short GetShortValue(); }; -class SbiExprList { // base class for parameters and dims -protected: +class SbiExprList final { // class for parameters and dims SbiExpression* pFirst; short nExpr; short nDim; @@ -230,7 +225,9 @@ protected: bool bBracket; public: SbiExprList(); - virtual ~SbiExprList(); + ~SbiExprList(); + static SbiExprList* ParseParameters(SbiParser*, bool bStandaloneExpression = false, bool bPar = true); + static SbiExprList* ParseDimList( SbiParser* ); bool IsBracket() { return bBracket; } bool IsValid() { return !bError; } short GetSize() { return nExpr; } @@ -240,16 +237,6 @@ public: void addExpression( SbiExpression* pExpr ); }; -class SbiParameters : public SbiExprList { -public: - SbiParameters( SbiParser*, bool bStandaloneExpression = false, bool bPar = true);// parsing Ctor -}; - -class SbiDimList : public SbiExprList { -public: - SbiDimList( SbiParser* ); // parsing Ctor -}; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basic/source/inc/parser.hxx b/basic/source/inc/parser.hxx index e5b42762e76b..e2d5a3bf3637 100644 --- a/basic/source/inc/parser.hxx +++ b/basic/source/inc/parser.hxx @@ -44,7 +44,7 @@ class SbiParser : public SbiTokenizer bool bSingleLineIf; bool bCodeCompleting; - SbiSymDef* VarDecl( SbiDimList**, bool, bool ); + SbiSymDef* VarDecl( SbiExprList**, bool, bool ); SbiProcDef* ProcDecl(bool bDecl); void DefStatic( bool bPrivate ); void DefProc( bool bStatic, bool bPrivate ); // read in procedure |