Skip to content

DO NOT MERGE -- Tag strings #103766

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
gvanrossum wants to merge 12 commits into from
Closed

DO NOT MERGE -- Tag strings #103766

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
1b61a5e
Tagged String syntax -- RAISES SYNTAX ERROR
gvanrossum May 1, 2022
a17f336
Some progress -- translate foo'bar' into foo('bar')
gvanrossum May 2, 2022
a9922f4
Correctly unparse TagString node
gvanrossum May 2, 2022
12ced2c
Accept only one string, make it a raw bytes
gvanrossum May 2, 2022
73f3c34
Parse the string as f-string
gvanrossum May 2, 2022
67175b0
Start calling tag(*args)
gvanrossum May 2, 2022
1c36df7
Pass lambdas (not quite thunks, but a step in the right direction)
gvanrossum May 2, 2022
d5a0e64
Lambdafy the expression only, exclusing conversion, spec
gvanrossum May 3, 2022
94c7335
Generate a (func, rawstr, conv, spec) tuple for thunks
gvanrossum May 3, 2022
399eaba
Restore original signature of _PyPegen_FstringParser_Init
gvanrossum May 3, 2022
c78e4a1
Fix unparsing of tagstring
gvanrossum May 4, 2022
1ec2fbe
Insist tag and str are flush together
gvanrossum May 4, 2022
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
Generate a (func, rawstr, conv, spec) tuple for thunks
  • Loading branch information
@gvanrossum
gvanrossum committed May 3, 2022
commit 94c73358c4c4d271ac23ae928dc7c0b3db3394cb
57 changes: 54 additions & 3 deletions Parser/action_helpers.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -891,16 +891,67 @@ _PyPegen_tag_string(Parser *p, expr_ty tag, Token *tok)
if (str == NULL)
return NULL;
if (str->kind == JoinedStr_kind) {
// Transform FormattedValue items into thunks
// Transform FormattedValue items into thunks (for now, tuples)
asdl_expr_seq *values = str->v.JoinedStr.values;
int nvalues = asdl_seq_LEN(values);
expr_ty none = NULL;
for (int i = 0; i < nvalues; i++) {
expr_ty value = asdl_seq_GET(values, i);
if (value->kind == FormattedValue_kind) {
expr_ty lambda = lambdafy(p, value->v.FormattedValue.value);
if (none == NULL) {
none = _PyAST_Constant(Py_None, NULL,
str->lineno, str->col_offset,
str->end_lineno, str->end_col_offset,
p->arena);
if (none == NULL)
return NULL;
}
expr_ty expr = value->v.FormattedValue.value;
expr_ty lambda = lambdafy(p, expr);
if (lambda == NULL)
return NULL;
asdl_seq_SET(values, i, lambda);
constant rawstr = _PyAST_ExprAsUnicode(expr);
if (rawstr == NULL)
return NULL;
expr_ty raw = _PyAST_Constant(rawstr, NULL,
expr->lineno, expr->col_offset,
expr->end_lineno, expr->end_col_offset,
p->arena);
if (raw == NULL)
return NULL;
expr_ty conv = none;
int conversion = value->v.FormattedValue.conversion;
if (conversion >= 0) {
char buf[1];
buf[0] = conversion;
constant uconv = _PyUnicode_FromASCII(buf, 1);
if (uconv == NULL)
return NULL;
conv = _PyAST_Constant(uconv, NULL,
expr->lineno, expr->col_offset,
expr->end_lineno, expr->end_col_offset,
p->arena);
if (conv == NULL)
return NULL;
}
expr_ty spec = value->v.FormattedValue.format_spec;
if (spec == NULL) {
spec = none;
}
asdl_expr_seq *elts = _Py_asdl_expr_seq_new(4, p->arena);
if (elts == NULL)
return NULL;
asdl_seq_SET(elts, 0, lambda);
asdl_seq_SET(elts, 1, raw);
asdl_seq_SET(elts, 2, conv);
asdl_seq_SET(elts, 3, spec);
expr_ty tuple = _PyAST_Tuple(elts, Load,
value->lineno, value->col_offset,
value->end_lineno, value->end_col_offset,
p->arena);
if (tuple == NULL)
return NULL;
asdl_seq_SET(values, i, tuple);
}
}
}
Expand Down