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

Revert "Check for property prefix in DRC"

Browse Source 
This reverts commit 85397f6edc835fa6abed8fdc77d53614c94a79b1.
This commit is contained in:
Seth Hillbrand 2025-08-25 11:37:13 -07:00
parent 4e7fa189aa
commit ef0ca4840e
3 changed files with 0 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pcbnew/dialogs/panel_setup_rules_help_8expression_functions.h
View File

@ -3,8 +3,6 @@ _HKI( "### Expression functions\n"
"\n"
"All function parameters support simple wildcards (`*` and `?`).\n"
"\n"
"All properties and functions must specify the item they apply to using either `A.` or `B.`.\n"
"Unqualified usage defaults to `A.`.\n"
"\n"
" A.enclosedByArea('<zone_name>')\n"
" True if all of `A` lies within the given zone's outline.\n"

2
pcbnew/dialogs/panel_setup_rules_help_8expression_functions.md
View File

@ -2,8 +2,6 @@
All function parameters support simple wildcards (`*` and `?`).
All properties and functions must specify the item they apply to using either `A.` or `B.`.
Unqualified usage defaults to `A.`.
A.enclosedByArea('<zone_name>')
True if all of `A` lies within the given zone's outline.

78
pcbnew/drc/drc_rule_condition.cpp
View File

@ -26,7 +26,6 @@
#include <reporter.h>
#include <drc/drc_rule_condition.h>
#include <pcbexpr_evaluator.h>
#include <vector>
DRC_RULE_CONDITION::DRC_RULE_CONDITION( const wxString& aExpression ) :
@ -89,83 +88,6 @@ bool DRC_RULE_CONDITION::EvaluateFor( const BOARD_ITEM* aItemA, const BOARD_ITEM
bool DRC_RULE_CONDITION::Compile( REPORTER* aReporter, int aSourceLine, int aSourceOffset )
{
static std::vector<wxString> propNames;
if( propNames.empty() )
{
PROPERTY_MANAGER& propMgr = PROPERTY_MANAGER::Instance();
for( const PROPERTY_MANAGER::CLASS_INFO& cls : propMgr.GetAllClasses() )
{
for( PROPERTY_BASE* prop : cls.properties )
{
if( prop->IsHiddenFromRulesEditor() )
continue;
wxString name = prop->Name();
name.Replace( wxT( " " ), wxT( "_" ) );
propNames.push_back( name.Lower() );
}
}
for( const wxString& sig : PCBEXPR_BUILTIN_FUNCTIONS::Instance().GetSignatures() )
{
wxString name = sig.BeforeFirst( '(' );
propNames.push_back( name.Lower() );
}
}
wxString exprLower = m_expression.Lower();
auto isIdent = []( wxChar c )
{
return ( ( c >= 'a' && c <= 'z' ) || ( c >= 'A' && c <= 'Z' ) ||
( c >= '0' && c <= '9' ) || c == '_' );
};
for( const wxString& name : propNames )
{
size_t pos = 0;
while( ( pos = exprLower.find( name, pos ) ) != exprLower.npos )
{
size_t end = pos + name.Length();
bool boundaryStart = ( pos == 0 ) || !isIdent( exprLower[ pos - 1 ] );
bool boundaryEnd = ( end == exprLower.Length() ) || !isIdent( exprLower[ end ] );
if( boundaryStart && boundaryEnd )
{
bool needPrefix = true;
if( pos >= 2 && m_expression[ pos - 1 ] == '.'
&& ( m_expression[ pos - 2 ] == 'A' || m_expression[ pos - 2 ] == 'B' ) )
{
needPrefix = false;
}
if( needPrefix )
{
if( aReporter )
{
wxString msg = wxString::Format(
_( "The '%s' property requires an 'A.' or 'B.' prefix; assuming 'A.'" ),
m_expression.Mid( pos, name.Length() ) );
aReporter->Report( msg, RPT_SEVERITY_WARNING );
}
m_expression.insert( pos, wxT( "A." ) );
exprLower.insert( pos, wxT( "a." ) );
pos += name.Length() + 2;
continue;
}
}
pos += name.Length();
}
}
PCBEXPR_COMPILER compiler( new PCBEXPR_UNIT_RESOLVER() );
if( aReporter )