TonBERRY/micropython
3
0
Fork 0
Code Pull Requests Activity

py/lexer: Support concatenation of adjacent f-strings.

Browse Source 
This is quite a simple and small change to support concatenation of
adjacent f-strings, and improve compatibility with CPython.

Signed-off-by: Damien George <damien@micropython.org>
This commit is contained in:
Damien George
2024-06-06 11:14:28 +10:00
parent d7aa2fe9d7
commit a066f2308f
3 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
py/lexer.c
View File

@@ -336,8 +336,12 @@ static void parse_string_literal(mp_lexer_t *lex, bool is_raw, bool is_fstring)
// assume there's going to be interpolation, so prep the injection data
// fstring_args_idx==0 && len(fstring_args)>0 means we're extracting the args.
// only when fstring_args_idx>0 will we consume the arg data
// note: lex->fstring_args will be empty already (it's reset when finished)
vstr_add_str(&lex->fstring_args, ".format(");
// lex->fstring_args is reset when finished, so at this point there are two cases:
// - lex->fstring_args is empty: start of a new f-string
// - lex->fstring_args is non-empty: concatenation of adjacent f-strings
if (vstr_len(&lex->fstring_args) == 0) {
vstr_add_str(&lex->fstring_args, ".format(");
}
}
#endif