Skip to content

Return all named groups when iterating #26

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
anuraaga wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Return all named groups when iterating #26

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions src/cre2.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,27 +216,27 @@ cre2_program_size (const cre2_regexp_t *re)
struct cre2_named_groups_iter_t
{
const RE2 * re;
std::map<std::string, int>::const_iterator it;
std::map<int, std::string>::const_iterator it;
};

cre2_named_groups_iter_t *
cre2_named_groups_iter_new(const cre2_regexp_t *re)
{
cre2_named_groups_iter_t * iter = new (std::nothrow)cre2_named_groups_iter_t;
iter->re = TO_CONST_RE2(re);
iter->it = iter->re->NamedCapturingGroups().begin();
iter->it = iter->re->CapturingGroupNames().begin();
return iter;
}
bool
cre2_named_groups_iter_next(cre2_named_groups_iter_t* iter, const char ** name, int *index)
{
if (iter->it == iter->re->NamedCapturingGroups().end()) {
if (iter->it == iter->re->CapturingGroupNames().end()) {
*name = NULL;
*index = -1;
return false;
} else {
*index = iter->it->second;
*name = iter->it->first.c_str();
*index = iter->it->first;
*name = iter->it->second.c_str();
++iter->it;
return true;
}
Expand Down