Skip to content

Use size_t for sizes and indices instead of ptrdiff_t #27

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

Closed
mizdebsk wants to merge 2 commits into from
Closed

Use size_t for sizes and indices instead of ptrdiff_t #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
501f4c5
Use size_t for sizes and indices instead of ptrdiff_t
mizdebsk Jul 22, 2025
18eab32
Adjust tests for ptrdiff_t to size_t change
mizdebsk Jul 22, 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
68 changes: 34 additions & 34 deletions src/java_symbols.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,9 +143,9 @@ namespace java_symbols
* @return The position of the first non-whitespace non-comment character or the
* length of the string if none is found.
*/
inline std::ptrdiff_t ignore_whitespace_comments(std::string_view content, std::ptrdiff_t position) noexcept
inline std::size_t ignore_whitespace_comments(std::string_view content, std::size_t position) noexcept
{
while (position != std::ssize(content))
while (position != std::size(content))
{
if (std::isspace(static_cast<unsigned char>(content[position])))
{
Expand All @@ -159,9 +159,9 @@ inline std::ptrdiff_t ignore_whitespace_comments(std::string_view content, std::
{
position = content.find('\n', position + 2);

if (position == std::ptrdiff_t(content.npos))
if (position == std::size_t(content.npos))
{
return std::ssize(content);
return std::size(content);
}

++position;
Expand All @@ -170,9 +170,9 @@ inline std::ptrdiff_t ignore_whitespace_comments(std::string_view content, std::
{
position = content.find("*/", position + 2);

if (position == std::ptrdiff_t(content.npos))
if (position == std::size_t(content.npos))
{
return std::ssize(content);
return std::size(content);
}

position += 2;
Expand All @@ -198,21 +198,21 @@ inline bool is_identifier_char(char c) noexcept
* sequence of alphanumeric characters or a single non-aphanumeric character or
* an empty string if the end has been reached.
*/
inline std::tuple<std::string_view, std::ptrdiff_t> next_symbol(std::string_view content, std::ptrdiff_t position = 0) noexcept
inline std::tuple<std::string_view, std::size_t> next_symbol(std::string_view content, std::size_t position = 0) noexcept
{
auto symbol_length = std::ptrdiff_t(0);
auto symbol_length = std::size_t(0);

if (position < std::ssize(content))
if (position < std::size(content))
{
position = ignore_whitespace_comments(content, position);

if (position < std::ssize(content))
if (position < std::size(content))
{
symbol_length = 1;

if (is_identifier_char(content[position]))
{
while (position + symbol_length != std::ssize(content) and is_identifier_char(content[position + symbol_length]))
while (position + symbol_length != std::size(content) and is_identifier_char(content[position + symbol_length]))
{
++symbol_length;
}
Expand All @@ -237,14 +237,14 @@ inline std::tuple<std::string_view, std::ptrdiff_t> next_symbol(std::string_view
* @return The starting index of the token or the length of @p content if not
* found.
*/
inline std::ptrdiff_t find_token(std::string_view content, std::string_view token,
std::ptrdiff_t position = 0, bool alphanumeric = false, std::ptrdiff_t stack = 0) noexcept
inline std::size_t find_token(std::string_view content, std::string_view token,
std::size_t position = 0, bool alphanumeric = false, std::size_t stack = 0) noexcept
{
while (position + std::ssize(token) <= std::ssize(content))
while (position + std::size(token) <= std::size(content))
{
position = ignore_whitespace_comments(content, position);

if (position == std::ssize(content))
if (position == std::size(content))
{
break;
}
Expand All @@ -253,7 +253,7 @@ inline std::ptrdiff_t find_token(std::string_view content, std::string_view toke

if ((token != ")" or stack == 0) and substr == token
and not (alphanumeric and ((position > 0 and is_identifier_char(content[position - 1]))
or (position + std::ssize(token) < std::ssize(content) and (is_identifier_char(content[position + token.length()]))))))
or (position + std::size(token) < std::size(content) and (is_identifier_char(content[position + token.length()]))))))
{
return position;
}
Expand All @@ -269,14 +269,14 @@ inline std::ptrdiff_t find_token(std::string_view content, std::string_view toke
{
++position;
}
while (position < std::ssize(content) and content[position] != '\'');
while (position < std::size(content) and content[position] != '\'');
}
}
else if (content[position] == '"')
{
++position;

while (position < std::ssize(content) and content[position] != '"')
while (position < std::size(content) and content[position] != '"')
{
if (content.substr(position, 2) == "\\\\")
{
Expand Down Expand Up @@ -304,7 +304,7 @@ inline std::ptrdiff_t find_token(std::string_view content, std::string_view toke
++position;
}

return std::ssize(content);
return std::size(content);
}

/*!
Expand All @@ -316,14 +316,14 @@ inline std::ptrdiff_t find_token(std::string_view content, std::string_view toke
* stripped. If no annotation is found, returns a view pointing past the
* @p content with length 0 and an empty string.
*/
inline std::tuple<std::string_view, std::string> next_annotation(std::string_view content, std::ptrdiff_t position = 0)
inline std::tuple<std::string_view, std::string> next_annotation(std::string_view content, std::size_t position = 0)
{
auto result = std::string();
auto end_pos = std::ssize(content);
auto end_pos = std::size(content);
position = find_token(content, "@", position);
bool expecting_dot = false;

if (position < std::ssize(content))
if (position < std::size(content))
{
auto symbol = std::string_view();
std::tie(symbol, end_pos) = next_symbol(content, position + 1);
Expand All @@ -343,7 +343,7 @@ inline std::tuple<std::string_view, std::string> next_annotation(std::string_vie
{
end_pos = find_token(content, ")", new_end_pos);

if (end_pos == std::ssize(content))
if (end_pos == std::size(content))
{
result = std::string();
position = end_pos;
Expand Down Expand Up @@ -439,14 +439,14 @@ inline std::tuple<std::string, String_map> remove_imports(
auto result = std::tuple<std::string, String_map>();
auto& [new_content, removed_classes] = result;
new_content.reserve(content.size());
auto position = std::ptrdiff_t(0);
auto position = std::size_t(0);

while (position < std::ssize(content))
while (position < std::size(content))
{
auto next_position = find_token(content, "import", position, true);
auto copy_end = std::ssize(content);
auto copy_end = std::size(content);

if (next_position < std::ssize(content))
if (next_position < std::size(content))
{
auto import_name = std::string();
auto [symbol, end_pos] = next_symbol(content, next_position + 6);
Expand Down Expand Up @@ -481,7 +481,7 @@ inline std::tuple<std::string, String_map> remove_imports(
{
auto skip_space = end_pos;

while (skip_space != std::ssize(content) and std::isspace(static_cast<unsigned char>(content[skip_space])))
while (skip_space != std::size(content) and std::isspace(static_cast<unsigned char>(content[skip_space])))
{
++skip_space;

Expand Down Expand Up @@ -544,15 +544,15 @@ inline std::tuple<std::string, String_map> remove_imports(
inline std::string remove_annotations(std::string_view content, std::span<const Named_regex> patterns,
const String_view_set& names, const String_map& imported_names)
{
auto position = std::ptrdiff_t(0);
auto position = std::size_t(0);
auto result = std::string();
result.reserve(content.size());

while (position < std::ssize(content))
while (position < std::size(content))
{
auto [annotation, annotation_name] = next_annotation(content, position);
auto next_position = std::ssize(content);
auto copy_end = std::ssize(content);
auto next_position = std::size(content);
auto copy_end = std::size(content);

if (annotation.begin() != content.end())
{
Expand All @@ -565,12 +565,12 @@ inline std::string remove_annotations(std::string_view content, std::span<const

auto skip_space = next_position;

while (skip_space != std::ssize(content) and std::isspace(static_cast<unsigned char>(content[skip_space])))
while (skip_space != std::size(content) and std::isspace(static_cast<unsigned char>(content[skip_space])))
{
++skip_space;
}

if (skip_space != std::ssize(content))
if (skip_space != std::size(content))
{
next_position = skip_space;
}
Expand Down
98 changes: 49 additions & 49 deletions src/jurand_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,15 @@ int main()

using next_annotation_t = std::tuple<std::string_view, std::string>;

assert_eq(0, ignore_whitespace_comments("a", 0));
assert_eq(1, ignore_whitespace_comments("ab", 1));
assert_eq(0, ignore_whitespace_comments("/", 0));
assert_eq(0, ignore_whitespace_comments("*", 0));
assert_eq(2, ignore_whitespace_comments("//", 0));
assert_eq(4, ignore_whitespace_comments("/**/", 0));
assert_eq(7, ignore_whitespace_comments("/* a */", 0));
assert_eq(5, ignore_whitespace_comments("/**/ a", 0));
assert_eq(4, ignore_whitespace_comments("//a\n", 0));
assert_eq(0u, ignore_whitespace_comments("a", 0));
assert_eq(1u, ignore_whitespace_comments("ab", 1));
assert_eq(0u, ignore_whitespace_comments("/", 0));
assert_eq(0u, ignore_whitespace_comments("*", 0));
assert_eq(2u, ignore_whitespace_comments("//", 0));
assert_eq(4u, ignore_whitespace_comments("/**/", 0));
assert_eq(7u, ignore_whitespace_comments("/* a */", 0));
assert_eq(5u, ignore_whitespace_comments("/**/ a", 0));
assert_eq(4u, ignore_whitespace_comments("//a\n", 0));

assert_eq("", std::get<0>(next_symbol("")));
assert_eq("", std::get<0>(next_symbol(" ")));
Expand All @@ -47,54 +47,54 @@ int main()
assert_eq("foo", std::get<0>(next_symbol("//\n\nfoo")));
assert_eq("foo", std::get<0>(next_symbol("/* */ foo ")));

assert_eq(0, find_token("@", "@"));
assert_eq(1, find_token(" @", "@"));
assert_eq(1, find_token("(@)", "@"));
assert_eq(3, find_token("//\n@", "@"));
assert_eq(6, find_token("/*\n*/\n@", "@"));
assert_eq(0u, find_token("@", "@"));
assert_eq(1u, find_token(" @", "@"));
assert_eq(1u, find_token("(@)", "@"));
assert_eq(3u, find_token("//\n@", "@"));
assert_eq(6u, find_token("/*\n*/\n@", "@"));

assert_eq(3, find_token("' '@", "@"));
assert_eq(4, find_token("'\''@", "@"));
assert_eq(8, find_token("'\\uFFFE'@", "@"));
assert_eq(4, find_token("\"//\"@", "@"));
assert_eq(4, find_token("\"/*\"@", "@"));
assert_eq(3u, find_token("' '@", "@"));
assert_eq(4u, find_token("'\''@", "@"));
assert_eq(8u, find_token("'\\uFFFE'@", "@"));
assert_eq(4u, find_token("\"//\"@", "@"));
assert_eq(4u, find_token("\"/*\"@", "@"));

assert_eq(2, find_token("())", ")"));
assert_eq(1, find_token("()", ")", 1));
assert_eq(4, find_token("(()))", ")"));
assert_eq(3, find_token("'\"'@", "@"));
assert_eq(2u, find_token("())", ")"));
assert_eq(1u, find_token("()", ")", 1));
assert_eq(4u, find_token("(()))", ")"));
assert_eq(3u, find_token("'\"'@", "@"));

assert_eq(4, find_token("// @", "@"));
assert_eq(5, find_token("// @\n", "@"));
assert_eq(4u, find_token("// @", "@"));
assert_eq(5u, find_token("// @\n", "@"));

assert_eq(5, find_token("/*@*/", "@"));
assert_eq(7, find_token("/* @ */", "@"));
assert_eq(7, find_token("/*\n@ */", "@"));
assert_eq(6, find_token("// /*@", "@"));
assert_eq(10, find_token("/**//*@ */", "@"));
assert_eq(7, find_token("/**///@", "@"));
assert_eq(5u, find_token("/*@*/", "@"));
assert_eq(7u, find_token("/* @ */", "@"));
assert_eq(7u, find_token("/*\n@ */", "@"));
assert_eq(6u, find_token("// /*@", "@"));
assert_eq(10u, find_token("/**//*@ */", "@"));
assert_eq(7u, find_token("/**///@", "@"));

assert_eq(3, find_token("'@'", "@"));
assert_eq(8, find_token(R"('\uFFFE')", R"(\u)"));
assert_eq(4, find_token(R"('\'')", R"(\')"));
assert_eq(3, find_token(R"("@")", "@"));
assert_eq(5, find_token(R"("""@")", "@"));
assert_eq(6, find_token(R"("" "@")", "@"));
assert_eq(8, find_token(R"("\\" "@")", "@"));
assert_eq(10, find_token(R"("\\\"" "@")", "@"));
assert_eq(3u, find_token("'@'", "@"));
assert_eq(8u, find_token(R"('\uFFFE')", R"(\u)"));
assert_eq(4u, find_token(R"('\'')", R"(\')"));
assert_eq(3u, find_token(R"("@")", "@"));
assert_eq(5u, find_token(R"("""@")", "@"));
assert_eq(6u, find_token(R"("" "@")", "@"));
assert_eq(8u, find_token(R"("\\" "@")", "@"));
assert_eq(10u, find_token(R"("\\\"" "@")", "@"));

assert_eq(2, find_token("()", ")"));
assert_eq(4, find_token("(())", ")"));
assert_eq(2u, find_token("()", ")"));
assert_eq(4u, find_token("(())", ")"));

assert_eq(8, find_token("noimport", "import", 0, true));
assert_eq(7, find_token("_import", "import", 0, true));
assert_eq(1, find_token("/import", "import", 0, true));
assert_eq(1, find_token("+import", "import", 0, true));
assert_eq(8u, find_token("noimport", "import", 0, true));
assert_eq(7u, find_token("_import", "import", 0, true));
assert_eq(1u, find_token("/import", "import", 0, true));
assert_eq(1u, find_token("+import", "import", 0, true));

assert_eq(9, find_token("importnot", "import", 0, true));
assert_eq(7, find_token("import_", "import", 0, true));
assert_eq(0, find_token("import/", "import", 0, true));
assert_eq(0, find_token("import+", "import", 0, true));
assert_eq(9u, find_token("importnot", "import", 0, true));
assert_eq(7u, find_token("import_", "import", 0, true));
assert_eq(0u, find_token("import/", "import", 0, true));
assert_eq(0u, find_token("import+", "import", 0, true));

assert_that(next_annotation_t("@A", "A") == next_annotation("@A"));
assert_that(next_annotation_t("@A", "A") == next_annotation("@A\n"));
Expand Down