haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Sim Model Editor: Fix crash on selecting tline models 

Dereferencing std::optional<T> objects was undefined behavior.

Change some forgotten SIM_VALUE_INST<T> usages to their corresponding
typedefs.
This commit is contained in:
Mikolaj Wielgus 2022-09-03 19:39:49 +02:00
parent 977b6cd8f3
commit 70ab5db0e9
3 changed files with 73 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
eeschema/sim/sim_model_tline.cpp
View File

@ -83,6 +83,9 @@ wxString SIM_MODEL_TLINE::GenerateSpiceModelLine( const wxString& aModelName ) c
auto z0 = static_cast<const SIM_VALUE_FLOAT&>( *FindParam( "z0" )->value ); auto z0 = static_cast<const SIM_VALUE_FLOAT&>( *FindParam( "z0" )->value );
auto td = static_cast<const SIM_VALUE_FLOAT&>( *FindParam( "td" )->value ); auto td = static_cast<const SIM_VALUE_FLOAT&>( *FindParam( "td" )->value );
if( !z0.HasValue() || !td.HasValue() )
return wxString::Format( ".model %s ltra()\n", aModelName );
r = SIM_VALUE_FLOAT( 0 ).ToSpiceString(); r = SIM_VALUE_FLOAT( 0 ).ToSpiceString();
l = ( td * z0 ).ToSpiceString(); l = ( td * z0 ).ToSpiceString();
g = SIM_VALUE_FLOAT( 0 ).ToSpiceString(); g = SIM_VALUE_FLOAT( 0 ).ToSpiceString();
@ -104,8 +107,8 @@ wxString SIM_MODEL_TLINE::GenerateSpiceModelLine( const wxString& aModelName ) c
return ""; return "";
} }
return wxString::Format( ".model %s %s( r=%s l=%s g=%s c=%s len=%s )\n", return wxString::Format( ".model %s ltra( r=%s l=%s g=%s c=%s len=%s )\n",
aModelName, "ltra", r, l, g, c, len ); aModelName, r, l, g, c, len );
} }

116
eeschema/sim/sim_value.cpp
View File

@ -26,7 +26,6 @@
#include <wx/translation.h> #include <wx/translation.h>
#include <ki_exception.h> #include <ki_exception.h>
#include <locale_io.h> #include <locale_io.h>
#include <complex>
#include <pegtl/contrib/parse_tree.hpp> #include <pegtl/contrib/parse_tree.hpp>
@ -371,15 +370,15 @@ std::unique_ptr<SIM_VALUE> SIM_VALUE::Create( TYPE aType )
{ {
switch( aType ) switch( aType )
{ {
case TYPE_BOOL: return std::make_unique<SIM_VALUE_INST<bool>>(); case TYPE_BOOL: return std::make_unique<SIM_VALUE_BOOL>();
case TYPE_INT: return std::make_unique<SIM_VALUE_INST<long>>(); case TYPE_INT: return std::make_unique<SIM_VALUE_INT>();
case TYPE_FLOAT: return std::make_unique<SIM_VALUE_INST<double>>(); case TYPE_FLOAT: return std::make_unique<SIM_VALUE_FLOAT>();
case TYPE_COMPLEX: return std::make_unique<SIM_VALUE_INST<std::complex<double>>>(); case TYPE_COMPLEX: return std::make_unique<SIM_VALUE_COMPLEX>();
case TYPE_STRING: return std::make_unique<SIM_VALUE_INST<wxString>>(); case TYPE_STRING: return std::make_unique<SIM_VALUE_STRING>();
case TYPE_BOOL_VECTOR: return std::make_unique<SIM_VALUE_INST<bool>>(); case TYPE_BOOL_VECTOR: return std::make_unique<SIM_VALUE_BOOL>();
case TYPE_INT_VECTOR: return std::make_unique<SIM_VALUE_INST<long>>(); case TYPE_INT_VECTOR: return std::make_unique<SIM_VALUE_INT>();
case TYPE_FLOAT_VECTOR: return std::make_unique<SIM_VALUE_INST<double>>(); case TYPE_FLOAT_VECTOR: return std::make_unique<SIM_VALUE_FLOAT>();
case TYPE_COMPLEX_VECTOR: return std::make_unique<SIM_VALUE_INST<std::complex<double>>>(); case TYPE_COMPLEX_VECTOR: return std::make_unique<SIM_VALUE_COMPLEX>();
} }
wxFAIL_MSG( _( "Unknown SIM_VALUE type" ) ); wxFAIL_MSG( _( "Unknown SIM_VALUE type" ) );
@ -404,15 +403,22 @@ SIM_VALUE_INST<T>::SIM_VALUE_INST( const T& aValue ) : m_value( aValue )
{ {
} }
template SIM_VALUE_INST<bool>::SIM_VALUE_INST( const bool& aValue ); template SIM_VALUE_BOOL::SIM_VALUE_INST( const bool& aValue );
template SIM_VALUE_INST<long>::SIM_VALUE_INST( const long& aValue ); template SIM_VALUE_INT::SIM_VALUE_INST( const long& aValue );
template SIM_VALUE_INST<double>::SIM_VALUE_INST( const double& aValue ); template SIM_VALUE_FLOAT::SIM_VALUE_INST( const double& aValue );
template SIM_VALUE_INST<std::complex<double>>::SIM_VALUE_INST( const std::complex<double>& aValue ); template SIM_VALUE_COMPLEX::SIM_VALUE_INST( const std::complex<double>& aValue );
template SIM_VALUE_INST<wxString>::SIM_VALUE_INST( const wxString& aValue ); template SIM_VALUE_STRING::SIM_VALUE_INST( const wxString& aValue );
template <typename T>
bool SIM_VALUE_INST<T>::HasValue() const
{
return m_value.has_value();
}
template <> template <>
bool SIM_VALUE_INST<bool>::FromString( const wxString& aString, NOTATION aNotation ) bool SIM_VALUE_BOOL::FromString( const wxString& aString, NOTATION aNotation )
{ {
SIM_VALUE_PARSER::PARSE_RESULT parseResult = SIM_VALUE_PARSER::Parse( aString, aNotation ); SIM_VALUE_PARSER::PARSE_RESULT parseResult = SIM_VALUE_PARSER::Parse( aString, aNotation );
m_value = std::nullopt; m_value = std::nullopt;
@ -438,7 +444,7 @@ bool SIM_VALUE_INST<bool>::FromString( const wxString& aString, NOTATION aNotati
template <> template <>
bool SIM_VALUE_INST<long>::FromString( const wxString& aString, NOTATION aNotation ) bool SIM_VALUE_INT::FromString( const wxString& aString, NOTATION aNotation )
{ {
SIM_VALUE_PARSER::PARSE_RESULT parseResult = SIM_VALUE_PARSER::Parse( aString, aNotation ); SIM_VALUE_PARSER::PARSE_RESULT parseResult = SIM_VALUE_PARSER::Parse( aString, aNotation );
m_value = std::nullopt; m_value = std::nullopt;
@ -461,7 +467,7 @@ bool SIM_VALUE_INST<long>::FromString( const wxString& aString, NOTATION aNotati
template <> template <>
bool SIM_VALUE_INST<double>::FromString( const wxString& aString, NOTATION aNotation ) bool SIM_VALUE_FLOAT::FromString( const wxString& aString, NOTATION aNotation )
{ {
SIM_VALUE_PARSER::PARSE_RESULT parseResult = SIM_VALUE_PARSER::Parse( aString, aNotation ); SIM_VALUE_PARSER::PARSE_RESULT parseResult = SIM_VALUE_PARSER::Parse( aString, aNotation );
m_value = std::nullopt; m_value = std::nullopt;
@ -494,7 +500,7 @@ bool SIM_VALUE_INST<double>::FromString( const wxString& aString, NOTATION aNota
template <> template <>
bool SIM_VALUE_INST<std::complex<double>>::FromString( const wxString& aString, bool SIM_VALUE_COMPLEX::FromString( const wxString& aString,
NOTATION aNotation ) NOTATION aNotation )
{ {
// TODO // TODO
@ -512,7 +518,7 @@ bool SIM_VALUE_INST<std::complex<double>>::FromString( const wxString& aString,
template <> template <>
bool SIM_VALUE_INST<wxString>::FromString( const wxString& aString, NOTATION aNotation ) bool SIM_VALUE_STRING::FromString( const wxString& aString, NOTATION aNotation )
{ {
m_value = aString; m_value = aString;
return true; return true;
@ -537,7 +543,7 @@ wxString SIM_VALUE_INST<T>::ToString( NOTATION aNotation ) const
template <> template <>
wxString SIM_VALUE_INST<bool>::ToString( NOTATION aNotation ) const wxString SIM_VALUE_BOOL::ToString( NOTATION aNotation ) const
{ {
LOCALE_IO toggle; LOCALE_IO toggle;
@ -549,7 +555,7 @@ wxString SIM_VALUE_INST<bool>::ToString( NOTATION aNotation ) const
template <> template <>
wxString SIM_VALUE_INST<long>::ToString( NOTATION aNotation ) const wxString SIM_VALUE_INT::ToString( NOTATION aNotation ) const
{ {
LOCALE_IO toggle; LOCALE_IO toggle;
@ -575,7 +581,7 @@ wxString SIM_VALUE_INST<long>::ToString( NOTATION aNotation ) const
template <> template <>
wxString SIM_VALUE_INST<double>::ToString( NOTATION aNotation ) const wxString SIM_VALUE_FLOAT::ToString( NOTATION aNotation ) const
{ {
LOCALE_IO toggle; LOCALE_IO toggle;
@ -597,7 +603,7 @@ wxString SIM_VALUE_INST<double>::ToString( NOTATION aNotation ) const
template <> template <>
wxString SIM_VALUE_INST<std::complex<double>>::ToString( NOTATION aNotation ) const wxString SIM_VALUE_COMPLEX::ToString( NOTATION aNotation ) const
{ {
LOCALE_IO toggle; LOCALE_IO toggle;
@ -609,7 +615,7 @@ wxString SIM_VALUE_INST<std::complex<double>>::ToString( NOTATION aNotation ) co
template <> template <>
wxString SIM_VALUE_INST<wxString>::ToString( NOTATION aNotation ) const wxString SIM_VALUE_STRING::ToString( NOTATION aNotation ) const
{ {
LOCALE_IO toggle; LOCALE_IO toggle;
@ -635,7 +641,7 @@ wxString SIM_VALUE_INST<T>::ToSimpleString() const
template <> template <>
wxString SIM_VALUE_INST<std::complex<double>>::ToSimpleString() const wxString SIM_VALUE_COMPLEX::ToSimpleString() const
{ {
// TODO // TODO
@ -655,7 +661,7 @@ bool SIM_VALUE_INST<T>::operator==( const T& aOther ) const
template <> template <>
bool SIM_VALUE_INST<bool>::operator==( const bool& aOther ) const bool SIM_VALUE_BOOL::operator==( const bool& aOther ) const
{ {
// Note that we take nullopt as the same as false here. // Note that we take nullopt as the same as false here.
@ -666,10 +672,10 @@ bool SIM_VALUE_INST<bool>::operator==( const bool& aOther ) const
} }
template bool SIM_VALUE_INST<long>::operator==( const long& aOther ) const; template bool SIM_VALUE_INT::operator==( const long& aOther ) const;
template bool SIM_VALUE_INST<double>::operator==( const double& aOther ) const; template bool SIM_VALUE_FLOAT::operator==( const double& aOther ) const;
template bool SIM_VALUE_INST<std::complex<double>>::operator==( const std::complex<double>& aOther ) const; template bool SIM_VALUE_COMPLEX::operator==( const std::complex<double>& aOther ) const;
template bool SIM_VALUE_INST<wxString>::operator==( const wxString& aOther ) const; template bool SIM_VALUE_STRING::operator==( const wxString& aOther ) const;
template <typename T> template <typename T>
@ -683,48 +689,48 @@ bool SIM_VALUE_INST<T>::operator==( const SIM_VALUE& aOther ) const
return false; return false;
} }
template <typename T> template <typename T>
SIM_VALUE_INST<T> operator+( const SIM_VALUE_INST<T>& aLeft, const SIM_VALUE_INST<T>& aRight ) SIM_VALUE_INST<T> operator+( const SIM_VALUE_INST<T>& aLeft, const SIM_VALUE_INST<T>& aRight )
{ {
return SIM_VALUE_INST( *aLeft.m_value + *aRight.m_value ); return SIM_VALUE_INST( aLeft.m_value.value() + aRight.m_value.value() );
} }
template SIM_VALUE_INST<long> operator+( const SIM_VALUE_INST<long>& aLeft, template SIM_VALUE_INT operator+( const SIM_VALUE_INT& aLeft,
const SIM_VALUE_INST<long>& aRight ); const SIM_VALUE_INT& aRight );
template SIM_VALUE_INST<double> operator+( const SIM_VALUE_INST<double>& aLeft, template SIM_VALUE_FLOAT operator+( const SIM_VALUE_FLOAT& aLeft,
const SIM_VALUE_INST<double>& aRight ); const SIM_VALUE_FLOAT& aRight );
template <typename T> template <typename T>
SIM_VALUE_INST<T> operator-( const SIM_VALUE_INST<T>& aLeft, const SIM_VALUE_INST<T>& aRight ) SIM_VALUE_INST<T> operator-( const SIM_VALUE_INST<T>& aLeft, const SIM_VALUE_INST<T>& aRight )
{ {
return SIM_VALUE_INST( *aLeft.m_value - *aRight.m_value ); return SIM_VALUE_INST( aLeft.m_value.value() - aRight.m_value.value() );
} }
template SIM_VALUE_INST<long> operator-( const SIM_VALUE_INST<long>& aLeft, template SIM_VALUE_INT operator-( const SIM_VALUE_INT& aLeft,
const SIM_VALUE_INST<long>& aRight ); const SIM_VALUE_INT& aRight );
template SIM_VALUE_INST<double> operator-( const SIM_VALUE_INST<double>& aLeft, template SIM_VALUE_FLOAT operator-( const SIM_VALUE_FLOAT& aLeft,
const SIM_VALUE_INST<double>& aRight ); const SIM_VALUE_FLOAT& aRight );
template <typename T> template <typename T>
SIM_VALUE_INST<T> operator*( const SIM_VALUE_INST<T>& aLeft, const SIM_VALUE_INST<T>& aRight ) SIM_VALUE_INST<T> operator*( const SIM_VALUE_INST<T>& aLeft, const SIM_VALUE_INST<T>& aRight )
{ {
return SIM_VALUE_INST( *aLeft.m_value * *aRight.m_value ); return SIM_VALUE_INST( aLeft.m_value.value() * aRight.m_value.value() );
} }
template SIM_VALUE_INST<long> operator*( const SIM_VALUE_INST<long>& aLeft, template SIM_VALUE_INT operator*( const SIM_VALUE_INT& aLeft,
const SIM_VALUE_INST<long>& aRight ); const SIM_VALUE_INT& aRight );
template SIM_VALUE_INST<double> operator*( const SIM_VALUE_INST<double>& aLeft, template SIM_VALUE_FLOAT operator*( const SIM_VALUE_FLOAT& aLeft,
const SIM_VALUE_INST<double>& aRight ); const SIM_VALUE_FLOAT& aRight );
template <typename T> template <typename T>
SIM_VALUE_INST<T> operator/( const SIM_VALUE_INST<T>& aLeft, const SIM_VALUE_INST<T>& aRight ) SIM_VALUE_INST<T> operator/( const SIM_VALUE_INST<T>& aLeft, const SIM_VALUE_INST<T>& aRight )
{ {
return SIM_VALUE_INST( *aLeft.m_value / *aRight.m_value ); return SIM_VALUE_INST( aLeft.m_value.value() / aRight.m_value.value() );
} }
template SIM_VALUE_INST<long> operator/( const SIM_VALUE_INST<long>& aLeft, template SIM_VALUE_INT operator/( const SIM_VALUE_INT& aLeft,
const SIM_VALUE_INST<long>& aRight ); const SIM_VALUE_INT& aRight );
template SIM_VALUE_INST<double> operator/( const SIM_VALUE_INST<double>& aLeft, template SIM_VALUE_FLOAT operator/( const SIM_VALUE_FLOAT& aLeft,
const SIM_VALUE_INST<double>& aRight ); const SIM_VALUE_FLOAT& aRight );

8
eeschema/sim/sim_value.h
View File

@ -27,6 +27,7 @@
#include <wx/string.h> #include <wx/string.h>
#include <optional> #include <optional>
#include <complex>
#include <memory> #include <memory>
#include <pegtl.hpp> #include <pegtl.hpp>
@ -70,6 +71,8 @@ public:
virtual ~SIM_VALUE() = default; virtual ~SIM_VALUE() = default;
SIM_VALUE() = default; SIM_VALUE() = default;
virtual bool HasValue() const = 0;
void operator=( const wxString& aString ); void operator=( const wxString& aString );
virtual bool operator==( const SIM_VALUE& aOther ) const = 0; virtual bool operator==( const SIM_VALUE& aOther ) const = 0;
bool operator!=( const SIM_VALUE& aOther ) const; bool operator!=( const SIM_VALUE& aOther ) const;
@ -90,6 +93,8 @@ public:
SIM_VALUE_INST() = default; SIM_VALUE_INST() = default;
SIM_VALUE_INST( const T& aValue ); SIM_VALUE_INST( const T& aValue );
bool HasValue() const override;
// TODO: Don't pass aNotation. Make a FromSpiceString() function instead. // TODO: Don't pass aNotation. Make a FromSpiceString() function instead.
bool FromString( const wxString& aString, NOTATION aNotation = NOTATION::SI ) override; bool FromString( const wxString& aString, NOTATION aNotation = NOTATION::SI ) override;
wxString ToString( NOTATION aNotation = NOTATION::SI ) const override; wxString ToString( NOTATION aNotation = NOTATION::SI ) const override;
@ -122,8 +127,9 @@ private:
}; };
typedef SIM_VALUE_INST<bool> SIM_VALUE_BOOL; typedef SIM_VALUE_INST<bool> SIM_VALUE_BOOL;
typedef SIM_VALUE_INST<long> SIM_VALUE_LONG; typedef SIM_VALUE_INST<long> SIM_VALUE_INT;
typedef SIM_VALUE_INST<double> SIM_VALUE_FLOAT; typedef SIM_VALUE_INST<double> SIM_VALUE_FLOAT;
typedef SIM_VALUE_INST<std::complex<double>> SIM_VALUE_COMPLEX;
typedef SIM_VALUE_INST<wxString> SIM_VALUE_STRING; typedef SIM_VALUE_INST<wxString> SIM_VALUE_STRING;