Skip to content

Updates for missing features in regular expressions. #1337

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

Merged
hsutter merged 16 commits into from
Jan 31, 2025
Merged

Updates for missing features in regular expressions. #1337

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
47c440b
Added handling of \G.
MaxSagebaum Nov 12, 2024
c6ae1dd
Added find_all method to regular expressions.
MaxSagebaum Nov 12, 2024
53e3724
Implementation of reverse token generation.
MaxSagebaum Nov 12, 2024
db7d5a7
Implementation of lookbehind parsing.
MaxSagebaum Nov 12, 2024
b536b8e
Hack for reverse matching.
MaxSagebaum Nov 12, 2024
baae569
Removed Iter from wrapper and added it to the generated functions.
MaxSagebaum Nov 12, 2024
ae63e61
Removed `wrap` helper.
MaxSagebaum Nov 12, 2024
17fe0d3
Implementation of advanced regexes.
MaxSagebaum Nov 12, 2024
411a07e
Added implementation for nested lookaround.
MaxSagebaum Nov 12, 2024
e00d794
Update for regex status.
MaxSagebaum Nov 12, 2024
b14879c
Added atomic grouping token.
MaxSagebaum Nov 12, 2024
dcb562b
Code cleanup.
MaxSagebaum Nov 12, 2024
33c8615
Update of Regression tests.
MaxSagebaum Nov 12, 2024
db3d34e
Header update for new version.
MaxSagebaum Nov 12, 2024
c6a79be
Updates for clang.
MaxSagebaum Nov 12, 2024
f0e82f4
Update for tests.
MaxSagebaum Nov 12, 2024
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
Prev Previous commit
Next Next commit
Removed Iter from wrapper and added it to the generated functions.
  • Loading branch information
@MaxSagebaum
MaxSagebaum committed Nov 12, 2024
commit baae569840d8cd8772837698331c07310d949e51
8 changes: 4 additions & 4 deletions include/cpp2regex.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,10 +97,10 @@ template<typename CharT, typename matcher_wrapper> class regular_expression;
#define CPP2_CPP2REGEX_H

template<typename matcher_wrapper, typename Iter, typename CharT>
using matcher_wrapper_type = typename matcher_wrapper::template wrap<Iter, CharT>;
using matcher_wrapper_type = typename matcher_wrapper::template wrap<CharT>;

template<typename matcher>
using matcher_context_type = typename matcher::context;
template<typename matcher, typename Iter>
using matcher_context_type = typename matcher::template context<Iter>;

#line 22 "cpp2regex.h2"
namespace cpp2 {
Expand Down Expand Up @@ -654,7 +654,7 @@ template<typename CharT, bool negate> [[nodiscard]] auto word_boundary_token_mat
template<typename CharT, typename matcher_wrapper> class regular_expression
{
public: template<typename Iter> using matcher = matcher_wrapper_type<matcher_wrapper,Iter,CharT>;// TODO: Remove when nested types are allowed: https://github.com/hsutter/cppfront/issues/727
public: template<typename Iter> using context = matcher_context_type<matcher<Iter>>;// TODO: Remove when nested types are allowed: https://github.com/hsutter/cppfront/issues/727
public: template<typename Iter> using context = matcher_context_type<matcher<Iter>,Iter>;// TODO: Remove when nested types are allowed: https://github.com/hsutter/cppfront/issues/727

public: template<typename Iter> class search_return
{
Expand Down
8 changes: 4 additions & 4 deletions include/cpp2regex.h2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
#define CPP2_CPP2REGEX_H

template<typename matcher_wrapper, typename Iter, typename CharT>
using matcher_wrapper_type = typename matcher_wrapper::template wrap<Iter, CharT>;
using matcher_wrapper_type = typename matcher_wrapper::template wrap<CharT>;

template<typename matcher>
using matcher_context_type = typename matcher::context;
template<typename matcher, typename Iter>
using matcher_context_type = typename matcher::template context<Iter>;

cpp2: namespace = {

Expand Down Expand Up @@ -771,7 +771,7 @@ word_boundary_token_matcher: <CharT, negate: bool> (inout cur, inout ctx) -> boo
regular_expression: <CharT, matcher_wrapper> type =
{
matcher: <Iter> type == matcher_wrapper_type<matcher_wrapper, Iter, CharT>; // TODO: Remove when nested types are allowed: https://github.com/hsutter/cppfront/issues/727
context: <Iter> type == matcher_context_type<matcher<Iter>>; // TODO: Remove when nested types are allowed: https://github.com/hsutter/cppfront/issues/727
context: <Iter> type == matcher_context_type<matcher<Iter>, Iter>; // TODO: Remove when nested types are allowed: https://github.com/hsutter/cppfront/issues/727

search_return: <Iter> type =
{
Expand Down
8 changes: 4 additions & 4 deletions source/reflect.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4167,7 +4167,7 @@ generation_function_context::generation_function_context(){}
auto cur {new_context()};

(*cpp2::impl::assert_not_null(cur)).code += "" + cpp2::to_string((*cpp2::impl::assert_not_null(cur)).tabs) + cpp2::to_string(name) + ": @struct<noforward> type = {\n";
(*cpp2::impl::assert_not_null(cur)).code += "" + cpp2::to_string((*cpp2::impl::assert_not_null(cur)).tabs) + " operator(): <Iter2> (this, cur: Iter2, inout ctx, other) -> cpp2::regex::match_return<Iter2> = {\n";
(*cpp2::impl::assert_not_null(cur)).code += "" + cpp2::to_string((*cpp2::impl::assert_not_null(cur)).tabs) + " operator(): <Iter> (this, cur: Iter, inout ctx, other) -> cpp2::regex::match_return<Iter> = {\n";
(*cpp2::impl::assert_not_null(cur)).code += "" + cpp2::to_string((*cpp2::impl::assert_not_null(cur)).tabs) + " r := ctx..pass(cur);\n";
(*cpp2::impl::assert_not_null(cur)).code += "" + cpp2::to_string((*cpp2::impl::assert_not_null(cur)).tabs) + " do {\n";
(*cpp2::impl::assert_not_null(cpp2::move(cur))).add_tabs(3);
Expand Down Expand Up @@ -5523,12 +5523,12 @@ size_t i{0};
}

source += "{\n";
source += " wrap: <Iter, CharT> type = {\n"; // TODO: Remove wrapper when template template parameters are available.
source += " context: type == cpp2::regex::match_context<CharT, Iter, " + cpp2::to_string(parse_ctx.get_cur_group()) + ">;";
source += " wrap: <CharT> type = {\n"; // TODO: Remove wrapper when template template parameters are available.
source += " context: <Iter> type == cpp2::regex::match_context<CharT, Iter, " + cpp2::to_string(parse_ctx.get_cur_group()) + ">;";

generation_context gen_ctx {};
source += gen_ctx.run(parse_ctx.get_as_token());
source += " entry: (cur: Iter, inout ctx: context) -> cpp2::regex::match_return<Iter> = {\n";
source += " entry: <Iter> (cur: Iter, inout ctx: context<Iter>) -> cpp2::regex::match_return<Iter> = {\n";
source += " ctx..set_group_start(0, cur);\n";
source += " r := " + cpp2::to_string(gen_ctx.get_entry_func()) + "(cur, ctx, cpp2::regex::true_end_func());\n";
source += " if r.matched { ctx..set_group_end(0, r.pos); }\n";
Expand Down
8 changes: 4 additions & 4 deletions source/reflect.h2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2364,7 +2364,7 @@ generation_context: type =
cur := new_context();

cur*.code += "(cur*.tabs)$(name)$: @struct<noforward> type = {\n";
cur*.code += "(cur*.tabs)$ operator(): <Iter2> (this, cur: Iter2, inout ctx, other) -> cpp2::regex::match_return<Iter2> = {\n";
cur*.code += "(cur*.tabs)$ operator(): <Iter> (this, cur: Iter, inout ctx, other) -> cpp2::regex::match_return<Iter> = {\n";
cur*.code += "(cur*.tabs)$ r := ctx..pass(cur);\n";
cur*.code += "(cur*.tabs)$ do {\n";
cur*..add_tabs(3);
Expand Down Expand Up @@ -3782,12 +3782,12 @@ regex_generator: <Error_out> type =
}

source += "{\n";
source += " wrap: <Iter, CharT> type = {\n"; // TODO: Remove wrapper when template template parameters are available.
source += " context: type == cpp2::regex::match_context<CharT, Iter, (parse_ctx..get_cur_group())$>;";
source += " wrap: <CharT> type = {\n"; // TODO: Remove wrapper when template template parameters are available.
source += " context: <Iter> type == cpp2::regex::match_context<CharT, Iter, (parse_ctx..get_cur_group())$>;";

gen_ctx: generation_context = ();
source += gen_ctx..run(parse_ctx..get_as_token());
source += " entry: (cur: Iter, inout ctx: context) -> cpp2::regex::match_return<Iter> = {\n";
source += " entry: <Iter> (cur: Iter, inout ctx: context<Iter>) -> cpp2::regex::match_return<Iter> = {\n";
source += " ctx..set_group_start(0, cur);\n";
source += " r := (gen_ctx..get_entry_func())$(cur, ctx, cpp2::regex::true_end_func());\n";
source += " if r.matched { ctx..set_group_end(0, r.pos); }\n";
Expand Down