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

Common: add GetTextVars for unexpanded variable names

This commit is contained in:
Mike Williams 2023-07-12 11:26:26 -04:00
parent 500779fc80
commit e2f47ecabb
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
common/common.cpp
View File

@ -112,6 +112,18 @@ wxString ExpandTextVars( const wxString& aSource,
} }
wxString GetTextVars( const wxString& aSource )
{
std::function<bool( wxString* )> tokenExtractor =
[&]( wxString* token ) -> bool
{
return true;
};
return ExpandTextVars( aSource, &tokenExtractor );
}
// //
// Stolen from wxExpandEnvVars and then heavily optimized // Stolen from wxExpandEnvVars and then heavily optimized
// //

5
include/common.h
View File

@ -91,6 +91,11 @@ wxString ExpandTextVars( const wxString& aSource,
wxString ExpandTextVars( const wxString& aSource, const PROJECT* aProject ); wxString ExpandTextVars( const wxString& aSource, const PROJECT* aProject );
/**
* Returns any variables unexpanded, e.g. ${VAR} -> VAR
*/
wxString GetTextVars( const wxString& aSource );
/** /**
* Replace any environment and/or text variables in file-path uris (leaving network-path URIs * Replace any environment and/or text variables in file-path uris (leaving network-path URIs
* alone). * alone).