Skip to content
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.

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

Several editorial fixes in [re.regex]. #3230

Merged
merged 1 commit into from Oct 6, 2019

Conversation

mordante
Copy link
Contributor

Fixes the consistency of several arguments in operator= and assign
and the constructor:
basic_regex from unnamed, that, e -> e
basic_string from p -> s
const charT* from ptr, p -> p
flag_type from unnamed -> f
initializer_list from unnamed -> il

These changes are in both [re.regex] and [re.regex.assign].

Moves the [re.regex.assign] LaTex reference in [re.regex] before the
operator= overloads to match the [re.regex.assign] section.

There is one more inconsistency [re.regex] declares:
basic_regex& assign(const charT* p, size_t len, flag_type f);

[re.regex.assign] declares:
basic_regex& assign(const charT* p, size_t len,
flag_type f = regex_constants::ECMAScript);

Since this is not an editorial issue I'll file an LWG issue.

source/regex.tex Outdated Show resolved Hide resolved
@mordante
Copy link
Contributor Author

I updated the two constructors. Not sure whether you also wanted the assignment operator. If so let me know and I send another update.

@jensmaurer jensmaurer added the needs rebase The pull request needs a git rebase to resolve merge conflicts. label Sep 30, 2019
@jensmaurer
Copy link
Member

Please rebase and fix the conflicts, then force-push.

Fixes the consistency of several arguments in operator= and assign
and the constructor:
basic_regex from unnamed, that, e -> e
basic_string from p -> s
const charT* from ptr, p -> p
flag_type from unnamed -> f
initializer_list<charT> from unnamed -> il

These changes are in both [re.regex] and [re.regex.assign].

Moves the [re.regex.assign] LaTex reference in [re.regex] before the
operator= overloads to match the [re.regex.assign] section.

There is one more inconsistency [re.regex] declares:
basic_regex& assign(const charT* p, size_t len, flag_type f);

[re.regex.assign] declares:
basic_regex& assign(const charT* p, size_t len,
  flag_type f = regex_constants::ECMAScript);

Since this is not an editorial issue I'll file an LWG issue.
@mordante
Copy link
Contributor Author

mordante commented Oct 1, 2019

Rebased as requested

@jensmaurer jensmaurer removed the needs rebase The pull request needs a git rebase to resolve merge conflicts. label Oct 1, 2019
@zygoloid zygoloid merged commit 2195065 into cplusplus:master Oct 6, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants