Skip to content

Addition format() testing #98

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MungoG wants to merge 4 commits into
base: develop
Choose a base branch
from
+106 −26
Open

Addition format() testing #98

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0170dac
Addition format() testing
MungoG Nov 20, 2025
c5e2465
Merge branch 'develop' into issue-89-additional-format-testing
MungoG Dec 1, 2025
8342b86
use fmtlib and std::format style escaping/errors and add tests
MungoG Dec 1, 2025
4998132
use exception helpers
MungoG Dec 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
87 changes: 70 additions & 17 deletions include/boost/beast2/format.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@
#define BOOST_BEAST2_FORMAT_HPP

#include <boost/beast2/detail/config.hpp>
#include <boost/beast2/detail/except.hpp>
#include <boost/core/detail/string_view.hpp>

#include <memory>
#include <ostream>
#include <streambuf>
Expand Down Expand Up @@ -46,21 +48,59 @@ struct format_impl
next()
{
has_placeholder = false;
bool unmatched_open = false;
bool unmatched_close = false;
while (p != end)
{
if (*p++ != '{')
continue;
if (p == end)
break;
if (*p++ == '}')
if(unmatched_open)
{
if(*p == '{')
{
p++;
core::string_view seg(p0, (p - 1) - p0);
p0 = p;
return seg;
}
if(*p == '}')
{
p++;
core::string_view seg(p0, (p - 2) - p0);
p0 = p;
has_placeholder = true;
return seg;
}
detail::throw_invalid_argument(
"invalid format string, unmatched {");
}
if(unmatched_close)
{
if(*p == '}')
{
p++;
core::string_view seg(p0, (p - 1) - p0);
p0 = p;
return seg;
}
detail::throw_invalid_argument(
"invalid format string, unmatched }");
}
if (*p == '{')
{
unmatched_open = true;
}
if(*p == '}')
{
core::string_view seg(
p0, (p - 2) - p0);
p0 = p;
has_placeholder = true;
return seg;
unmatched_close = true;
}
p++;
}
if (unmatched_open)
detail::throw_invalid_argument(
"invalid format string, unmatched {");
if(unmatched_close)
detail::throw_invalid_argument(
"invalid format string, unmatched }");

core::string_view seg(
p0, end - p0);
p0 = end;
Expand All @@ -71,10 +111,14 @@ struct format_impl
void do_arg(Arg const& arg)
{
core::string_view seg = next();
if (seg.size())
os.write(seg.data(), static_cast<
std::streamsize>(seg.size()));
if (has_placeholder)
while(seg.size())
{
os.write(seg.data(), static_cast<std::streamsize>(seg.size()));
if(has_placeholder)
break;
seg = next();
}
if(has_placeholder)
os << arg;
};

Expand All @@ -83,9 +127,18 @@ struct format_impl
{
using expander = int[];
(void)expander{0, (do_arg(args), 0)...};
if (p0 < end)
os.write(p0, static_cast<
std::streamsize>(end - p0));

core::string_view seg;
do
{
seg = next();
if(has_placeholder)
detail::throw_invalid_argument(
"too few format arguments provided");
if(seg.size())
os.write(seg.data(), static_cast<std::streamsize>(seg.size()));
}
while(seg.size());
}
};

Expand Down
45 changes: 36 additions & 9 deletions test/unit/format.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,22 +28,49 @@ struct format_test
BOOST_TEST_EQ(s, match);
}

template<class... Args>
void e(
core::string_view match,
core::string_view fs,
Args const&... args)
{
BOOST_TEST_THROWS(f(match, fs, args...), std::invalid_argument);
}

void run()
{
// Bad format strings, string arg.
e("{}", "{}");
e("{", "{");
e("}", "}");
e("}{", "}{");
e("{", "{", "x");
e("}", "}", "x");
e("}{", "}{", "x");
e("{", "{", "x");
e("}", "}", "x");
e("}{", "}{", "x");
e("1{}2{}3","1{}2{}3");
e("1a2{}3", "1{}2{}3", "a");

// Good format strings, string arg.
f("x", "x");
f("{}", "{}");
f("{", "{");
f("}", "}");
f("}{", "}{");
f("{", "{{");
f("}", "}}");
f("}{", "}}{{");
f("x", "x");
f("x", "{}", "x");
f("{", "{", "x");
f("}", "}", "x");
f("}{", "}{", "x");
f("1{}2{}3","1{}2{}3");
f("1a2{}3", "1{}2{}3", "a");
f("x", "{}", "x");
f("{", "{{", "x");
f("}", "}}", "x");
f("}{", "}}{{", "x");
f("1a2b3", "1{}2{}3", "a", "b");
f("1a2b3", "1{}2{}3", "a", "b", "c");
f("hello world!", "hello {}!", "world");
f("hello world! {} ", "hello {}! {{}} ", "world");

// Good format string, char arg
f("x", "{}", 'x');
}
};

Expand Down
Loading