Skip to content

C
core
Kaydet (Commit) 0cd0206f authored tarafından Takeshi Abe's avatar Takeshi Abe Kaydeden (comit) David Tardon
Dosyalara gözat
Seçenekler

use std::unique_ptr<> to clarify ownership 

This also prepends the m prefix to member variables.

Change-Id: I465173a6b11717c42800a89fd481b3d310a9df24
Reviewed-on: https://gerrit.libreoffice.org/15476Tested-by: 's avatarDavid Tardon <dtardon@redhat.com>
Reviewed-by: 's avatarDavid Tardon <dtardon@redhat.com>
üst a1a25f4c
Show whitespace changes
Inline Side-by-side
Showing with 165 additions and 166 deletions
starmath/inc/visitors.hxx
Dosyayı görüntüle @ 0cd0206f
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
#include "node.hxx" #include "node.hxx"
#include "caret.hxx" #include "caret.hxx"
#include <memory>
/** Base class for visitors that visits a tree of SmNodes /** Base class for visitors that visits a tree of SmNodes
* @remarks all methods have been left abstract to ensure that implementers * @remarks all methods have been left abstract to ensure that implementers
...@@ -319,13 +320,11 @@ public: ...@@ -319,13 +320,11 @@ public:
void Visit( SmVerticalBraceNode* pNode ) SAL_OVERRIDE; void Visit( SmVerticalBraceNode* pNode ) SAL_OVERRIDE;
SmCaretPosGraph* takeGraph() SmCaretPosGraph* takeGraph()
{ {
SmCaretPosGraph *pRet = pGraph; return mpGraph.release();
pGraph = 0;
return pRet;
} }
private: private:
SmCaretPosGraphEntry* pRightMost; SmCaretPosGraphEntry* mpRightMost;
SmCaretPosGraph* pGraph; std::unique_ptr<SmCaretPosGraph> mpGraph;
}; };
// SmCloningVisitor // SmCloningVisitor
......
starmath/source/visitors.cxx
Dosyayı görüntüle @ 0cd0206f
...@@ -748,9 +748,10 @@ void SmSetSelectionVisitor::Visit( SmFontNode* pNode ) { ...@@ -748,9 +748,10 @@ void SmSetSelectionVisitor::Visit( SmFontNode* pNode ) {
// SmCaretPosGraphBuildingVisitor // SmCaretPosGraphBuildingVisitor
SmCaretPosGraphBuildingVisitor::SmCaretPosGraphBuildingVisitor( SmNode* pRootNode ) { SmCaretPosGraphBuildingVisitor::SmCaretPosGraphBuildingVisitor( SmNode* pRootNode )
pRightMost = NULL; : mpRightMost(nullptr)
pGraph = new SmCaretPosGraph( ); , mpGraph(new SmCaretPosGraph)
{
//pRootNode should always be a table //pRootNode should always be a table
SAL_WARN_IF( pRootNode->GetType( ) != NTABLE, "starmath", "pRootNode must be a table node"); SAL_WARN_IF( pRootNode->GetType( ) != NTABLE, "starmath", "pRootNode must be a table node");
//Handle the special case where NTABLE is used a rootnode //Handle the special case where NTABLE is used a rootnode
...@@ -761,7 +762,7 @@ SmCaretPosGraphBuildingVisitor::SmCaretPosGraphBuildingVisitor( SmNode* pRootNod ...@@ -761,7 +762,7 @@ SmCaretPosGraphBuildingVisitor::SmCaretPosGraphBuildingVisitor( SmNode* pRootNod
SmNodeIterator it( pRootNode ); SmNodeIterator it( pRootNode );
while( it.Next( ) ){ while( it.Next( ) ){
//There's a special invariant between this method and the Visit( SmLineNode* ) //There's a special invariant between this method and the Visit( SmLineNode* )
//Usually pRightMost may not be NULL, to avoid this pRightMost should here be //Usually mpRightMost may not be NULL, to avoid this mpRightMost should here be
//set to a new SmCaretPos in front of it.Current( ), however, if it.Current( ) is //set to a new SmCaretPos in front of it.Current( ), however, if it.Current( ) is
//an instance of SmLineNode we let SmLineNode create this position in front of //an instance of SmLineNode we let SmLineNode create this position in front of
//the visual line. //the visual line.
...@@ -769,7 +770,7 @@ SmCaretPosGraphBuildingVisitor::SmCaretPosGraphBuildingVisitor( SmNode* pRootNod ...@@ -769,7 +770,7 @@ SmCaretPosGraphBuildingVisitor::SmCaretPosGraphBuildingVisitor( SmNode* pRootNod
//being a visual line composition node. Thus, no need for yet another special case //being a visual line composition node. Thus, no need for yet another special case
//in SmCursor::IsLineCompositionNode and everywhere this method is used. //in SmCursor::IsLineCompositionNode and everywhere this method is used.
//if( it->GetType( ) != NLINE ) //if( it->GetType( ) != NLINE )
pRightMost = pGraph->Add( SmCaretPos( it.Current( ), 0 ) ); mpRightMost = mpGraph->Add( SmCaretPos( it.Current( ), 0 ) );
it->Accept( this ); it->Accept( this );
} }
}else }else
...@@ -778,7 +779,6 @@ SmCaretPosGraphBuildingVisitor::SmCaretPosGraphBuildingVisitor( SmNode* pRootNod ...@@ -778,7 +779,6 @@ SmCaretPosGraphBuildingVisitor::SmCaretPosGraphBuildingVisitor( SmNode* pRootNod
SmCaretPosGraphBuildingVisitor::~SmCaretPosGraphBuildingVisitor() SmCaretPosGraphBuildingVisitor::~SmCaretPosGraphBuildingVisitor()
{ {
delete pGraph;
} }
void SmCaretPosGraphBuildingVisitor::Visit( SmLineNode* pNode ){ void SmCaretPosGraphBuildingVisitor::Visit( SmLineNode* pNode ){
...@@ -794,21 +794,21 @@ void SmCaretPosGraphBuildingVisitor::Visit( SmLineNode* pNode ){ ...@@ -794,21 +794,21 @@ void SmCaretPosGraphBuildingVisitor::Visit( SmLineNode* pNode ){
* handled in the constructor. * handled in the constructor.
*/ */
void SmCaretPosGraphBuildingVisitor::Visit( SmTableNode* pNode ){ void SmCaretPosGraphBuildingVisitor::Visit( SmTableNode* pNode ){
SmCaretPosGraphEntry *left = pRightMost, SmCaretPosGraphEntry *left = mpRightMost,
*right = pGraph->Add( SmCaretPos( pNode, 1) ); *right = mpGraph->Add( SmCaretPos( pNode, 1) );
bool bIsFirst = true; bool bIsFirst = true;
SmNodeIterator it( pNode ); SmNodeIterator it( pNode );
while( it.Next() ){ while( it.Next() ){
pRightMost = pGraph->Add( SmCaretPos( it.Current(), 0 ), left); mpRightMost = mpGraph->Add( SmCaretPos( it.Current(), 0 ), left);
if(bIsFirst) if(bIsFirst)
left->SetRight(pRightMost); left->SetRight(mpRightMost);
it->Accept( this ); it->Accept( this );
pRightMost->SetRight(right); mpRightMost->SetRight(right);
if(bIsFirst) if(bIsFirst)
right->SetLeft(pRightMost); right->SetLeft(mpRightMost);
bIsFirst = false; bIsFirst = false;
} }
pRightMost = right; mpRightMost = right;
} }
/** Build SmCaretPosGraph for SmSubSupNode /** Build SmCaretPosGraph for SmSubSupNode
...@@ -848,21 +848,21 @@ void SmCaretPosGraphBuildingVisitor::Visit( SmSubSupNode* pNode ) ...@@ -848,21 +848,21 @@ void SmCaretPosGraphBuildingVisitor::Visit( SmSubSupNode* pNode )
*bodyLeft, *bodyLeft,
*bodyRight; *bodyRight;
left = pRightMost; left = mpRightMost;
SAL_WARN_IF( !pRightMost, "starmath", "pRightMost shouldn't be NULL here!" ); SAL_WARN_IF( !mpRightMost, "starmath", "mpRightMost shouldn't be NULL here!" );
//Create bodyLeft //Create bodyLeft
SAL_WARN_IF( !pNode->GetBody(), "starmath", "SmSubSupNode Doesn't have a body!" ); SAL_WARN_IF( !pNode->GetBody(), "starmath", "SmSubSupNode Doesn't have a body!" );
bodyLeft = pGraph->Add( SmCaretPos( pNode->GetBody( ), 0 ), left ); bodyLeft = mpGraph->Add( SmCaretPos( pNode->GetBody( ), 0 ), left );
left->SetRight( bodyLeft ); //TODO: Don't make this if LSUP or LSUB are NULL ( not sure??? ) left->SetRight( bodyLeft ); //TODO: Don't make this if LSUP or LSUB are NULL ( not sure??? )
//Create right //Create right
right = pGraph->Add( SmCaretPos( pNode, 1 ) ); right = mpGraph->Add( SmCaretPos( pNode, 1 ) );
//Visit the body, to get bodyRight //Visit the body, to get bodyRight
pRightMost = bodyLeft; mpRightMost = bodyLeft;
pNode->GetBody( )->Accept( this ); pNode->GetBody( )->Accept( this );
bodyRight = pRightMost; bodyRight = mpRightMost;
bodyRight->SetRight( right ); bodyRight->SetRight( right );
right->SetLeft( bodyRight ); right->SetLeft( bodyRight );
...@@ -870,66 +870,66 @@ void SmCaretPosGraphBuildingVisitor::Visit( SmSubSupNode* pNode ) ...@@ -870,66 +870,66 @@ void SmCaretPosGraphBuildingVisitor::Visit( SmSubSupNode* pNode )
//If there's an LSUP //If there's an LSUP
if( ( pChild = pNode->GetSubSup( LSUP ) ) ){ if( ( pChild = pNode->GetSubSup( LSUP ) ) ){
SmCaretPosGraphEntry *cLeft; //Child left SmCaretPosGraphEntry *cLeft; //Child left
cLeft = pGraph->Add( SmCaretPos( pChild, 0 ), left ); cLeft = mpGraph->Add( SmCaretPos( pChild, 0 ), left );
pRightMost = cLeft; mpRightMost = cLeft;
pChild->Accept( this ); pChild->Accept( this );
pRightMost->SetRight( bodyLeft ); mpRightMost->SetRight( bodyLeft );
} }
//If there's an LSUB //If there's an LSUB
if( ( pChild = pNode->GetSubSup( LSUB ) ) ){ if( ( pChild = pNode->GetSubSup( LSUB ) ) ){
SmCaretPosGraphEntry *cLeft; //Child left SmCaretPosGraphEntry *cLeft; //Child left
cLeft = pGraph->Add( SmCaretPos( pChild, 0 ), left ); cLeft = mpGraph->Add( SmCaretPos( pChild, 0 ), left );
pRightMost = cLeft; mpRightMost = cLeft;
pChild->Accept( this ); pChild->Accept( this );
pRightMost->SetRight( bodyLeft ); mpRightMost->SetRight( bodyLeft );
} }
//If there's an CSUP //If there's an CSUP
if( ( pChild = pNode->GetSubSup( CSUP ) ) ){ if( ( pChild = pNode->GetSubSup( CSUP ) ) ){
SmCaretPosGraphEntry *cLeft; //Child left SmCaretPosGraphEntry *cLeft; //Child left
cLeft = pGraph->Add( SmCaretPos( pChild, 0 ), left ); cLeft = mpGraph->Add( SmCaretPos( pChild, 0 ), left );
pRightMost = cLeft; mpRightMost = cLeft;
pChild->Accept( this ); pChild->Accept( this );
pRightMost->SetRight( right ); mpRightMost->SetRight( right );
} }
//If there's an CSUB //If there's an CSUB
if( ( pChild = pNode->GetSubSup( CSUB ) ) ){ if( ( pChild = pNode->GetSubSup( CSUB ) ) ){
SmCaretPosGraphEntry *cLeft; //Child left SmCaretPosGraphEntry *cLeft; //Child left
cLeft = pGraph->Add( SmCaretPos( pChild, 0 ), left ); cLeft = mpGraph->Add( SmCaretPos( pChild, 0 ), left );
pRightMost = cLeft; mpRightMost = cLeft;
pChild->Accept( this ); pChild->Accept( this );
pRightMost->SetRight( right ); mpRightMost->SetRight( right );
} }
//If there's an RSUP //If there's an RSUP
if( ( pChild = pNode->GetSubSup( RSUP ) ) ){ if( ( pChild = pNode->GetSubSup( RSUP ) ) ){
SmCaretPosGraphEntry *cLeft; //Child left SmCaretPosGraphEntry *cLeft; //Child left
cLeft = pGraph->Add( SmCaretPos( pChild, 0 ), bodyRight ); cLeft = mpGraph->Add( SmCaretPos( pChild, 0 ), bodyRight );
pRightMost = cLeft; mpRightMost = cLeft;
pChild->Accept( this ); pChild->Accept( this );
pRightMost->SetRight( right ); mpRightMost->SetRight( right );
} }
//If there's an RSUB //If there's an RSUB
if( ( pChild = pNode->GetSubSup( RSUB ) ) ){ if( ( pChild = pNode->GetSubSup( RSUB ) ) ){
SmCaretPosGraphEntry *cLeft; //Child left SmCaretPosGraphEntry *cLeft; //Child left
cLeft = pGraph->Add( SmCaretPos( pChild, 0 ), bodyRight ); cLeft = mpGraph->Add( SmCaretPos( pChild, 0 ), bodyRight );
pRightMost = cLeft; mpRightMost = cLeft;
pChild->Accept( this ); pChild->Accept( this );
pRightMost->SetRight( right ); mpRightMost->SetRight( right );
} }
//Set return parameters //Set return parameters
pRightMost = right; mpRightMost = right;
} }
/** Build caret position for SmOperNode /** Build caret position for SmOperNode
...@@ -974,21 +974,21 @@ void SmCaretPosGraphBuildingVisitor::Visit( SmOperNode* pNode ) ...@@ -974,21 +974,21 @@ void SmCaretPosGraphBuildingVisitor::Visit( SmOperNode* pNode )
SmNode *pOper = pNode->GetSubNode( 0 ), SmNode *pOper = pNode->GetSubNode( 0 ),
*pBody = pNode->GetSubNode( 1 ); *pBody = pNode->GetSubNode( 1 );
SmCaretPosGraphEntry *left = pRightMost, SmCaretPosGraphEntry *left = mpRightMost,
*bodyLeft, *bodyLeft,
*bodyRight, *bodyRight,
*right; *right;
//Create body left //Create body left
bodyLeft = pGraph->Add( SmCaretPos( pBody, 0 ), left ); bodyLeft = mpGraph->Add( SmCaretPos( pBody, 0 ), left );
left->SetRight( bodyLeft ); left->SetRight( bodyLeft );
//Visit body, get bodyRight //Visit body, get bodyRight
pRightMost = bodyLeft; mpRightMost = bodyLeft;
pBody->Accept( this ); pBody->Accept( this );
bodyRight = pRightMost; bodyRight = mpRightMost;
//Create right //Create right
right = pGraph->Add( SmCaretPos( pNode, 1 ), bodyRight ); right = mpGraph->Add( SmCaretPos( pNode, 1 ), bodyRight );
bodyRight->SetRight( right ); bodyRight->SetRight( right );
//Get subsup pNode if any //Get subsup pNode if any
...@@ -998,87 +998,87 @@ void SmCaretPosGraphBuildingVisitor::Visit( SmOperNode* pNode ) ...@@ -998,87 +998,87 @@ void SmCaretPosGraphBuildingVisitor::Visit( SmOperNode* pNode )
SmCaretPosGraphEntry *childLeft; SmCaretPosGraphEntry *childLeft;
if( pSubSup && ( pChild = pSubSup->GetSubSup( LSUP ) ) ) { if( pSubSup && ( pChild = pSubSup->GetSubSup( LSUP ) ) ) {
//Create position in front of pChild //Create position in front of pChild
childLeft = pGraph->Add( SmCaretPos( pChild, 0 ), left ); childLeft = mpGraph->Add( SmCaretPos( pChild, 0 ), left );
//Visit pChild //Visit pChild
pRightMost = childLeft; mpRightMost = childLeft;
pChild->Accept( this ); pChild->Accept( this );
//Set right on pRightMost from pChild //Set right on mpRightMost from pChild
pRightMost->SetRight( bodyLeft ); mpRightMost->SetRight( bodyLeft );
} }
if( pSubSup && ( pChild = pSubSup->GetSubSup( LSUB ) ) ) { if( pSubSup && ( pChild = pSubSup->GetSubSup( LSUB ) ) ) {
//Create position in front of pChild //Create position in front of pChild
childLeft = pGraph->Add( SmCaretPos( pChild, 0 ), left ); childLeft = mpGraph->Add( SmCaretPos( pChild, 0 ), left );
//Visit pChild //Visit pChild
pRightMost = childLeft; mpRightMost = childLeft;
pChild->Accept( this ); pChild->Accept( this );
//Set right on pRightMost from pChild //Set right on mpRightMost from pChild
pRightMost->SetRight( bodyLeft ); mpRightMost->SetRight( bodyLeft );
} }
if( pSubSup && ( pChild = pSubSup->GetSubSup( CSUP ) ) ) {//TO if( pSubSup && ( pChild = pSubSup->GetSubSup( CSUP ) ) ) {//TO
//Create position in front of pChild //Create position in front of pChild
childLeft = pGraph->Add( SmCaretPos( pChild, 0 ), left ); childLeft = mpGraph->Add( SmCaretPos( pChild, 0 ), left );
//Visit pChild //Visit pChild
pRightMost = childLeft; mpRightMost = childLeft;
pChild->Accept( this ); pChild->Accept( this );
//Set right on pRightMost from pChild //Set right on mpRightMost from pChild
pRightMost->SetRight( bodyLeft ); mpRightMost->SetRight( bodyLeft );
} }
if( pSubSup && ( pChild = pSubSup->GetSubSup( CSUB ) ) ) { //FROM if( pSubSup && ( pChild = pSubSup->GetSubSup( CSUB ) ) ) { //FROM
//Create position in front of pChild //Create position in front of pChild
childLeft = pGraph->Add( SmCaretPos( pChild, 0 ), left ); childLeft = mpGraph->Add( SmCaretPos( pChild, 0 ), left );
//Visit pChild //Visit pChild
pRightMost = childLeft; mpRightMost = childLeft;
pChild->Accept( this ); pChild->Accept( this );
//Set right on pRightMost from pChild //Set right on mpRightMost from pChild
pRightMost->SetRight( bodyLeft ); mpRightMost->SetRight( bodyLeft );
} }
if( pSubSup && ( pChild = pSubSup->GetSubSup( RSUP ) ) ) { if( pSubSup && ( pChild = pSubSup->GetSubSup( RSUP ) ) ) {
//Create position in front of pChild //Create position in front of pChild
childLeft = pGraph->Add( SmCaretPos( pChild, 0 ), left ); childLeft = mpGraph->Add( SmCaretPos( pChild, 0 ), left );
//Visit pChild //Visit pChild
pRightMost = childLeft; mpRightMost = childLeft;
pChild->Accept( this ); pChild->Accept( this );
//Set right on pRightMost from pChild //Set right on mpRightMost from pChild
pRightMost->SetRight( bodyLeft ); mpRightMost->SetRight( bodyLeft );
} }
if( pSubSup && ( pChild = pSubSup->GetSubSup( RSUB ) ) ) { if( pSubSup && ( pChild = pSubSup->GetSubSup( RSUB ) ) ) {
//Create position in front of pChild //Create position in front of pChild
childLeft = pGraph->Add( SmCaretPos( pChild, 0 ), left ); childLeft = mpGraph->Add( SmCaretPos( pChild, 0 ), left );
//Visit pChild //Visit pChild
pRightMost = childLeft; mpRightMost = childLeft;
pChild->Accept( this ); pChild->Accept( this );
//Set right on pRightMost from pChild //Set right on mpRightMost from pChild
pRightMost->SetRight( bodyLeft ); mpRightMost->SetRight( bodyLeft );
} }
//Return right //Return right
pRightMost = right; mpRightMost = right;
} }
void SmCaretPosGraphBuildingVisitor::Visit( SmMatrixNode* pNode ) void SmCaretPosGraphBuildingVisitor::Visit( SmMatrixNode* pNode )
{ {
SmCaretPosGraphEntry *left = pRightMost, SmCaretPosGraphEntry *left = mpRightMost,
*right = pGraph->Add( SmCaretPos( pNode, 1 ) ); *right = mpGraph->Add( SmCaretPos( pNode, 1 ) );
for ( sal_uInt16 i = 0; i < pNode->GetNumRows( ); i++ ) { for ( sal_uInt16 i = 0; i < pNode->GetNumRows( ); i++ ) {
SmCaretPosGraphEntry* r = left; SmCaretPosGraphEntry* r = left;
for ( sal_uInt16 j = 0; j < pNode->GetNumCols( ); j++ ){ for ( sal_uInt16 j = 0; j < pNode->GetNumCols( ); j++ ){
SmNode* pSubNode = pNode->GetSubNode( i * pNode->GetNumCols( ) + j ); SmNode* pSubNode = pNode->GetSubNode( i * pNode->GetNumCols( ) + j );
pRightMost = pGraph->Add( SmCaretPos( pSubNode, 0 ), r ); mpRightMost = mpGraph->Add( SmCaretPos( pSubNode, 0 ), r );
if( j != 0 || ( pNode->GetNumRows( ) - 1 ) / 2 == i ) if( j != 0 || ( pNode->GetNumRows( ) - 1 ) / 2 == i )
r->SetRight( pRightMost ); r->SetRight( mpRightMost );
pSubNode->Accept( this ); pSubNode->Accept( this );
r = pRightMost; r = mpRightMost;
} }
pRightMost->SetRight( right ); mpRightMost->SetRight( right );
if( ( pNode->GetNumRows( ) - 1 ) / 2 == i ) if( ( pNode->GetNumRows( ) - 1 ) / 2 == i )
right->SetLeft( pRightMost ); right->SetLeft( mpRightMost );
} }
pRightMost = right; mpRightMost = right;
} }
/** Build SmCaretPosGraph for SmTextNode /** Build SmCaretPosGraph for SmTextNode
...@@ -1105,9 +1105,9 @@ void SmCaretPosGraphBuildingVisitor::Visit( SmTextNode* pNode ) ...@@ -1105,9 +1105,9 @@ void SmCaretPosGraphBuildingVisitor::Visit( SmTextNode* pNode )
int size = pNode->GetText().getLength(); int size = pNode->GetText().getLength();
for( int i = 1; i <= size; i++ ){ for( int i = 1; i <= size; i++ ){
SmCaretPosGraphEntry* pRight = pRightMost; SmCaretPosGraphEntry* pRight = mpRightMost;
pRightMost = pGraph->Add( SmCaretPos( pNode, i ), pRight ); mpRightMost = mpGraph->Add( SmCaretPos( pNode, i ), pRight );
pRight->SetRight( pRightMost ); pRight->SetRight( mpRightMost );
} }
} }
...@@ -1141,32 +1141,32 @@ void SmCaretPosGraphBuildingVisitor::Visit( SmBinVerNode* pNode ) ...@@ -1141,32 +1141,32 @@ void SmCaretPosGraphBuildingVisitor::Visit( SmBinVerNode* pNode )
*denomLeft; *denomLeft;
//Set left //Set left
left = pRightMost; left = mpRightMost;
SAL_WARN_IF( !pRightMost, "starmath", "There must be a position in front of this" ); SAL_WARN_IF( !mpRightMost, "starmath", "There must be a position in front of this" );
//Create right //Create right
right = pGraph->Add( SmCaretPos( pNode, 1 ) ); right = mpGraph->Add( SmCaretPos( pNode, 1 ) );
//Create numLeft //Create numLeft
numLeft = pGraph->Add( SmCaretPos( pNum, 0 ), left ); numLeft = mpGraph->Add( SmCaretPos( pNum, 0 ), left );
left->SetRight( numLeft ); left->SetRight( numLeft );
//Visit pNum //Visit pNum
pRightMost = numLeft; mpRightMost = numLeft;
pNum->Accept( this ); pNum->Accept( this );
pRightMost->SetRight( right ); mpRightMost->SetRight( right );
right->SetLeft( pRightMost ); right->SetLeft( mpRightMost );
//Create denomLeft //Create denomLeft
denomLeft = pGraph->Add( SmCaretPos( pDenom, 0 ), left ); denomLeft = mpGraph->Add( SmCaretPos( pDenom, 0 ), left );
//Visit pDenom //Visit pDenom
pRightMost = denomLeft; mpRightMost = denomLeft;
pDenom->Accept( this ); pDenom->Accept( this );
pRightMost->SetRight( right ); mpRightMost->SetRight( right );
//Set return parameter //Set return parameter
pRightMost = right; mpRightMost = right;
} }
/** Build SmCaretPosGraph for SmVerticalBraceNode /** Build SmCaretPosGraph for SmVerticalBraceNode
...@@ -1191,27 +1191,27 @@ void SmCaretPosGraphBuildingVisitor::Visit( SmVerticalBraceNode* pNode ) ...@@ -1191,27 +1191,27 @@ void SmCaretPosGraphBuildingVisitor::Visit( SmVerticalBraceNode* pNode )
*scriptLeft, *scriptLeft,
*right; *right;
left = pRightMost; left = mpRightMost;
//Create right //Create right
right = pGraph->Add( SmCaretPos( pNode, 1 ) ); right = mpGraph->Add( SmCaretPos( pNode, 1 ) );
//Create bodyLeft //Create bodyLeft
bodyLeft = pGraph->Add( SmCaretPos( pBody, 0 ), left ); bodyLeft = mpGraph->Add( SmCaretPos( pBody, 0 ), left );
left->SetRight( bodyLeft ); left->SetRight( bodyLeft );
pRightMost = bodyLeft; mpRightMost = bodyLeft;
pBody->Accept( this ); pBody->Accept( this );
pRightMost->SetRight( right ); mpRightMost->SetRight( right );
right->SetLeft( pRightMost ); right->SetLeft( mpRightMost );
//Create script //Create script
scriptLeft = pGraph->Add( SmCaretPos( pScript, 0 ), left ); scriptLeft = mpGraph->Add( SmCaretPos( pScript, 0 ), left );
pRightMost = scriptLeft; mpRightMost = scriptLeft;
pScript->Accept( this ); pScript->Accept( this );
pRightMost->SetRight( right ); mpRightMost->SetRight( right );
//Set return value //Set return value
pRightMost = right; mpRightMost = right;
} }
/** Build SmCaretPosGraph for SmBinDiagonalNode /** Build SmCaretPosGraph for SmBinDiagonalNode
...@@ -1236,32 +1236,32 @@ void SmCaretPosGraphBuildingVisitor::Visit( SmBinDiagonalNode* pNode ) ...@@ -1236,32 +1236,32 @@ void SmCaretPosGraphBuildingVisitor::Visit( SmBinDiagonalNode* pNode )
*rightA, *rightA,
*leftB, *leftB,
*right; *right;
left = pRightMost; left = mpRightMost;
//Create right //Create right
right = pGraph->Add( SmCaretPos( pNode, 1 ) ); right = mpGraph->Add( SmCaretPos( pNode, 1 ) );
//Create left A //Create left A
leftA = pGraph->Add( SmCaretPos( A, 0 ), left ); leftA = mpGraph->Add( SmCaretPos( A, 0 ), left );
left->SetRight( leftA ); left->SetRight( leftA );
//Visit A //Visit A
pRightMost = leftA; mpRightMost = leftA;
A->Accept( this ); A->Accept( this );
rightA = pRightMost; rightA = mpRightMost;
//Create left B //Create left B
leftB = pGraph->Add( SmCaretPos( B, 0 ), rightA ); leftB = mpGraph->Add( SmCaretPos( B, 0 ), rightA );
rightA->SetRight( leftB ); rightA->SetRight( leftB );
//Visit B //Visit B
pRightMost = leftB; mpRightMost = leftB;
B->Accept( this ); B->Accept( this );
pRightMost->SetRight( right ); mpRightMost->SetRight( right );
right->SetLeft( pRightMost ); right->SetLeft( mpRightMost );
//Set return value //Set return value
pRightMost = right; mpRightMost = right;
} }
//Straigt forward ( I think ) //Straigt forward ( I think )
...@@ -1339,9 +1339,9 @@ void SmCaretPosGraphBuildingVisitor::Visit( SmBracebodyNode* pNode ) ...@@ -1339,9 +1339,9 @@ void SmCaretPosGraphBuildingVisitor::Visit( SmBracebodyNode* pNode )
{ {
SmNodeIterator it( pNode ); SmNodeIterator it( pNode );
while( it.Next( ) ) { while( it.Next( ) ) {
SmCaretPosGraphEntry* pStart = pGraph->Add( SmCaretPos( it.Current(), 0), pRightMost ); SmCaretPosGraphEntry* pStart = mpGraph->Add( SmCaretPos( it.Current(), 0), mpRightMost );
pRightMost->SetRight( pStart ); mpRightMost->SetRight( pStart );
pRightMost = pStart; mpRightMost = pStart;
it->Accept( this ); it->Accept( this );
} }
} }
...@@ -1389,31 +1389,31 @@ void SmCaretPosGraphBuildingVisitor::Visit( SmRootNode* pNode ) ...@@ -1389,31 +1389,31 @@ void SmCaretPosGraphBuildingVisitor::Visit( SmRootNode* pNode )
*bodyRight; *bodyRight;
//Get left and save it //Get left and save it
SAL_WARN_IF( !pRightMost, "starmath", "There must be a position in front of this" ); SAL_WARN_IF( !mpRightMost, "starmath", "There must be a position in front of this" );
left = pRightMost; left = mpRightMost;
//Create body left //Create body left
bodyLeft = pGraph->Add( SmCaretPos( pBody, 0 ), left ); bodyLeft = mpGraph->Add( SmCaretPos( pBody, 0 ), left );
left->SetRight( bodyLeft ); left->SetRight( bodyLeft );
//Create right //Create right
right = pGraph->Add( SmCaretPos( pNode, 1 ) ); right = mpGraph->Add( SmCaretPos( pNode, 1 ) );
//Visit body //Visit body
pRightMost = bodyLeft; mpRightMost = bodyLeft;
pBody->Accept( this ); pBody->Accept( this );
bodyRight = pRightMost; bodyRight = mpRightMost;
bodyRight->SetRight( right ); bodyRight->SetRight( right );
right->SetLeft( bodyRight ); right->SetLeft( bodyRight );
//Visit pExtra //Visit pExtra
if( pExtra ){ if( pExtra ){
pRightMost = pGraph->Add( SmCaretPos( pExtra, 0 ), left ); mpRightMost = mpGraph->Add( SmCaretPos( pExtra, 0 ), left );
pExtra->Accept( this ); pExtra->Accept( this );
pRightMost->SetRight( bodyLeft ); mpRightMost->SetRight( bodyLeft );
} }
pRightMost = right; mpRightMost = right;
} }
...@@ -1429,24 +1429,24 @@ void SmCaretPosGraphBuildingVisitor::Visit( SmDynIntegralNode* pNode ) ...@@ -1429,24 +1429,24 @@ void SmCaretPosGraphBuildingVisitor::Visit( SmDynIntegralNode* pNode )
*bodyRight; *bodyRight;
//Get left and save it //Get left and save it
SAL_WARN_IF( !pRightMost, "starmath", "There must be a position in front of this" ); SAL_WARN_IF( !mpRightMost, "starmath", "There must be a position in front of this" );
left = pRightMost; left = mpRightMost;
//Create body left //Create body left
bodyLeft = pGraph->Add( SmCaretPos( pBody, 0 ), left ); bodyLeft = mpGraph->Add( SmCaretPos( pBody, 0 ), left );
left->SetRight( bodyLeft ); left->SetRight( bodyLeft );
//Create right //Create right
right = pGraph->Add( SmCaretPos( pNode, 1 ) ); right = mpGraph->Add( SmCaretPos( pNode, 1 ) );
//Visit body //Visit body
pRightMost = bodyLeft; mpRightMost = bodyLeft;
pBody->Accept( this ); pBody->Accept( this );
bodyRight = pRightMost; bodyRight = mpRightMost;
bodyRight->SetRight( right ); bodyRight->SetRight( right );
right->SetLeft( bodyRight ); right->SetLeft( bodyRight );
pRightMost = right; mpRightMost = right;
} }
...@@ -1455,9 +1455,9 @@ void SmCaretPosGraphBuildingVisitor::Visit( SmDynIntegralNode* pNode ) ...@@ -1455,9 +1455,9 @@ void SmCaretPosGraphBuildingVisitor::Visit( SmDynIntegralNode* pNode )
*/ */
void SmCaretPosGraphBuildingVisitor::Visit( SmPlaceNode* pNode ) void SmCaretPosGraphBuildingVisitor::Visit( SmPlaceNode* pNode )
{ {
SmCaretPosGraphEntry* right = pGraph->Add( SmCaretPos( pNode, 1 ), pRightMost ); SmCaretPosGraphEntry* right = mpGraph->Add( SmCaretPos( pNode, 1 ), mpRightMost );
pRightMost->SetRight( right ); mpRightMost->SetRight( right );
pRightMost = right; mpRightMost = right;
} }
/** SmErrorNode is context dependent metadata, it can't be selected /** SmErrorNode is context dependent metadata, it can't be selected
...@@ -1475,9 +1475,9 @@ void SmCaretPosGraphBuildingVisitor::Visit( SmErrorNode* ) ...@@ -1475,9 +1475,9 @@ void SmCaretPosGraphBuildingVisitor::Visit( SmErrorNode* )
*/ */
void SmCaretPosGraphBuildingVisitor::Visit( SmBlankNode* pNode ) void SmCaretPosGraphBuildingVisitor::Visit( SmBlankNode* pNode )
{ {
SmCaretPosGraphEntry* right = pGraph->Add( SmCaretPos( pNode, 1 ), pRightMost ); SmCaretPosGraphEntry* right = mpGraph->Add( SmCaretPos( pNode, 1 ), mpRightMost );
pRightMost->SetRight( right ); mpRightMost->SetRight( right );
pRightMost = right; mpRightMost = right;
} }
/** Build SmCaretPosGraph for SmBraceNode /** Build SmCaretPosGraph for SmBraceNode
...@@ -1502,20 +1502,20 @@ void SmCaretPosGraphBuildingVisitor::Visit( SmBraceNode* pNode ) ...@@ -1502,20 +1502,20 @@ void SmCaretPosGraphBuildingVisitor::Visit( SmBraceNode* pNode )
{ {
SmNode* pBody = pNode->GetSubNode( 1 ); SmNode* pBody = pNode->GetSubNode( 1 );
SmCaretPosGraphEntry *left = pRightMost, SmCaretPosGraphEntry *left = mpRightMost,
*right = pGraph->Add( SmCaretPos( pNode, 1 ) ); *right = mpGraph->Add( SmCaretPos( pNode, 1 ) );
if( pBody->GetType() != NBRACEBODY ) { if( pBody->GetType() != NBRACEBODY ) {
pRightMost = pGraph->Add( SmCaretPos( pBody, 0 ), left ); mpRightMost = mpGraph->Add( SmCaretPos( pBody, 0 ), left );
left->SetRight( pRightMost ); left->SetRight( mpRightMost );
}else }else
pRightMost = left; mpRightMost = left;
pBody->Accept( this ); pBody->Accept( this );
pRightMost->SetRight( right ); mpRightMost->SetRight( right );
right->SetLeft( pRightMost ); right->SetLeft( mpRightMost );
pRightMost = right; mpRightMost = right;
} }
/** Build SmCaretPosGraph for SmAttributNode /** Build SmCaretPosGraph for SmAttributNode
...@@ -1536,56 +1536,56 @@ void SmCaretPosGraphBuildingVisitor::Visit( SmAttributNode* pNode ) ...@@ -1536,56 +1536,56 @@ void SmCaretPosGraphBuildingVisitor::Visit( SmAttributNode* pNode )
*pBody = pNode->GetSubNode( 1 ); *pBody = pNode->GetSubNode( 1 );
//None of the children can be NULL //None of the children can be NULL
SmCaretPosGraphEntry *left = pRightMost, SmCaretPosGraphEntry *left = mpRightMost,
*attrLeft, *attrLeft,
*bodyLeft, *bodyLeft,
*bodyRight, *bodyRight,
*right; *right;
//Creating bodyleft //Creating bodyleft
bodyLeft = pGraph->Add( SmCaretPos( pBody, 0 ), left ); bodyLeft = mpGraph->Add( SmCaretPos( pBody, 0 ), left );
left->SetRight( bodyLeft ); left->SetRight( bodyLeft );
//Creating right //Creating right
right = pGraph->Add( SmCaretPos( pNode, 1 ) ); right = mpGraph->Add( SmCaretPos( pNode, 1 ) );
//Visit the body //Visit the body
pRightMost = bodyLeft; mpRightMost = bodyLeft;
pBody->Accept( this ); pBody->Accept( this );
bodyRight = pRightMost; bodyRight = mpRightMost;
bodyRight->SetRight( right ); bodyRight->SetRight( right );
right->SetLeft( bodyRight ); right->SetLeft( bodyRight );
//Create attrLeft //Create attrLeft
attrLeft = pGraph->Add( SmCaretPos( pAttr, 0 ), left ); attrLeft = mpGraph->Add( SmCaretPos( pAttr, 0 ), left );
//Visit attribute //Visit attribute
pRightMost = attrLeft; mpRightMost = attrLeft;
pAttr->Accept( this ); pAttr->Accept( this );
pRightMost->SetRight( right ); mpRightMost->SetRight( right );
//Set return value //Set return value
pRightMost = right; mpRightMost = right;
} }
//Consider these single symboles //Consider these single symboles
void SmCaretPosGraphBuildingVisitor::Visit( SmSpecialNode* pNode ) void SmCaretPosGraphBuildingVisitor::Visit( SmSpecialNode* pNode )
{ {
SmCaretPosGraphEntry* right = pGraph->Add( SmCaretPos( pNode, 1 ), pRightMost ); SmCaretPosGraphEntry* right = mpGraph->Add( SmCaretPos( pNode, 1 ), mpRightMost );
pRightMost->SetRight( right ); mpRightMost->SetRight( right );
pRightMost = right; mpRightMost = right;
} }
void SmCaretPosGraphBuildingVisitor::Visit( SmGlyphSpecialNode* pNode ) void SmCaretPosGraphBuildingVisitor::Visit( SmGlyphSpecialNode* pNode )
{ {
SmCaretPosGraphEntry* right = pGraph->Add( SmCaretPos( pNode, 1 ), pRightMost ); SmCaretPosGraphEntry* right = mpGraph->Add( SmCaretPos( pNode, 1 ), mpRightMost );
pRightMost->SetRight( right ); mpRightMost->SetRight( right );
pRightMost = right; mpRightMost = right;
} }
void SmCaretPosGraphBuildingVisitor::Visit( SmMathSymbolNode* pNode ) void SmCaretPosGraphBuildingVisitor::Visit( SmMathSymbolNode* pNode )
{ {
SmCaretPosGraphEntry* right = pGraph->Add( SmCaretPos( pNode, 1 ), pRightMost ); SmCaretPosGraphEntry* right = mpGraph->Add( SmCaretPos( pNode, 1 ), mpRightMost );
pRightMost->SetRight( right ); mpRightMost->SetRight( right );
pRightMost = right; mpRightMost = right;
} }
void SmCaretPosGraphBuildingVisitor::Visit( SmRootSymbolNode* ) void SmCaretPosGraphBuildingVisitor::Visit( SmRootSymbolNode* )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment