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

Sanitize some debug printing.

Browse Source
This commit is contained in:
ADAM David Alan Martin
2023-10-20 05:08:13 -04:00
parent 127dd6308f
commit 4e107ec0b1
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
string_algorithms.cpp
View File

@ -18,6 +18,7 @@ namespace Alepha::Cavorite ::detail:: string_algorithms
const bool debug= false; const bool debug= false;
const bool debugExpansion= false or C::debug; const bool debugExpansion= false or C::debug;
const bool debugCommas= false or C::debug; const bool debugCommas= false or C::debug;
const bool debugIOStreamLifecycle= false or C::debug;
} }
struct VariableExpansionStreambuf struct VariableExpansionStreambuf
@ -82,10 +83,10 @@ namespace Alepha::Cavorite ::detail:: string_algorithms
void void
drain() drain()
{ {
std::cerr << "Drain called, and mode is: " << mode << std::endl; if( C::debugIOStreamLifecycle ) error() << "Drain called, and mode is: " << mode << std::endl;
if( mode != Normal ) if( mode != Normal )
{ {
std::cerr << "Mode not being normal, we're throwing (" << ++throws << " times now)..." << std::endl; if( C::debugIOStreamLifecycle ) error() << "Mode not being normal, we're throwing (" << ++throws << " times now)..." << std::endl;
mode= Normal; mode= Normal;
throw std::runtime_error{ "Unterminated variable `" + varName.str() + " in expansion." }; throw std::runtime_error{ "Unterminated variable `" + varName.str() + " in expansion." };
} }
@ -97,7 +98,7 @@ namespace Alepha::Cavorite ::detail:: string_algorithms
void void
releaseWrapper( std::ostream &os ) releaseWrapper( std::ostream &os )
{ {
std::cerr << "Release wrapper called on: " << &os << std::endl; if( C::debugIOStreamLifecycle ) error() << "Release wrapper called on: " << &os << std::endl;
auto *const streambuf= static_cast< VariableExpansionStreambuf * >( os.pword( wrapperIndex ) ); auto *const streambuf= static_cast< VariableExpansionStreambuf * >( os.pword( wrapperIndex ) );
if( not streambuf ) throw std::logic_error{ "Attempt to remove a substitution context which doesn't exist." }; if( not streambuf ) throw std::logic_error{ "Attempt to remove a substitution context which doesn't exist." };
@ -106,7 +107,7 @@ namespace Alepha::Cavorite ::detail:: string_algorithms
[&] { return os.rdbuf( streambuf->underlying ); }, [&] { return os.rdbuf( streambuf->underlying ); },
[&] ( std::streambuf *streambuf ) noexcept [&] ( std::streambuf *streambuf ) noexcept
{ {
std::cerr << "Deletion actually happening, now." << std::endl; if( C::debugIOStreamLifecycle ) error() << "Deletion actually happening, now." << std::endl;
delete streambuf; delete streambuf;
os.pword( wrapperIndex )= nullptr; os.pword( wrapperIndex )= nullptr;
} }
@ -117,7 +118,7 @@ namespace Alepha::Cavorite ::detail:: string_algorithms
void void
wordwrapCallback( const std::ios_base::event event, std::ios_base &ios, const int idx ) noexcept wordwrapCallback( const std::ios_base::event event, std::ios_base &ios, const int idx ) noexcept
{ {
std::cerr << "ios callback called on: " << &ios << std::endl; if( C::debugIOStreamLifecycle ) error() << "ios callback called on: " << &ios << std::endl;
if( wrapperIndex != idx ) throw std::logic_error{ "Wrong index." }; if( wrapperIndex != idx ) throw std::logic_error{ "Wrong index." };
if( not ios.pword( wrapperIndex ) ) return; if( not ios.pword( wrapperIndex ) ) return;
@ -142,7 +143,7 @@ namespace Alepha::Cavorite ::detail:: string_algorithms
{ {
state= 1; state= 1;
os.register_callback( wordwrapCallback, wrapperIndex ); os.register_callback( wordwrapCallback, wrapperIndex );
std::cerr << "Adding callback to " << (void *) static_cast< std::ios * >( &os ) << std::endl; if( C::debugIOStreamLifecycle ) error() << "Adding callback to " << (void *) static_cast< std::ios * >( &os ) << std::endl;
} }
assert( os.pword( wrapperIndex ) == nullptr ); assert( os.pword( wrapperIndex ) == nullptr );