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

Change program options to use streaming wrap, not string wrap.

Browse Source
This commit is contained in:
ADAM David Alan Martin
2023-10-15 03:38:32 -04:00
parent b6cbf5199b
commit f1f010fdb2
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ProgramOptions.cpp
View File

@ -190,11 +190,15 @@ namespace Alepha::Cavorite ::detail:: program_options
} }
} }
const std::size_t width= getConsoleWidth();
std::cout << StartWrap{ width };
std::cout << "Options:" << std::endl << std::endl; std::cout << "Options:" << std::endl << std::endl;
std::cout << EndWrap;
// Inspect and print each option. // Inspect and print each option.
for( const auto &[ name, def ]: programOptions() ) for( const auto &[ name, def ]: programOptions() )
{ {
std::cout << StartWrap{ width, alignmentWidth };
const auto &[ _, helpText, defaultBuilder, domains ]= def; const auto &[ _, helpText, defaultBuilder, domains ]= def;
// How much unused of the max width there will be // How much unused of the max width there will be
const std::size_t padding= alignmentWidth - name.size() - 2; const std::size_t padding= alignmentWidth - name.size() - 2;
@ -221,16 +225,17 @@ namespace Alepha::Cavorite ::detail:: program_options
// Append the incompatibility text, when we see mutually-exclusive options. // Append the incompatibility text, when we see mutually-exclusive options.
substitutionTemplate+= buildIncompatibleHelpText( name, domains, exclusivityMembers ); substitutionTemplate+= buildIncompatibleHelpText( name, domains, exclusivityMembers );
const std::string helpString= expandVariables( substitutionTemplate, substitutions, '!' ); std::cout << expandVariables( substitutionTemplate, substitutions, '!' );
printString( helpString, alignmentWidth ); std::cout << EndWrap;
std::cout << std::endl; std::cout << std::endl;
} }
// Check for required options, and print a summary of those: // Check for required options, and print a summary of those:
if( not requiredOptions().empty() ) for( const auto &[ _, group ]: requiredOptions() ) if( not requiredOptions().empty() ) for( const auto &[ _, group ]: requiredOptions() )
{ {
const std::size_t width= getConsoleWidth(); std::ostream &oss= std::cout;
std::ostringstream oss; oss << StartWrap{ width };
oss << "At least one of the options in this group are required: "; oss << "At least one of the options in this group are required: ";
bool first= true; bool first= true;
for( const auto &required: group ) for( const auto &required: group )
@ -240,7 +245,7 @@ namespace Alepha::Cavorite ::detail:: program_options
oss << '`' << required << '`'; oss << '`' << required << '`';
} }
std::cout << wordWrap( oss.str(), width ) << std::endl; oss << std::endl;
} }
} }
} }