adam/Alepha
1
0
Fork 0
forked from Alepha/Alepha
Code Pull Requests Activity

Remove the string-based code.

Browse Source
This commit is contained in:
ADAM David Alan Martin
2023-10-15 20:16:52 -04:00
parent 3ad9f33953
commit 948877d920
1 changed files with 0 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
string_algorithms.cpp
View File

@ -139,7 +139,6 @@ namespace Alepha::Cavorite ::detail:: string_algorithms
std::string std::string
exports::expandVariables( const std::string &text, const VarMap &vars, const char sigil ) exports::expandVariables( const std::string &text, const VarMap &vars, const char sigil )
{ {
#if 1
std::ostringstream oss; std::ostringstream oss;
oss << StartSubstitutions{ sigil, vars }; oss << StartSubstitutions{ sigil, vars };
@ -147,47 +146,6 @@ namespace Alepha::Cavorite ::detail:: string_algorithms
oss << EndSubstitutions; oss << EndSubstitutions;
return std::move( oss ).str(); return std::move( oss ).str();
#else
if( C::debugExpansion ) error() << "Expanding variables in " << text << std::endl;
std::string rv;
std::string varName;
enum { Symbol, Normal } mode= Normal;
for( const char ch: text )
{
if( mode == Normal and ch == sigil )
{
mode= Symbol;
varName.clear();
continue;
}
if( mode == Symbol and ch == sigil )
{
mode= Normal;
if( not varName.empty() )
{
if( not vars.contains( varName ) )
{
throw std::runtime_error( "No such variable: `" + varName + "`" );
}
if( C::debugExpansion ) error() << "Expanding variable with name `" << varName << "`" << std::endl;
rv+= vars.at( varName )();
}
else rv+= sigil;
continue;
}
auto &current= mode == Normal ? rv : varName;
current+= ch;
}
if( mode != Normal ) throw std::runtime_error( "Unterminated variable `" + varName + " in expansion of `" + text + "`" );
if( C::debugExpansion ) error() << "Expansion was: `" << rv << "`" << std::endl;
return rv;
#endif
} }
std::vector< std::string > std::vector< std::string >