[stdlib] Allow !r conversion flag in String.format
#3279
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Joshua James Venter <[email protected]>
JoeLoser
approved these changes
Jul 23, 2024
There was a problem hiding this comment.
Great work! Thanks for working on this. FYI @bethebunny as you were asking about this.
Signed-off-by: Joe Loser <[email protected]>
|
!sync |
modularbot
added
the
imported-internally
|
✅🟣 This contribution has been merged 🟣✅ Your pull request has been merged to the internal upstream Mojo sources. It will be reflected here in the Mojo repository on the nightly branch during the next Mojo nightly release, typically within the next 24-48 hours. We use Copybara to merge external contributions, click here to learn more. |
modularbot
added
merged-internally
|
Landed in f13ddcf! Thank you for your contribution 🎉 |
modularbot
added a commit
that referenced
this pull request
Jul 24, 2024
…3914) [External] [stdlib] Allow `!r` conversion flag in `String.format` This addresses #3267. - Implemented parsing and handling of `!s` and `!r` conversion flags in format strings. - Updated the `_FormatCurlyEntry` struct to include a `conversion_flag` field. - Modified the `create_entries` method to correctly parse and store conversion flags. - Updated the string formatting logic to apply the appropriate conversion (`str` or `repr`) based on the flag. Additionally, I was conscious of potential future support of `!a` flag and `format_spec` , which is not currently supported. The additions of this PR should be direct to modify for this support. Hence why `supported_conversion_flags` was added, and a TODO was left in the code for the latter. For reference, see [Python's Format String Syntax](https://docs.python.org/3/library/string.html#format-string-syntax): ``` replacement_field ::= "{" [field_name] ["!" conversion] [":" format_spec] "}" field_name ::= arg_name ("." attribute_name | "[" element_index "]")* arg_name ::= [identifier | digit ] attribute_name ::= identifier element_index ::= digit | index_string index_string ::= <any source character except "]"> conversion ::= "r" | "s" | "a" format_spec ::= <see Python docs for details> ``` ORIGINAL_AUTHOR=Joshua James Venter <67124214 [email protected]> PUBLIC_PR_LINK=#3279 Co-authored-by: Joshua James Venter <67124214 [email protected]> Closes #3279 MODULAR_ORIG_COMMIT_REV_ID: 9ee92a55ac683be22f7b93012f37c6980f7110b6
jjvraw
added a commit
to jjvraw/mojo
that referenced
this pull request
Jul 24, 2024
Signed-off-by: Joshua James Venter <[email protected]>
jjvraw
commented
Jul 24, 2024
| in String("{0!r} {3} {1!r}").format(a, b, c, d) | ||
| ) | ||
|
|
||
| assert_equal(String("{0!s} {0!r}").format(a), "Mojo 'Mojo'") |
There was a problem hiding this comment.
Realised this is duplicate before the merge. See #3302
modularbot
pushed a commit
that referenced
this pull request
Jul 25, 2024
[External] [stdlib] Remove duplicate test from PR #3279 Also on line `1468`. Co-authored-by: Joshua James Venter <[email protected]> Closes #3302 MODULAR_ORIG_COMMIT_REV_ID: 88a7c8b72c6688b55a481f7135a783446b2815a3
modularbot
added a commit
that referenced
this pull request
Sep 13, 2024
…3914) [External] [stdlib] Allow `!r` conversion flag in `String.format` This addresses #3267. - Implemented parsing and handling of `!s` and `!r` conversion flags in format strings. - Updated the `_FormatCurlyEntry` struct to include a `conversion_flag` field. - Modified the `create_entries` method to correctly parse and store conversion flags. - Updated the string formatting logic to apply the appropriate conversion (`str` or `repr`) based on the flag. Additionally, I was conscious of potential future support of `!a` flag and `format_spec` , which is not currently supported. The additions of this PR should be direct to modify for this support. Hence why `supported_conversion_flags` was added, and a TODO was left in the code for the latter. For reference, see [Python's Format String Syntax](https://docs.python.org/3/library/string.html#format-string-syntax): ``` replacement_field ::= "{" [field_name] ["!" conversion] [":" format_spec] "}" field_name ::= arg_name ("." attribute_name | "[" element_index "]")* arg_name ::= [identifier | digit ] attribute_name ::= identifier element_index ::= digit | index_string index_string ::= <any source character except "]"> conversion ::= "r" | "s" | "a" format_spec ::= <see Python docs for details> ``` ORIGINAL_AUTHOR=Joshua James Venter <67124214 [email protected]> PUBLIC_PR_LINK=#3279 Co-authored-by: Joshua James Venter <67124214 [email protected]> Closes #3279 MODULAR_ORIG_COMMIT_REV_ID: 9ee92a55ac683be22f7b93012f37c6980f7110b6
modularbot
pushed a commit
that referenced
this pull request
Sep 13, 2024
[External] [stdlib] Remove duplicate test from PR #3279 Also on line `1468`. Co-authored-by: Joshua James Venter <[email protected]> Closes #3302 MODULAR_ORIG_COMMIT_REV_ID: 88a7c8b72c6688b55a481f7135a783446b2815a3
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This addresses Issue #3267.
!sand!rconversion flags in format strings._FormatCurlyEntrystruct to include aconversion_flagfield.create_entriesmethod to correctly parse and store conversion flags.strorrepr) based on the flag.Additionally, I was conscious of potential future support of
!aflag andformat_spec, which is not currently supported. The additions of this PR should be direct to modify for this support. Hence whysupported_conversion_flagswas added, and a TODO was left in the code for the latter.For reference, see Python's Format String Syntax: