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

0025257: Expr should use names for comparing

Browse Source 
Expression should use string names for comparing, fixed
This commit is contained in:
pdn 2014-09-22 19:47:04 +04:00 committed by bugmaster
parent 0d1b4a2271
commit a2ca2a304f
2 changed files with 42 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/Expr/Expr_NamedExpression.cxx
View File

@ -16,29 +16,57 @@
#include <Expr_NamedExpression.ixx> #include <Expr_NamedExpression.ixx>
//=======================================================================
//function : GetName
//purpose :
//=======================================================================
const TCollection_AsciiString& Expr_NamedExpression::GetName() const const TCollection_AsciiString& Expr_NamedExpression::GetName() const
{ {
return myName; return myName;
} }
//=======================================================================
//function : SetName
//purpose :
//=======================================================================
void Expr_NamedExpression::SetName(const TCollection_AsciiString& name) void Expr_NamedExpression::SetName(const TCollection_AsciiString& name)
{ {
myName = name; myName = name;
} }
//=======================================================================
//function : IsShareable
//purpose :
//=======================================================================
Standard_Boolean Expr_NamedExpression::IsShareable () const Standard_Boolean Expr_NamedExpression::IsShareable () const
{ {
return Standard_True; return Standard_True;
} }
Standard_Boolean Expr_NamedExpression::IsIdentical (const Handle(Expr_GeneralExpression)& Other) const //=======================================================================
//function : IsIdentical
//purpose :
//=======================================================================
Standard_Boolean Expr_NamedExpression::IsIdentical
(const Handle(Expr_GeneralExpression)& theOther) const
{ {
if (!Other->IsKind(STANDARD_TYPE(Expr_NamedExpression))) { Standard_Boolean aResult(Standard_False);
return Standard_False; if (theOther->IsKind(STANDARD_TYPE(Expr_NamedExpression))) {
// Handle(Expr_NamedExpression) me = this;
// Handle(Expr_NamedExpression) NEOther = Handle(Expr_NamedExpression)::DownCast(Other);
// return (me == NEOther);
//AGV 22.03.12: Comparison should be based on names rather than Handles
const Expr_NamedExpression* pOther =
static_cast<const Expr_NamedExpression*>(theOther.operator->());
if (pOther == this || pOther->GetName().IsEqual(myName))
aResult = Standard_True;
} }
Handle(Expr_NamedExpression) me = this; return aResult;
Handle(Expr_NamedExpression) NEOther = Handle(Expr_NamedExpression)::DownCast(Other);
return (me == NEOther);
} }
TCollection_AsciiString Expr_NamedExpression::String() const TCollection_AsciiString Expr_NamedExpression::String() const

8
src/Expr/Expr_NamedUnknown.cxx
View File

@ -92,10 +92,16 @@ Standard_Boolean Expr_NamedUnknown::ContainsUnknowns () const
} }
} }
Standard_Boolean Expr_NamedUnknown::Contains (const Handle(Expr_GeneralExpression)& exp) const Standard_Boolean Expr_NamedUnknown::Contains
(const Handle(Expr_GeneralExpression)& exp) const
{ {
if (!IsAssigned()) { if (!IsAssigned()) {
const Handle(Expr_NamedUnknown) expNamed =
Handle(Expr_NamedUnknown)::DownCast(exp);
if (expNamed.IsNull() || expNamed->IsAssigned())
return Standard_False; return Standard_False;
//AGV 22.03.12: Comparison based on name coincidence
return IsIdentical(expNamed);
} }
if (myExpression == exp) { if (myExpression == exp) {
return Standard_True; return Standard_True;