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

Fix shadow variable defn.

This commit is contained in:
Jeff Young 2021-12-02 11:40:31 +00:00
parent 50c1a91d44
commit 8fab8a05d6
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
common/eda_pattern_match.cpp
View File

@ -239,7 +239,7 @@ bool EDA_PATTERN_MATCH_RELATIONAL::SetPattern( const wxString& aPattern )
// Matching on empty values keeps the match list from going empty when // Matching on empty values keeps the match list from going empty when
// the user types the relational operator character, which helps prevent // the user types the relational operator character, which helps prevent
// confusion. // confusion.
m_relation = NONE; m_relation = ANY;
} }
else if( !val.ToCDouble( &m_value ) ) else if( !val.ToCDouble( &m_value ) )
return false; return false;
@ -317,13 +317,13 @@ int EDA_PATTERN_MATCH_RELATIONAL::FindOne( const wxString& aCandidate ) const
switch( m_relation ) switch( m_relation )
{ {
case LT: return val_parsed < m_value ? istart : EDA_PATTERN_NOT_FOUND; case LT: return val_parsed < m_value ? istart : EDA_PATTERN_NOT_FOUND;
case LE: return val_parsed <= m_value ? istart : EDA_PATTERN_NOT_FOUND; case LE: return val_parsed <= m_value ? istart : EDA_PATTERN_NOT_FOUND;
case EQ: return val_parsed == m_value ? istart : EDA_PATTERN_NOT_FOUND; case EQ: return val_parsed == m_value ? istart : EDA_PATTERN_NOT_FOUND;
case GE: return val_parsed >= m_value ? istart : EDA_PATTERN_NOT_FOUND; case GE: return val_parsed >= m_value ? istart : EDA_PATTERN_NOT_FOUND;
case GT: return val_parsed > m_value ? istart : EDA_PATTERN_NOT_FOUND; case GT: return val_parsed > m_value ? istart : EDA_PATTERN_NOT_FOUND;
case NONE: return istart; case ANY: return istart;
default: return EDA_PATTERN_NOT_FOUND; default: return EDA_PATTERN_NOT_FOUND;
} }
} }

2
include/eda_pattern_match.h
View File

@ -154,7 +154,7 @@ public:
protected: protected:
enum RELATION { LT, LE, EQ, GE, GT, NONE }; enum RELATION { LT, LE, EQ, GE, GT, ANY };
wxString m_pattern; wxString m_pattern;
wxString m_key; wxString m_key;