mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove redundant AstExpression::eval_internal

Browse Source 
Change-Id: I27c067adb2b09ad65a8449f2d88a9cdde149d4be
This commit is contained in:
Stephan Bergmann
2015-09-26 22:30:59 +02:00
parent cb31ea6981
commit b085d55e55
2 changed files with 8 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
idlc/inc/idlc/astexpression.hxx
View File

@@ -121,8 +121,6 @@ public:
private: private:
// Fill out the lineno, filename and definition scope details // Fill out the lineno, filename and definition scope details
void fillDefinitionDetails(); void fillDefinitionDetails();
// Internal evaluation
void eval_internal();
// Evaluate different sets of operators // Evaluate different sets of operators
AstExprValue* eval_bin_op(); AstExprValue* eval_bin_op();
AstExprValue* eval_bit_op(); AstExprValue* eval_bit_op();

21
idlc/source/astexpression.cxx
View File

@@ -700,7 +700,7 @@ AstExprValue* AstExpression::coerce(ExprType t)
* First, evaluate it, then try to coerce result type * First, evaluate it, then try to coerce result type
* If already evaluated, return the result * If already evaluated, return the result
*/ */
eval_internal(); evaluate();
if (m_exprValue == NULL) if (m_exprValue == NULL)
return NULL; return NULL;
@@ -758,11 +758,6 @@ AstExprValue* AstExpression::coerce(ExprType t)
return copy; return copy;
} }
void AstExpression::evaluate()
{
eval_internal();
}
bool AstExpression::operator==(AstExpression *pExpr) bool AstExpression::operator==(AstExpression *pExpr)
{ {
bool bRet = false; bool bRet = false;
@@ -873,7 +868,7 @@ void AstExpression::fillDefinitionDetails()
m_fileName = idlc()->getFileName(); m_fileName = idlc()->getFileName();
} }
void AstExpression::eval_internal() void AstExpression::evaluate()
{ {
/* /*
* Already evaluated? * Already evaluated?
@@ -921,13 +916,13 @@ AstExprValue* AstExpression::eval_bin_op()
if (m_subExpr1 == NULL || m_subExpr2 == NULL) if (m_subExpr1 == NULL || m_subExpr2 == NULL)
return NULL; return NULL;
m_subExpr1->eval_internal(); m_subExpr1->evaluate();
if (m_subExpr1->getExprValue() == NULL) if (m_subExpr1->getExprValue() == NULL)
return NULL; return NULL;
m_subExpr1->setExprValue(m_subExpr1->coerce(eType)); m_subExpr1->setExprValue(m_subExpr1->coerce(eType));
if (m_subExpr1->getExprValue() == NULL) if (m_subExpr1->getExprValue() == NULL)
return NULL; return NULL;
m_subExpr2->eval_internal(); m_subExpr2->evaluate();
if (m_subExpr2->getExprValue() == NULL) if (m_subExpr2->getExprValue() == NULL)
return NULL; return NULL;
m_subExpr2->setExprValue(m_subExpr2->coerce(eType)); m_subExpr2->setExprValue(m_subExpr2->coerce(eType));
@@ -969,13 +964,13 @@ AstExprValue* AstExpression::eval_bit_op()
{ {
if (m_subExpr1 == NULL || m_subExpr2 == NULL) if (m_subExpr1 == NULL || m_subExpr2 == NULL)
return NULL; return NULL;
m_subExpr1->eval_internal(); m_subExpr1->evaluate();
if (m_subExpr1->getExprValue() == NULL) if (m_subExpr1->getExprValue() == NULL)
return NULL; return NULL;
m_subExpr1->setExprValue(m_subExpr1->coerce(ET_long)); m_subExpr1->setExprValue(m_subExpr1->coerce(ET_long));
if (m_subExpr1->getExprValue() == NULL) if (m_subExpr1->getExprValue() == NULL)
return NULL; return NULL;
m_subExpr2->eval_internal(); m_subExpr2->evaluate();
if (m_subExpr2->getExprValue() == NULL) if (m_subExpr2->getExprValue() == NULL)
return NULL; return NULL;
m_subExpr2->setExprValue(m_subExpr2->coerce(ET_long)); m_subExpr2->setExprValue(m_subExpr2->coerce(ET_long));
@@ -1016,7 +1011,7 @@ AstExprValue* AstExpression::eval_un_op()
if (m_subExpr1 == NULL) if (m_subExpr1 == NULL)
return NULL; return NULL;
m_subExpr1->eval_internal(); m_subExpr1->evaluate();
if (m_subExpr1->getExprValue() == NULL) if (m_subExpr1->getExprValue() == NULL)
return NULL; return NULL;
m_subExpr1->setExprValue(m_subExpr1->coerce(ET_double)); m_subExpr1->setExprValue(m_subExpr1->coerce(ET_double));
@@ -1097,7 +1092,7 @@ AstExprValue* AstExpression::eval_symbol()
* OK, now evaluate the constant we just got, to produce its value * OK, now evaluate the constant we just got, to produce its value
*/ */
pConst = static_cast< AstConstant* >(pDecl); pConst = static_cast< AstConstant* >(pDecl);
pConst->getConstValue()->eval_internal(); pConst->getConstValue()->evaluate();
return pConst->getConstValue()->getExprValue(); return pConst->getConstValue()->getExprValue();
} }