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

Rename string gen to IOStreams::String.

Browse Source
This commit is contained in:
ADAM David Alan Martin
2023-10-25 20:54:39 -04:00
parent fe305f52c3
commit a62335960e
5 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
IOStreams/OStreamable.test/0.cc
View File

@ -10,7 +10,7 @@ static_assert( __cplusplus > 2020'00 );
#include <Alepha/auto_comparable.h> #include <Alepha/auto_comparable.h>
#include <Alepha/IOStreams/delimiters.h> #include <Alepha/IOStreams/delimiters.h>
#include <Alepha/IOStreams/Stream.h> #include <Alepha/IOStreams/String.h>
namespace namespace
{ {
@ -59,7 +59,7 @@ static auto init= Alepha::Utility::enroll <=[]
{ {
using namespace Alepha::Testing::exports; using namespace Alepha::Testing::exports;
using namespace Alepha::Testing::literals::test_literals; using namespace Alepha::Testing::literals::test_literals;
using namespace Alepha::IOStreams::exports::stream; using namespace Alepha::IOStreams::exports::string;
"Simple OStream (default delimiter)"_test <=TableTest< stringify_default > "Simple OStream (default delimiter)"_test <=TableTest< stringify_default >
::Cases ::Cases
@ -80,9 +80,9 @@ static auto init= Alepha::Utility::enroll <=[]
< <
[]( const Agg agg, const std::string delim ) []( const Agg agg, const std::string delim )
{ {
using Alepha::IOStreams::Stream; using Alepha::IOStreams::String;
using Alepha::IOStreams::setFieldDelimiter; using Alepha::IOStreams::setFieldDelimiter;
return Stream{} << setFieldDelimiter( delim ) << agg << FinishString; return String{} << setFieldDelimiter( delim ) << agg << FinishString;
} }
> >
::Cases ::Cases

14
IOStreams/Stream.h → IOStreams/String.h
View File

@ -8,18 +8,18 @@ static_assert( __cplusplus > 2020'00 );
#include <Alepha/Concepts.h> #include <Alepha/Concepts.h>
namespace Alepha::Hydrogen::IOStreams ::detail:: stream namespace Alepha::Hydrogen::IOStreams ::detail:: string
{ {
inline namespace exports inline namespace exports
{ {
class Stream; class String;
enum { FinishString }; enum { FinishString };
std::string stringify( const Alepha::OStreamable auto &item, Alepha::OStreamable auto && ... params ); std::string stringify( const Alepha::OStreamable auto &item, Alepha::OStreamable auto && ... params );
} }
class exports::Stream class exports::String
{ {
private: private:
// TODO: We need the exception throwing capabilities of the // TODO: We need the exception throwing capabilities of the
@ -29,7 +29,7 @@ namespace Alepha::Hydrogen::IOStreams ::detail:: stream
std::ostringstream oss; std::ostringstream oss;
public: public:
Stream && String &&
operator << ( const Alepha::OStreamable auto &t ) && operator << ( const Alepha::OStreamable auto &t ) &&
{ {
oss << t; oss << t;
@ -51,11 +51,11 @@ namespace Alepha::Hydrogen::IOStreams ::detail:: stream
inline std::string inline std::string
exports::stringify( const Alepha::OStreamable auto &item, Alepha::OStreamable auto && ... params ) exports::stringify( const Alepha::OStreamable auto &item, Alepha::OStreamable auto && ... params )
{ {
return ( Stream{} << ... << params ) << item << FinishString; return ( String{} << ... << params ) << item << FinishString;
} }
} }
namespace Alepha::Hydrogen::IOStreams::inline exports::inline stream namespace Alepha::Hydrogen::IOStreams::inline exports::inline string
{ {
using namespace detail::stream::exports; using namespace detail::string::exports;
} }

2
ProgramOptions.h
View File

@ -92,7 +92,7 @@ static_assert( __cplusplus > 2020'00 );
#include <Alepha/Concepts.h> #include <Alepha/Concepts.h>
#include <Alepha/string_algorithms.h> #include <Alepha/string_algorithms.h>
#include <Alepha/IOStreams/Stream.h> #include <Alepha/IOStreams/String.h>
#include <Alepha/Utility/evaluation_helpers.h> #include <Alepha/Utility/evaluation_helpers.h>

2
Testing/TableTest.h
View File

@ -29,7 +29,7 @@ static_assert( __cplusplus > 2020'00 );
#include <Alepha/function_traits.h> #include <Alepha/function_traits.h>
#include <Alepha/template_for_each.h> #include <Alepha/template_for_each.h>
#include <Alepha/IOStreams/Stream.h> #include <Alepha/IOStreams/String.h>
#include <Alepha/Utility/evaluation_helpers.h> #include <Alepha/Utility/evaluation_helpers.h>

4
tuplize_args.h
View File

@ -16,7 +16,7 @@ static_assert( __cplusplus > 2020'00 );
#include <boost/lexical_cast.hpp> #include <boost/lexical_cast.hpp>
#include <Alepha/IOStreams/Stream.h> #include <Alepha/IOStreams/String.h>
#include "meta.h" #include "meta.h"
#include "error.h" #include "error.h"
@ -50,7 +50,7 @@ namespace Alepha::Hydrogen ::detail:: tuplize_args
explicit explicit
ArityMismatchError( const std::size_t remaining, const std::size_t processed, const std::string &clarification= "" ) ArityMismatchError( const std::size_t remaining, const std::size_t processed, const std::string &clarification= "" )
: remaining_( remaining ), processed_( processed ), clarification( clarification ), : remaining_( remaining ), processed_( processed ), clarification( clarification ),
message( IOStreams::Stream{} << ( clarification.empty() ? "" : ( clarification + ": " ) ) message( IOStreams::String{} << ( clarification.empty() ? "" : ( clarification + ": " ) )
<< "Argument count mismatch. " << "Argument count mismatch. "
<< remaining << " remaining " << remaining << " remaining "
<< processed << " processed" ) {} << processed << " processed" ) {}