OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-04 13:13:25 +03:00
Code Activity

0024742: Remove rarely used collection classes: Stack

Browse Source 
Generic class TCollection_Stack removed (along with TCollection_StackIterator and TCollection_StackNode).

Code using TCollection_Stack changed to equivalent use of TCollection_List (replacing Push -> Prepend, Top -> First, Pop -> RemoveFirst).
This commit is contained in:
dln
2014-04-08 14:22:56 +04:00
committed by abv
parent bd2de3965e
commit 6af4fe1c46
41 changed files with 73 additions and 986 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/ExprIntrp/ExprIntrp.cdl
View File

@@ -43,17 +43,17 @@ is
exception SyntaxError inherits Failure from Standard;
private class StackOfGeneralExpression instantiates
Stack from TCollection (GeneralExpression from Expr);
List from TCollection (GeneralExpression from Expr);
private class StackOfGeneralRelation instantiates
Stack from TCollection (GeneralRelation from Expr);
List from TCollection (GeneralRelation from Expr);
private class StackOfGeneralFunction instantiates
Stack from TCollection (GeneralFunction from Expr);
List from TCollection (GeneralFunction from Expr);
private class StackOfNames instantiates
Stack from TCollection (AsciiString from TCollection);
List from TCollection (AsciiString from TCollection);
Parse(gen : Generator; str : AsciiString from TCollection)
returns Boolean

4
src/ExprIntrp/ExprIntrp_Analysis.cdl
View File

@@ -25,7 +25,7 @@ uses Generator from ExprIntrp,
StackOfGeneralExpression from ExprIntrp,
StackOfGeneralRelation from ExprIntrp,
StackOfGeneralFunction from ExprIntrp,
StackOfInteger from TColStd,
ListOfInteger from TColStd,
SequenceOfGeneralExpression from Expr,
SequenceOfNamedFunction from ExprIntrp,
SequenceOfNamedExpression from ExprIntrp,
@@ -108,7 +108,7 @@ fields
myGRStack : StackOfGeneralRelation;
myGFStack : StackOfGeneralFunction;
myNameStack : StackOfNames;
myValueStack : StackOfInteger;
myValueStack : ListOfInteger;
myFunctions : SequenceOfNamedFunction;
myNamed : SequenceOfNamedExpression;
myMaster : Generator;

30
src/ExprIntrp/ExprIntrp_Analysis.cxx
View File

@@ -24,35 +24,35 @@ ExprIntrp_Analysis::ExprIntrp_Analysis() {}
void ExprIntrp_Analysis::Push(const Handle(Expr_GeneralExpression)& exp)
{
myGEStack.Push(exp);
myGEStack.Prepend(exp);
}
void ExprIntrp_Analysis::PushRelation(const Handle(Expr_GeneralRelation)& rel)
{
myGRStack.Push(rel);
myGRStack.Prepend(rel);
}
void ExprIntrp_Analysis::PushFunction(const Handle(Expr_GeneralFunction)& func)
{
myGFStack.Push(func);
myGFStack.Prepend(func);
}
void ExprIntrp_Analysis::PushName(const TCollection_AsciiString& name)
{
myNameStack.Push(name);
myNameStack.Prepend(name);
}
void ExprIntrp_Analysis::PushValue(const Standard_Integer val)
{
myValueStack.Push(val);
myValueStack.Prepend(val);
}
Handle(Expr_GeneralExpression) ExprIntrp_Analysis::Pop()
{
Handle(Expr_GeneralExpression) res;
if (!myGEStack.IsEmpty()) {
res = myGEStack.Top();
myGEStack.Pop();
res = myGEStack.First();
myGEStack.RemoveFirst();
}
return res;
}
@@ -61,8 +61,8 @@ Handle(Expr_GeneralRelation) ExprIntrp_Analysis::PopRelation()
{
Handle(Expr_GeneralRelation) res;
if (!myGRStack.IsEmpty()) {
res = myGRStack.Top();
myGRStack.Pop();
res = myGRStack.First();
myGRStack.RemoveFirst();
}
return res;
}
@@ -71,8 +71,8 @@ Handle(Expr_GeneralFunction) ExprIntrp_Analysis::PopFunction()
{
Handle(Expr_GeneralFunction) res;
if (!myGFStack.IsEmpty()) {
res = myGFStack.Top();
myGFStack.Pop();
res = myGFStack.First();
myGFStack.RemoveFirst();
}
return res;
}
@@ -81,8 +81,8 @@ TCollection_AsciiString ExprIntrp_Analysis::PopName()
{
TCollection_AsciiString res;
if (!myNameStack.IsEmpty()) {
res = myNameStack.Top();
myNameStack.Pop();
res = myNameStack.First();
myNameStack.RemoveFirst();
}
return res;
}
@@ -91,8 +91,8 @@ Standard_Integer ExprIntrp_Analysis::PopValue()
{
Standard_Integer res =0;
if (!myValueStack.IsEmpty()) {
res = myValueStack.Top();
myValueStack.Pop();
res = myValueStack.First();
myValueStack.RemoveFirst();
}
return res;
}