[Libreoffice-commits] core.git: basic/source
Arnaud Versini
arnaud.versini at gmail.com
Sun Jan 24 09:43:45 PST 2016
basic/source/comp/dim.cxx | 14 ++---
basic/source/comp/exprtree.cxx | 99 +++++++++++++++++------------------------
basic/source/inc/expr.hxx | 21 +-------
basic/source/inc/parser.hxx | 2
4 files changed, 55 insertions(+), 81 deletions(-)
New commits:
commit 7d0e520e22a7b41e5ee7010bb4d1801362e15f67
Author: Arnaud Versini <arnaud.versini at gmail.com>
Date: Sat Jan 23 18:24:55 2016 +0100
BASIC : Remove class SbiDimList and SbiParameters
Change-Id: I039bdc786a65ad534390e7138f584cdb470428af
Reviewed-on: https://gerrit.libreoffice.org/21734
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Arnaud Versini <arnaud.versini at libreoffice.org>
diff --git a/basic/source/comp/dim.cxx b/basic/source/comp/dim.cxx
index 238aa24..2f9fefa 100644
--- a/basic/source/comp/dim.cxx
+++ b/basic/source/comp/dim.cxx
@@ -37,9 +37,9 @@ using namespace ::com::sun::star::uno;
// Declaration of a variable
// If there are errors it will be parsed up to the comma or the newline.
// Return-value: a new instance, which were inserted and then deleted.
-// Array-Index were returned as SbiDimList
+// Array-Index were returned as SbiExprList
-SbiSymDef* SbiParser::VarDecl( SbiDimList** ppDim, bool bStatic, bool bConst )
+SbiSymDef* SbiParser::VarDecl( SbiExprList** ppDim, bool bStatic, bool bConst )
{
bool bWithEvents = false;
if( Peek() == WITHEVENTS )
@@ -50,11 +50,11 @@ SbiSymDef* SbiParser::VarDecl( SbiDimList** ppDim, bool bStatic, bool bConst )
if( !TestSymbol() ) return nullptr;
SbxDataType t = eScanType;
SbiSymDef* pDef = bConst ? new SbiConstDef( aSym ) : new SbiSymDef( aSym );
- SbiDimList* pDim = nullptr;
+ SbiExprList* pDim = nullptr;
// Brackets?
if( Peek() == LPAREN )
{
- pDim = new SbiDimList( this );
+ pDim = SbiExprList::ParseDimList( this );
if( !pDim->GetDims() )
pDef->SetWithBrackets();
}
@@ -294,7 +294,7 @@ void SbiParser::DefVar( SbiOpcode eOp, bool bStatic )
Error( ERRCODE_BASIC_UNEXPECTED, eCurTok );
}
SbiSymDef* pDef;
- SbiDimList* pDim;
+ SbiExprList* pDim;
// #40689, Statics -> Modul-Initialising, skip in Sub
sal_uInt32 nEndOfStaticLbl = 0;
@@ -589,7 +589,7 @@ void SbiParser::DefType( bool bPrivate )
SbxObject *pType = new SbxObject(aSym);
std::unique_ptr<SbiSymDef> pElem;
- SbiDimList* pDim = nullptr;
+ SbiExprList* pDim = nullptr;
bool bDone = false;
while( !bDone && !IsEof() )
@@ -713,7 +713,7 @@ void SbiParser::DefEnum( bool bPrivate )
pEnum->SetFlag( SbxFlagBits::Private );
}
SbiSymDef* pElem;
- SbiDimList* pDim;
+ SbiExprList* pDim;
bool bDone = false;
// Starting with -1 to make first default value 0 after ++
diff --git a/basic/source/comp/exprtree.cxx b/basic/source/comp/exprtree.cxx
index ba99c00..634d5a3 100644
--- a/basic/source/comp/exprtree.cxx
+++ b/basic/source/comp/exprtree.cxx
@@ -121,7 +121,7 @@ static bool DoParametersFollow( SbiParser* p, SbiExprType eCurExpr, SbiToken eTo
// definition of a new symbol
static SbiSymDef* AddSym ( SbiToken eTok, SbiSymPool& rPool, SbiExprType eCurExpr,
- const OUString& rName, SbxDataType eType, SbiParameters* pPar )
+ const OUString& rName, SbxDataType eType, SbiExprList* pPar )
{
SbiSymDef* pDef;
// A= is not a procedure
@@ -202,7 +202,7 @@ SbiExprNode* SbiExpression::Term( const KeywordSymbolInfo* pKeywordSymbolInfo )
pParser->LockColumn();
OUString aSym( (pKeywordSymbolInfo == nullptr) ? pParser->GetSym() : pKeywordSymbolInfo->m_aKeywordSymbol );
SbxDataType eType = (pKeywordSymbolInfo == nullptr) ? pParser->GetType() : pKeywordSymbolInfo->m_eSbxDataType;
- SbiParameters* pPar = nullptr;
+ SbiExprList* pPar = nullptr;
SbiExprListVector* pvMoreParLcl = nullptr;
// are there parameters following?
SbiToken eNextTok = pParser->Peek();
@@ -225,7 +225,7 @@ SbiExprNode* SbiExpression::Term( const KeywordSymbolInfo* pKeywordSymbolInfo )
if( DoParametersFollow( pParser, eCurExpr, eTok = eNextTok ) )
{
bool bStandaloneExpression = (m_eMode == EXPRMODE_STANDALONE);
- pPar = new SbiParameters( pParser, bStandaloneExpression );
+ pPar = SbiExprList::ParseParameters( pParser, bStandaloneExpression );
bError = bError || !pPar->IsValid();
if( !bError )
bBracket = pPar->IsBracket();
@@ -238,7 +238,7 @@ SbiExprNode* SbiExpression::Term( const KeywordSymbolInfo* pKeywordSymbolInfo )
{
pvMoreParLcl = new SbiExprListVector();
}
- SbiParameters* pAddPar = new SbiParameters( pParser );
+ SbiExprList* pAddPar = SbiExprList::ParseParameters( pParser );
pvMoreParLcl->push_back( pAddPar );
bError = bError || !pAddPar->IsValid();
eTok = pParser->Peek();
@@ -363,7 +363,7 @@ SbiExprNode* SbiExpression::Term( const KeywordSymbolInfo* pKeywordSymbolInfo )
SbiExprNode* pNd = new SbiExprNode( *pDef, eType );
if( !pPar )
{
- pPar = new SbiParameters( pParser,false,false );
+ pPar = SbiExprList::ParseParameters( pParser,false,false );
}
pNd->aVar.pPar = pPar;
pNd->aVar.pvMorePar = pvMoreParLcl;
@@ -418,14 +418,14 @@ SbiExprNode* SbiExpression::ObjTerm( SbiSymDef& rObj )
}
OUString aSym( pParser->GetSym() );
SbxDataType eType = pParser->GetType();
- SbiParameters* pPar = nullptr;
+ SbiExprList* pPar = nullptr;
SbiExprListVector* pvMoreParLcl = nullptr;
eTok = pParser->Peek();
if( DoParametersFollow( pParser, eCurExpr, eTok ) )
{
bool bStandaloneExpression = false;
- pPar = new SbiParameters( pParser, bStandaloneExpression );
+ pPar = SbiExprList::ParseParameters( pParser, bStandaloneExpression );
bError = bError || !pPar->IsValid();
eTok = pParser->Peek();
@@ -436,7 +436,7 @@ SbiExprNode* SbiExpression::ObjTerm( SbiSymDef& rObj )
{
pvMoreParLcl = new SbiExprListVector();
}
- SbiParameters* pAddPar = new SbiParameters( pParser );
+ SbiExprList* pAddPar = SbiExprList::ParseParameters( pParser );
pvMoreParLcl->push_back( pAddPar );
bError = bError || !pPar->IsValid();
eTok = pParser->Peek();
@@ -968,13 +968,6 @@ void SbiExprList::addExpression( SbiExpression* pExpr )
}
-/***************************************************************************
-|*
-|* SbiParameters
-|*
-***************************************************************************/
-
-// parsing constructor:
// the parameter list is completely parsed
// "procedurename()" is OK
// it's a function without parameters then
@@ -983,12 +976,14 @@ void SbiExprList::addExpression( SbiExpression* pExpr )
// #i79918/#i80532: bConst has never been set to true
// -> reused as bStandaloneExpression
//SbiParameters::SbiParameters( SbiParser* p, sal_Bool bConst, sal_Bool bPar) :
-SbiParameters::SbiParameters( SbiParser* pParser, bool bStandaloneExpression, bool bPar)
+SbiExprList* SbiExprList::ParseParameters( SbiParser* pParser, bool bStandaloneExpression, bool bPar)
{
+ SbiExprList* pExprList = new SbiExprList;
if( !bPar )
{
- return;
+ return pExprList;
}
+
SbiExpression *pExpr;
SbiToken eTok = pParser->Peek();
@@ -1002,25 +997,25 @@ SbiParameters::SbiParameters( SbiParser* pParser, bool bStandaloneExpression, bo
}
else
{
- bBracket = true;
+ pExprList->bBracket = true;
pParser->Next();
eTok = pParser->Peek();
}
}
- if( ( bBracket && eTok == RPAREN ) || SbiTokenizer::IsEoln( eTok ) )
+ if( ( pExprList->bBracket && eTok == RPAREN ) || SbiTokenizer::IsEoln( eTok ) )
{
if( eTok == RPAREN )
{
pParser->Next();
}
- return;
+ return pExprList;
}
// read in parameter table and lay down in correct order!
SbiExpression* pLast = nullptr;
OUString aName;
- while( !bError )
+ while( !pExprList->bError )
{
aName.clear();
// missing argument
@@ -1047,22 +1042,22 @@ SbiParameters::SbiParameters( SbiParser* pParser, bool bStandaloneExpression, bo
SbiExprMode eModeAfter = pExpr->m_eMode;
if( eModeAfter == EXPRMODE_LPAREN_NOT_NEEDED )
{
- bBracket = true;
+ pExprList->bBracket = true;
}
else if( eModeAfter == EXPRMODE_ARRAY_OR_OBJECT )
{
// Expression "looks" like an array assignment
// a(...)[(...)] = ? or a(...).b(...)
// RPAREN is already parsed
- bBracket = true;
+ pExprList->bBracket = true;
bAssumeArrayMode = true;
eTok = NIL;
}
else if( eModeAfter == EXPRMODE_EMPTY_PAREN )
{
- bBracket = true;
+ pExprList->bBracket = true;
delete pExpr;
- return;
+ return pExprList;
}
}
else
@@ -1090,14 +1085,14 @@ SbiParameters::SbiParameters( SbiParser* pParser, bool bStandaloneExpression, bo
pExpr->pNext = nullptr;
if( !pLast )
{
- pFirst = pLast = pExpr;
+ pExprList->pFirst = pLast = pExpr;
}
else
{
pLast->pNext = pExpr, pLast = pExpr;
}
- nExpr++;
- bError = bError || !pExpr->IsValid();
+ pExprList->nExpr++;
+ pExprList->bError = pExprList->bError || !pExpr->IsValid();
if( bAssumeArrayMode )
{
@@ -1107,18 +1102,18 @@ SbiParameters::SbiParameters( SbiParser* pParser, bool bStandaloneExpression, bo
eTok = pParser->Peek();
if( eTok != COMMA )
{
- if( ( bBracket && eTok == RPAREN ) || SbiTokenizer::IsEoln( eTok ) )
+ if( ( pExprList->bBracket && eTok == RPAREN ) || SbiTokenizer::IsEoln( eTok ) )
{
break;
}
- pParser->Error( bBracket ? ERRCODE_BASIC_BAD_BRACKETS : ERRCODE_BASIC_EXPECTED, COMMA );
- bError = true;
+ pParser->Error( pExprList->bBracket ? ERRCODE_BASIC_BAD_BRACKETS : ERRCODE_BASIC_EXPECTED, COMMA );
+ pExprList->bError = true;
}
else
{
pParser->Next();
eTok = pParser->Peek();
- if( ( bBracket && eTok == RPAREN ) || SbiTokenizer::IsEoln( eTok ) )
+ if( ( pExprList->bBracket && eTok == RPAREN ) || SbiTokenizer::IsEoln( eTok ) )
{
break;
}
@@ -1129,33 +1124,26 @@ SbiParameters::SbiParameters( SbiParser* pParser, bool bStandaloneExpression, bo
{
pParser->Next();
pParser->Peek();
- if( !bBracket )
+ if( !pExprList->bBracket )
{
pParser->Error( ERRCODE_BASIC_BAD_BRACKETS );
- bError = true;
+ pExprList->bError = true;
}
}
- nDim = nExpr;
+ pExprList->nDim = pExprList->nExpr;
+ return pExprList;
}
-/***************************************************************************
-|*
-|* SbiDimList
-|*
-***************************************************************************/
-
-// parsing constructor:
-// A list of array dimensions is parsed. The expressions are tested for being
-// numeric. The bCONST-Bit is reset when all expressions are Integer constants.
+// A list of array dimensions is parsed.
-SbiDimList::SbiDimList( SbiParser* pParser )
+SbiExprList* SbiExprList::ParseDimList( SbiParser* pParser )
{
- bool bConst = true;// true: everything integer constants
+ SbiExprList* pExprList = new SbiExprList;
if( pParser->Next() != LPAREN )
{
pParser->Error( ERRCODE_BASIC_EXPECTED, LPAREN );
- bError = true; return;
+ pExprList->bError = true; return pExprList;
}
if( pParser->Peek() != RPAREN )
@@ -1170,37 +1158,35 @@ SbiDimList::SbiDimList( SbiParser* pParser )
{
pExpr2 = new SbiExpression( pParser );
eTok = pParser->Next();
- bConst = bConst && pExpr1->IsIntConstant() && pExpr2->IsIntConstant();
- bError = bError || !pExpr1->IsValid() || !pExpr2->IsValid();
+ pExprList->bError = pExprList->bError || !pExpr1->IsValid() || !pExpr2->IsValid();
pExpr1->pNext = pExpr2;
if( !pLast )
{
- pFirst = pExpr1;
+ pExprList->pFirst = pExpr1;
}
else
{
pLast->pNext = pExpr1;
}
pLast = pExpr2;
- nExpr += 2;
+ pExprList->nExpr += 2;
}
else
{
pExpr1->SetBased();
pExpr1->pNext = nullptr;
- bConst = bConst && pExpr1->IsIntConstant();
- bError = bError || !pExpr1->IsValid();
+ pExprList->bError = pExprList->bError || !pExpr1->IsValid();
if( !pLast )
{
- pFirst = pLast = pExpr1;
+ pExprList->pFirst = pLast = pExpr1;
}
else
{
pLast->pNext = pExpr1, pLast = pExpr1;
}
- nExpr++;
+ pExprList->nExpr++;
}
- nDim++;
+ pExprList->nDim++;
if( eTok == RPAREN ) break;
if( eTok != COMMA )
{
@@ -1211,6 +1197,7 @@ SbiDimList::SbiDimList( SbiParser* pParser )
}
}
else pParser->Next();
+ return pExprList;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/source/inc/expr.hxx b/basic/source/inc/expr.hxx
index 7bcea84..53a9638 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 e5b4276..e2d5a3b 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
More information about the Libreoffice-commits
mailing list