fix serious bug

Author: al-pacino

include/FunctionCompiler.h

@@ -103,12 +103,11 @@ class CLeftPartCompiler : public CFunctionCompilerBase {
 	void matchRightDuplicateVE();
 
 	TTableIndex top;
-	TTableIndex left;
-	TTableIndex right;
 	TTableIndex maxTableSize;
 
 	CHoleList holes;
 	CHoleNode* hole;
+	CHoleNode* lastUsedHole;
 
 #if 0
 	CVariablesMask markedVariables;

include/OperationsBuilder.h

@@ -17,6 +17,7 @@ enum TOperationType {
 	OT_SetLeftBorder, // TTableIndex
 	OT_SetRightBorder, // TTableIndex
 	OT_DecrementStackDepth, // TStackIndex
+	OT_SaveLeftRight,
 	// matching empty expression
 	OT_MatchEmptyExpression,
 	// matching symbols
@@ -169,6 +170,7 @@ class COperationsBuilder {
 	void AddDecrementStackDepth( TStackIndex size );
 	void AddSetLeftBorder( TTableIndex );
 	void AddSetRightBorder( TTableIndex );
+	void AddSaveLeftRight();
 	// matching empty expression
 	void AddMatchEmptyExpression();
 	// matching symbols

include/OperationsExecuter.h

@@ -362,8 +362,8 @@ inline bool COperationsExecuter::matchRightNumber( const TNumber number )
 inline bool COperationsExecuter::matchLeftParens()
 {
 	if( shiftLeft() && left->IsLeftParen() ) {
+		saveToTable( left->PairedParen(), right );
 		right = left->PairedParen();
-		saveToTable( left, right );
 		return true;
 	} else {
 		return false;
@@ -373,8 +373,8 @@ inline bool COperationsExecuter::matchLeftParens()
 inline bool COperationsExecuter::matchRightParens()
 {
 	if( shiftRight() && right->IsRightParen() ) {
+		saveToTable( left, right->PairedParen() );
 		left = right->PairedParen();
-		saveToTable( left, right );
 		return true;
 	} else {
 		return false;

src/FunctionCompiler.cpp

@@ -37,8 +37,6 @@ CHole& CHole::operator=( const CHole& hole )
 
 CLeftPartCompiler::CLeftPartCompiler() :
 	top( 0 ),
-	left( 0 ),
-	right( 0 ),
 	maxTableSize( 0 ),
 	hole( 0 )
 {
@@ -111,19 +109,17 @@ void CLeftPartCompiler::splitIntoClasses(CHole* const holes)
 void CLeftPartCompiler::CompileLeftPart( CUnitList& leftPart,
 	bool isRightDirection )
 {
-	left = 0;
-	right = 1;
 	top = 2;
-	holes.Append( CHole( leftPart, left, right ) );
+	holes.Append( CHole( leftPart, 0 /* left */, 1 /* right */ ) );
+	lastUsedHole = holes.GetFirst();
 
 	while( true ) {
 		hole = holes.GetFirst();
 
 		while( hole != 0 ) {
-			CUnitNode* left = hole->GetFirst();
-			CUnitNode* right = hole->GetLast();
-
-			if( left != right && isFreeVE( left ) && isFreeVE( right ) ) {
+			if( hole->GetFirst() != hole->GetLast()
+				&& isFreeVE( hole->GetFirst() ) && isFreeVE( hole->GetLast() ) )
+			{
 				hole = hole->Next();
 			} else {
 				matchElement();
@@ -146,6 +142,10 @@ void CLeftPartCompiler::CompileLeftPart( CUnitList& leftPart,
 
 void CLeftPartCompiler::removeHole()
 {
+	if( lastUsedHole == hole ) {
+		lastUsedHole = 0;
+	}
+
 	CHoleNode* nextHole = hole->Next();
 	holes.Remove( hole );
 	hole = nextHole;
@@ -180,14 +180,19 @@ void CLeftPartCompiler::matchDuplicateVariable(
 
 void CLeftPartCompiler::checkBorders()
 {
-	if( left != hole->GetLeft() ) {
-		left = hole->GetLeft();
-		COperationsBuilder::AddSetLeftBorder( left );
-	}
-	if( right != hole->GetRight() ) {
-		right = hole->GetRight();
-		COperationsBuilder::AddSetRightBorder( right );
+	assert( hole != 0 );
+	if( hole != lastUsedHole ) {
+		if( lastUsedHole != 0 ) {
+			COperationsBuilder::AddSaveLeftRight();
+			lastUsedHole->SetLeft( top );
+			top++;
+			lastUsedHole->SetRight( top );
+			top++;
+		}
+		COperationsBuilder::AddSetLeftBorder( hole->GetLeft() );
+		COperationsBuilder::AddSetRightBorder( hole->GetRight() );
 	}
+	lastUsedHole = hole;
 }
 
 void CLeftPartCompiler::matchVE(const bool isRightDirection)
@@ -387,16 +392,9 @@ void CLeftPartCompiler::matchLeftParens()
 
 	hole->RemoveFirst();
 	hole->RemoveLast();
-	
-	TTableIndex oldRight = right;
-	left = top;
-	top++;
-	right = top;
-	top++;
-	hole->SetLeft( left );
-	hole->SetRight( right );
-	
-	holes.InsertAfter( hole, CHole( newHole, right, oldRight ) );
+
+	holes.InsertAfter( hole, CHole( newHole, top, top + 1 ) );
+	top += 2;
 }
 
 void CLeftPartCompiler::matchRightParens()
@@ -417,16 +415,9 @@ void CLeftPartCompiler::matchRightParens()
 
 	hole->RemoveFirst();
 	hole->RemoveLast();
-	
-	TTableIndex oldLeft = left;
-	left = top;
-	top++;
-	right = top;
-	top++;
-	hole->SetLeft( left );
-	hole->SetRight( right );
-	
-	holes.InsertBefore( hole, CHole( newHole, oldLeft, left ) );
+
+	holes.InsertBefore( hole, CHole( newHole, top, top + 1 ) );
+	top += 2;
 }
 
 void CLeftPartCompiler::matchLeftSymbol()

src/OperationsBuilder.cpp

@@ -61,6 +61,12 @@ void COperationsBuilder::AddSetRightBorder( TTableIndex tableIndex )
 	addTableIndexOperation( OT_SetRightBorder, tableIndex );
 }
 
+void COperationsBuilder::AddSaveLeftRight()
+{
+	DEBUG_PRINT( __FUNCTION__ )
+	addNoArgumensOperation( OT_SaveLeftRight );
+}
+
 /* matching operation */
 void COperationsBuilder::AddMatchEmptyExpression()
 {

src/OperationsExecuter.cpp

@@ -262,6 +262,9 @@ void COperationsExecuter::doFunctionBody()
 			case OT_DecrementStackDepth: // TUint32
 				decrementStackDepth( operation->stackDecrement );
 				break;
+			case OT_SaveLeftRight:
+				saveToTable( left, right );
+				break;
 			// matching empty expression
 			case OT_MatchEmptyExpression:
 				success = matchEmptyExpression();