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

no copy needed

Browse Source 
coerce_value(..) is a local static function without side effects

Change-Id: Id153ad26973b5724b33f144ae9eba49562b15067
Reviewed-on: https://gerrit.libreoffice.org/40040
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Jochen Nitschke <j.nitschke+logerrit@ok.de>
This commit is contained in:
Jochen Nitschke
2017-07-16 22:45:01 +02:00
parent 038063a352
commit c49ed68c7e
1 changed files with 2 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
idlc/source/astexpression.cxx
View File

@@ -686,8 +686,6 @@ coerce_value(AstExprValue *ev, ExprType t)
bool AstExpression::coerce(ExprType t) bool AstExpression::coerce(ExprType t)
{ {
AstExprValue *copy;
/* /*
* Is it already of the right type? * Is it already of the right type?
*/ */
@@ -703,56 +701,8 @@ bool AstExpression::coerce(ExprType t)
if (m_exprValue == nullptr) if (m_exprValue == nullptr)
return false; return false;
/* if (!coerce_value(m_exprValue.get(), t))
* Create a copy to contain coercion result m_exprValue.reset();
*/
copy = new AstExprValue;
copy->et = m_exprValue->et;
switch (m_exprValue->et)
{
case ET_short:
copy->u.sval = m_exprValue->u.sval;
break;
case ET_ushort:
copy->u.usval = m_exprValue->u.usval;
break;
case ET_long:
copy->u.lval = m_exprValue->u.lval;
break;
case ET_ulong:
copy->u.ulval = m_exprValue->u.ulval;
break;
case ET_hyper:
copy->u.hval = m_exprValue->u.hval;
break;
case ET_uhyper:
copy->u.uhval = m_exprValue->u.uhval;
break;
case ET_boolean:
copy->u.bval = m_exprValue->u.bval;
break;
case ET_float:
copy->u.fval = m_exprValue->u.fval;
break;
case ET_double:
copy->u.dval = m_exprValue->u.dval;
break;
case ET_byte:
copy->u.byval = m_exprValue->u.byval;
break;
default:
OSL_ASSERT(false);
break;
}
if (!coerce_value(copy, t))
{
delete copy;
copy = nullptr;
}
m_exprValue.reset( copy );
return m_exprValue != nullptr; return m_exprValue != nullptr;
} }