Lil-Ran/pycdc_fork
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Activity

Issue-165 Added support for f-strings (literal string interpolation https://www.python.org/dev/peps/pep-0498/)

Browse Source 
Opcodes handled: FORMAT_VALUE, BUILD_STRING.
Added AST node classes for FormattedValue and JoinedStr.
This commit is contained in:
Aralox
2020-10-17 20:52:57 +11:00
parent 9407b29451
commit 0c9fbd9caf
11 changed files with 257 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
bytecode.cpp
View File

@@ -147,7 +147,7 @@ bool Pyc::IsCompareArg(int opcode)
return (opcode == Pyc::COMPARE_OP_A);
}
void print_const(PycRef<PycObject> obj, PycModule* mod)
void print_const(PycRef<PycObject> obj, PycModule* mod, const char* parent_f_string_quote)
{
if (obj == NULL) {
fputs("<NULL>", pyc_output);
@@ -156,10 +156,10 @@ void print_const(PycRef<PycObject> obj, PycModule* mod)
switch (obj->type()) {
case PycObject::TYPE_STRING:
OutputString(obj.cast<PycString>(), mod->strIsUnicode() ? 'b' : 0);
OutputString(obj.cast<PycString>(), mod->strIsUnicode() ? 'b' : 0, false, pyc_output, parent_f_string_quote);
break;
case PycObject::TYPE_UNICODE:
OutputString(obj.cast<PycString>(), mod->strIsUnicode() ? 0 : 'u');
OutputString(obj.cast<PycString>(), mod->strIsUnicode() ? 0 : 'u', false, pyc_output, parent_f_string_quote);
break;
case PycObject::TYPE_STRINGREF:
case PycObject::TYPE_INTERNED:
@@ -168,9 +168,9 @@ void print_const(PycRef<PycObject> obj, PycModule* mod)
case PycObject::TYPE_SHORT_ASCII:
case PycObject::TYPE_SHORT_ASCII_INTERNED:
if (mod->majorVer() >= 3)
OutputString(obj.cast<PycString>(), 0);
OutputString(obj.cast<PycString>(), 0, false, pyc_output, parent_f_string_quote);
else
OutputString(obj.cast<PycString>(), mod->strIsUnicode() ? 'b' : 0);
OutputString(obj.cast<PycString>(), mod->strIsUnicode() ? 'b' : 0, false, pyc_output, parent_f_string_quote);
break;
case PycObject::TYPE_TUPLE:
case PycObject::TYPE_SMALL_TUPLE: