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

Terminology and more dead code. 

(cherry picked from commit 29f21cdde6)
This commit is contained in:
Jeff Young 2023-02-21 20:10:56 +00:00
parent 38e5da724d
commit db3657d411
2 changed files with 61 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

134
eeschema/sim/sim_value.cpp
View File

@ -87,33 +87,33 @@ namespace SIM_VALUE_PARSER
template <> struct numberSelector<intPart> : std::true_type {}; template <> struct numberSelector<intPart> : std::true_type {};
template <> struct numberSelector<fracPart> : std::true_type {}; template <> struct numberSelector<fracPart> : std::true_type {};
template <> struct numberSelector<exponent> : std::true_type {}; template <> struct numberSelector<exponent> : std::true_type {};
template <> struct numberSelector<metricSuffix<SIM_VALUE::TYPE_INT, NOTATION::SI>> template <> struct numberSelector<unitPrefix<SIM_VALUE::TYPE_INT, NOTATION::SI>>
: std::true_type {}; : std::true_type {};
template <> struct numberSelector<metricSuffix<SIM_VALUE::TYPE_INT, NOTATION::SPICE>> template <> struct numberSelector<unitPrefix<SIM_VALUE::TYPE_INT, NOTATION::SPICE>>
: std::true_type {}; : std::true_type {};
template <> struct numberSelector<metricSuffix<SIM_VALUE::TYPE_FLOAT, NOTATION::SI>> template <> struct numberSelector<unitPrefix<SIM_VALUE::TYPE_FLOAT, NOTATION::SI>>
: std::true_type {}; : std::true_type {};
template <> struct numberSelector<metricSuffix<SIM_VALUE::TYPE_FLOAT, NOTATION::SPICE>> template <> struct numberSelector<unitPrefix<SIM_VALUE::TYPE_FLOAT, NOTATION::SPICE>>
: std::true_type {}; : std::true_type {};
struct PARSE_RESULT struct PARSE_RESULT
{ {
bool isOk = true; bool isOk = true;
bool isEmpty = true; bool isEmpty = true;
std::string significand; std::string significand;
std::optional<int64_t> intPart; std::optional<int64_t> intPart;
std::optional<int64_t> fracPart; std::optional<int64_t> fracPart;
std::optional<int> exponent; std::optional<int> exponent;
std::optional<int> metricSuffixExponent; std::optional<int> unitPrefixExponent;
}; };
PARSE_RESULT Parse( const std::string& aString, PARSE_RESULT Parse( const std::string& aString,
NOTATION aNotation = NOTATION::SI, NOTATION aNotation = NOTATION::SI,
SIM_VALUE::TYPE aValueType = SIM_VALUE::TYPE_FLOAT ); SIM_VALUE::TYPE aValueType = SIM_VALUE::TYPE_FLOAT );
int MetricSuffixToExponent( std::string aMetricSuffix, NOTATION aNotation = NOTATION::SI ); int UnitPrefixToExponent( std::string aPrefix, NOTATION aNotation = NOTATION::SI );
std::string ExponentToMetricSuffix( double aExponent, int& aReductionExponent, std::string ExponentToUnitPrefix( double aExponent, int& aExponentReduction,
NOTATION aNotation = NOTATION::SI ); NOTATION aNotation = NOTATION::SI );
} }
@ -124,9 +124,8 @@ static inline void doIsValid( tao::pegtl::string_input<>& aIn )
} }
bool SIM_VALUE_GRAMMAR::IsValid( const std::string& aString, bool SIM_VALUE_GRAMMAR::IsValid( const std::string& aString, SIM_VALUE::TYPE aValueType,
SIM_VALUE::TYPE aValueType, NOTATION aNotation )
NOTATION aNotation )
{ {
tao::pegtl::string_input<> in( aString, "from_content" ); tao::pegtl::string_input<> in( aString, "from_content" );
@ -175,10 +174,10 @@ static inline void handleNodeForParse( tao::pegtl::parse_tree::node& aNode,
aParseResult.exponent = std::stoi( aNode.string() ); aParseResult.exponent = std::stoi( aNode.string() );
aParseResult.isEmpty = false; aParseResult.isEmpty = false;
} }
else if( aNode.is_type<SIM_VALUE_PARSER::metricSuffix<ValueType, Notation>>() ) else if( aNode.is_type<SIM_VALUE_PARSER::unitPrefix<ValueType, Notation>>() )
{ {
aParseResult.metricSuffixExponent = aParseResult.unitPrefixExponent =
SIM_VALUE_PARSER::MetricSuffixToExponent( aNode.string(), Notation ); SIM_VALUE_PARSER::UnitPrefixToExponent( aNode.string(), Notation );
aParseResult.isEmpty = false; aParseResult.isEmpty = false;
} }
else else
@ -225,15 +224,15 @@ SIM_VALUE_PARSER::PARSE_RESULT SIM_VALUE_PARSER::Parse( const std::string& aStri
} }
int SIM_VALUE_PARSER::MetricSuffixToExponent( std::string aMetricSuffix, NOTATION aNotation ) int SIM_VALUE_PARSER::UnitPrefixToExponent( std::string aPrefix, NOTATION aNotation )
{ {
switch( aNotation ) switch( aNotation )
{ {
case NOTATION::SI: case NOTATION::SI:
if( aMetricSuffix.empty() ) if( aPrefix.empty() )
return 0; return 0;
switch( aMetricSuffix[0] ) switch( aPrefix[0] )
{ {
case 'a': return -18; case 'a': return -18;
case 'f': return -15; case 'f': return -15;
@ -253,108 +252,108 @@ int SIM_VALUE_PARSER::MetricSuffixToExponent( std::string aMetricSuffix, NOTATIO
break; break;
case NOTATION::SPICE: case NOTATION::SPICE:
std::transform( aMetricSuffix.begin(), aMetricSuffix.end(), aMetricSuffix.begin(), std::transform( aPrefix.begin(), aPrefix.end(), aPrefix.begin(),
::tolower ); ::tolower );
if( aMetricSuffix == "f" ) if( aPrefix == "f" )
return -15; return -15;
else if( aMetricSuffix == "p" ) else if( aPrefix == "p" )
return -12; return -12;
else if( aMetricSuffix == "n" ) else if( aPrefix == "n" )
return -9; return -9;
else if( aMetricSuffix == "u" ) else if( aPrefix == "u" )
return -6; return -6;
else if( aMetricSuffix == "m" ) else if( aPrefix == "m" )
return -3; return -3;
else if( aMetricSuffix == "" ) else if( aPrefix == "" )
return 0; return 0;
else if( aMetricSuffix == "k" ) else if( aPrefix == "k" )
return 3; return 3;
else if( aMetricSuffix == "meg" ) else if( aPrefix == "meg" )
return 6; return 6;
else if( aMetricSuffix == "g" ) else if( aPrefix == "g" )
return 9; return 9;
else if( aMetricSuffix == "t" ) else if( aPrefix == "t" )
return 12; return 12;
break; break;
} }
wxFAIL_MSG( fmt::format( "Unknown simulator value suffix: '{:s}'", aMetricSuffix ) ); wxFAIL_MSG( fmt::format( "Unknown simulator value suffix: '{:s}'", aPrefix ) );
return 0; return 0;
} }
std::string SIM_VALUE_PARSER::ExponentToMetricSuffix( double aExponent, int& aReductionExponent, std::string SIM_VALUE_PARSER::ExponentToUnitPrefix( double aExponent, int& aExponentReduction,
NOTATION aNotation ) NOTATION aNotation )
{ {
if( aNotation == NOTATION::SI && aExponent >= -18 && aExponent <= -15 ) if( aNotation == NOTATION::SI && aExponent >= -18 && aExponent <= -15 )
{ {
aReductionExponent = -18; aExponentReduction = -18;
return "a"; return "a";
} }
else if( aExponent >= -15 && aExponent < -12 ) else if( aExponent >= -15 && aExponent < -12 )
{ {
aReductionExponent = -15; aExponentReduction = -15;
return "f"; return "f";
} }
else if( aExponent >= -12 && aExponent < -9 ) else if( aExponent >= -12 && aExponent < -9 )
{ {
aReductionExponent = -12; aExponentReduction = -12;
return "p"; return "p";
} }
else if( aExponent >= -9 && aExponent < -6 ) else if( aExponent >= -9 && aExponent < -6 )
{ {
aReductionExponent = -9; aExponentReduction = -9;
return "n"; return "n";
} }
else if( aExponent >= -6 && aExponent < -3 ) else if( aExponent >= -6 && aExponent < -3 )
{ {
aReductionExponent = -6; aExponentReduction = -6;
return "u"; return "u";
} }
else if( aExponent >= -3 && aExponent < 0 ) else if( aExponent >= -3 && aExponent < 0 )
{ {
aReductionExponent = -3; aExponentReduction = -3;
return "m"; return "m";
} }
else if( aExponent >= 0 && aExponent < 3 ) else if( aExponent >= 0 && aExponent < 3 )
{ {
aReductionExponent = 0; aExponentReduction = 0;
return ""; return "";
} }
else if( aExponent >= 3 && aExponent < 6 ) else if( aExponent >= 3 && aExponent < 6 )
{ {
aReductionExponent = 3; aExponentReduction = 3;
return "k"; return "k";
} }
else if( aExponent >= 6 && aExponent < 9 ) else if( aExponent >= 6 && aExponent < 9 )
{ {
aReductionExponent = 6; aExponentReduction = 6;
return ( aNotation == NOTATION::SI ) ? "M" : "Meg"; return ( aNotation == NOTATION::SI ) ? "M" : "Meg";
} }
else if( aExponent >= 9 && aExponent < 12 ) else if( aExponent >= 9 && aExponent < 12 )
{ {
aReductionExponent = 9; aExponentReduction = 9;
return "G"; return "G";
} }
else if( aExponent >= 12 && aExponent < 15 ) else if( aExponent >= 12 && aExponent < 15 )
{ {
aReductionExponent = 12; aExponentReduction = 12;
return "T"; return "T";
} }
else if( aNotation == NOTATION::SI && aExponent >= 15 && aExponent < 18 ) else if( aNotation == NOTATION::SI && aExponent >= 15 && aExponent < 18 )
{ {
aReductionExponent = 15; aExponentReduction = 15;
return "P"; return "P";
} }
else if( aNotation == NOTATION::SI && aExponent >= 18 && aExponent <= 21 ) else if( aNotation == NOTATION::SI && aExponent >= 18 && aExponent <= 21 )
{ {
aReductionExponent = 18; aExponentReduction = 18;
return "E"; return "E";
} }
aReductionExponent = 0; aExponentReduction = 0;
return ""; return "";
} }
@ -441,7 +440,7 @@ bool SIM_VALUE_BOOL::FromString( const std::string& aString, NOTATION aNotation
|| ( *parseResult.intPart != 0 && *parseResult.intPart != 1 ) || ( *parseResult.intPart != 0 && *parseResult.intPart != 1 )
|| parseResult.fracPart || parseResult.fracPart
|| parseResult.exponent || parseResult.exponent
|| parseResult.metricSuffixExponent ) || parseResult.unitPrefixExponent )
{ {
return false; return false;
} }
@ -467,7 +466,7 @@ bool SIM_VALUE_INT::FromString( const std::string& aString, NOTATION aNotation )
return false; return false;
int exponent = parseResult.exponent ? *parseResult.exponent : 0; int exponent = parseResult.exponent ? *parseResult.exponent : 0;
exponent += parseResult.metricSuffixExponent ? *parseResult.metricSuffixExponent : 0; exponent += parseResult.unitPrefixExponent ? *parseResult.unitPrefixExponent : 0;
m_value = static_cast<double>( *parseResult.intPart ) * std::pow( 10, exponent ); m_value = static_cast<double>( *parseResult.intPart ) * std::pow( 10, exponent );
return true; return true;
@ -498,7 +497,7 @@ bool SIM_VALUE_FLOAT::FromString( const std::string& aString, NOTATION aNotation
return false; return false;
int exponent = parseResult.exponent ? *parseResult.exponent : 0; int exponent = parseResult.exponent ? *parseResult.exponent : 0;
exponent += parseResult.metricSuffixExponent ? *parseResult.metricSuffixExponent : 0; exponent += parseResult.unitPrefixExponent ? *parseResult.unitPrefixExponent : 0;
try try
{ {
@ -582,9 +581,9 @@ std::string SIM_VALUE_INT::ToString( NOTATION aNotation ) const
} }
int dummy = 0; int dummy = 0;
std::string metricSuffix = SIM_VALUE_PARSER::ExponentToMetricSuffix( std::string prefix = SIM_VALUE_PARSER::ExponentToUnitPrefix( (double) exponent, dummy,
static_cast<double>( exponent ), dummy, aNotation ); aNotation );
return fmt::format( "{:d}{:s}", value, metricSuffix ); return fmt::format( "{:d}{:s}", value, prefix );
} }
return ""; return "";
@ -599,11 +598,11 @@ std::string SIM_VALUE_FLOAT::ToString( NOTATION aNotation ) const
double exponent = std::log10( std::abs( *m_value ) ); double exponent = std::log10( std::abs( *m_value ) );
int reductionExponent = 0; int reductionExponent = 0;
std::string metricSuffix = std::string prefix = SIM_VALUE_PARSER::ExponentToUnitPrefix( exponent, reductionExponent,
SIM_VALUE_PARSER::ExponentToMetricSuffix( exponent, reductionExponent, aNotation ); aNotation );
double reducedValue = *m_value / std::pow( 10, reductionExponent ); double reducedValue = *m_value / std::pow( 10, reductionExponent );
return fmt::format( "{:g}{}", reducedValue, metricSuffix ); return fmt::format( "{:g}{}", reducedValue, prefix );
} }
else else
return ""; return "";
@ -630,29 +629,6 @@ std::string SIM_VALUE_STRING::ToString( NOTATION aNotation ) const
} }
template <typename T>
std::string SIM_VALUE_INST<T>::ToSimpleString() const
{
if( m_value )
return fmt::format( "{}", *m_value );
return "";
}
template <>
std::string SIM_VALUE_COMPLEX::ToSimpleString() const
{
// TODO
/*std::string result = "";
result << *m_value;
return result;*/
return "";
}
template <typename T> template <typename T>
SIM_VALUE_INST<T>& SIM_VALUE_INST<T>::operator=( const SIM_VALUE& aOther ) SIM_VALUE_INST<T>& SIM_VALUE_INST<T>::operator=( const SIM_VALUE& aOther )
{ {

16
eeschema/sim/sim_value.h
View File

@ -93,9 +93,6 @@ public:
virtual bool FromString( const std::string& aString, NOTATION aNotation = NOTATION::SI ) = 0; virtual bool FromString( const std::string& aString, NOTATION aNotation = NOTATION::SI ) = 0;
virtual std::string ToString( NOTATION aNotation = NOTATION::SI ) const = 0; virtual std::string ToString( NOTATION aNotation = NOTATION::SI ) const = 0;
std::string ToSpiceString() const { return ToString( NOTATION::SPICE ); } std::string ToSpiceString() const { return ToString( NOTATION::SPICE ); }
// For parsers that don't accept strings with our suffixes.
virtual std::string ToSimpleString() const = 0;
}; };
@ -112,7 +109,6 @@ public:
// TODO: Don't use FromString(). Use assignment. Values should be immutable. // TODO: Don't use FromString(). Use assignment. Values should be immutable.
bool FromString( const std::string& aString, NOTATION aNotation = NOTATION::SI ) override; bool FromString( const std::string& aString, NOTATION aNotation = NOTATION::SI ) override;
std::string ToString( NOTATION aNotation = NOTATION::SI ) const override; std::string ToString( NOTATION aNotation = NOTATION::SI ) const override;
std::string ToSimpleString() const override;
SIM_VALUE_INST& operator=( const SIM_VALUE& aOther ) override; SIM_VALUE_INST& operator=( const SIM_VALUE& aOther ) override;
bool operator==( const T& aOther ) const; bool operator==( const T& aOther ) const;
@ -186,19 +182,19 @@ namespace SIM_VALUE_GRAMMAR
template <SIM_VALUE::TYPE ValueType, NOTATION Notation> template <SIM_VALUE::TYPE ValueType, NOTATION Notation>
struct metricSuffix; struct unitPrefix;
template <> struct metricSuffix<SIM_VALUE::TYPE_INT, NOTATION::SI> template <> struct unitPrefix<SIM_VALUE::TYPE_INT, NOTATION::SI>
: one<'k', 'K', 'M', 'G', 'T', 'P', 'E'> {}; : one<'k', 'K', 'M', 'G', 'T', 'P', 'E'> {};
template <> struct metricSuffix<SIM_VALUE::TYPE_INT, NOTATION::SPICE> template <> struct unitPrefix<SIM_VALUE::TYPE_INT, NOTATION::SPICE>
: sor<TAO_PEGTL_ISTRING( "k" ), : sor<TAO_PEGTL_ISTRING( "k" ),
TAO_PEGTL_ISTRING( "Meg" ), TAO_PEGTL_ISTRING( "Meg" ),
TAO_PEGTL_ISTRING( "G" ), TAO_PEGTL_ISTRING( "G" ),
TAO_PEGTL_ISTRING( "T" )> {}; TAO_PEGTL_ISTRING( "T" )> {};
template <> struct metricSuffix<SIM_VALUE::TYPE_FLOAT, NOTATION::SI> template <> struct unitPrefix<SIM_VALUE::TYPE_FLOAT, NOTATION::SI>
: one<'a', 'f', 'p', 'n', 'u', 'm', 'k', 'K', 'M', 'G', 'T', 'P', 'E'> {}; : one<'a', 'f', 'p', 'n', 'u', 'm', 'k', 'K', 'M', 'G', 'T', 'P', 'E'> {};
template <> struct metricSuffix<SIM_VALUE::TYPE_FLOAT, NOTATION::SPICE> template <> struct unitPrefix<SIM_VALUE::TYPE_FLOAT, NOTATION::SPICE>
: sor<TAO_PEGTL_ISTRING( "f" ), : sor<TAO_PEGTL_ISTRING( "f" ),
TAO_PEGTL_ISTRING( "p" ), TAO_PEGTL_ISTRING( "p" ),
TAO_PEGTL_ISTRING( "n" ), TAO_PEGTL_ISTRING( "n" ),
@ -221,7 +217,7 @@ namespace SIM_VALUE_GRAMMAR
template <SIM_VALUE::TYPE ValueType, NOTATION Notation> template <SIM_VALUE::TYPE ValueType, NOTATION Notation>
struct number : seq<opt<significand<ValueType>>, struct number : seq<opt<significand<ValueType>>,
opt<exponentWithPrefix>, opt<exponentWithPrefix>,
opt<metricSuffix<ValueType, Notation>>, opt<unitPrefix<ValueType, Notation>>,
garbageSuffix<Notation>> {}; garbageSuffix<Notation>> {};
template <SIM_VALUE::TYPE ValueType, NOTATION Notation> template <SIM_VALUE::TYPE ValueType, NOTATION Notation>