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

Make cast() checked by default and add try_cast() for cases where a cast

Browse Source 
is not required to be successful.
This commit is contained in:
Michael Hansen
2022-12-01 16:13:31 -08:00
parent 305494c4b2
commit ffeabc3d3f
6 changed files with 36 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
pyc_code.cpp
View File

@@ -40,27 +40,27 @@ void PycCode::load(PycData* stream, PycModule* mod)
else
m_flags = 0;
m_code = LoadObject(stream, mod).require_cast<PycString>();
m_consts = LoadObject(stream, mod).require_cast<PycSequence>();
m_names = LoadObject(stream, mod).require_cast<PycSequence>();
m_code = LoadObject(stream, mod).cast<PycString>();
m_consts = LoadObject(stream, mod).cast<PycSequence>();
m_names = LoadObject(stream, mod).cast<PycSequence>();
if (mod->verCompare(1, 3) >= 0)
m_varNames = LoadObject(stream, mod).require_cast<PycSequence>();
m_varNames = LoadObject(stream, mod).cast<PycSequence>();
else
m_varNames = new PycTuple;
if (mod->verCompare(2, 1) >= 0)
m_freeVars = LoadObject(stream, mod).require_cast<PycSequence>();
m_freeVars = LoadObject(stream, mod).cast<PycSequence>();
else
m_freeVars = new PycTuple;
if (mod->verCompare(2, 1) >= 0)
m_cellVars = LoadObject(stream, mod).require_cast<PycSequence>();
m_cellVars = LoadObject(stream, mod).cast<PycSequence>();
else
m_cellVars = new PycTuple;
m_fileName = LoadObject(stream, mod).require_cast<PycString>();
m_name = LoadObject(stream, mod).require_cast<PycString>();
m_fileName = LoadObject(stream, mod).cast<PycString>();
m_name = LoadObject(stream, mod).cast<PycString>();
if (mod->verCompare(1, 5) >= 0 && mod->verCompare(2, 3) < 0)
m_firstLine = stream->get16();
@@ -68,7 +68,7 @@ void PycCode::load(PycData* stream, PycModule* mod)
m_firstLine = stream->get32();
if (mod->verCompare(1, 5) >= 0)
m_lnTable = LoadObject(stream, mod).require_cast<PycString>();
m_lnTable = LoadObject(stream, mod).cast<PycString>();
else
m_lnTable = new PycString;
}