realAscot/kicad-source
1
0
Fork 0
mirror of https://gitlab.com/kicad/code/kicad.git synced 2025-09-14 10:13:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Nullptr safety.

Browse Source
This commit is contained in:
Jeff Young 2025-06-08 11:45:25 +01:00
parent 530b4d683c
commit a85408d8ef
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
common/libeval_compiler/libeval_compiler.cpp
View File

@ -1177,21 +1177,20 @@ void UOP::Exec( CONTEXT* ctx )
// TODO: (and do this independently of unit specifics - e.g. MM + INCH needs to return one of the dimension // TODO: (and do this independently of unit specifics - e.g. MM + INCH needs to return one of the dimension
// TODO: types, but our units framework doesn't currently allow this. Therefore, use some heuristics to // TODO: types, but our units framework doesn't currently allow this. Therefore, use some heuristics to
// TODO: determine the resulting operation unit type for now // TODO: determine the resulting operation unit type for now
auto getOpResultUnits = []( const VALUE* aVal1, const VALUE* aVal2 ) auto getOpResultUnits =
{ []( const VALUE* aVal1, const VALUE* aVal2 )
// This condition can occur in, e.g., a unary negation operation {
if( aVal1->GetUnits() == EDA_UNITS::UNSCALED && aVal2->GetUnits() != EDA_UNITS::UNSCALED ) wxCHECK( aVal1 && aVal2, EDA_UNITS::UNSCALED );
{
return aVal2->GetUnits();
}
if( aVal1->GetUnits() != EDA_UNITS::UNSCALED && aVal2->GetUnits() == EDA_UNITS::UNSCALED ) // This condition can occur in, e.g., a unary negation operation
{ if( aVal1->GetUnits() == EDA_UNITS::UNSCALED && aVal2->GetUnits() != EDA_UNITS::UNSCALED )
return aVal1->GetUnits(); return aVal2->GetUnits();
}
return aVal2->GetUnits(); if( aVal1->GetUnits() != EDA_UNITS::UNSCALED && aVal2->GetUnits() == EDA_UNITS::UNSCALED )
}; return aVal1->GetUnits();
return aVal2->GetUnits();
};
EDA_UNITS resultUnits = EDA_UNITS::UNSCALED; EDA_UNITS resultUnits = EDA_UNITS::UNSCALED;