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

Make version comparisons human readable

Browse Source
This commit is contained in:
Michael Hansen
2012-05-26 14:03:10 -07:00
parent 50657fb984
commit 237a0788aa
2 changed files with 22 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
pyc_code.cpp
View File

@@ -4,74 +4,50 @@
void PycCode::load(PycData* stream, PycModule* mod)
{
if ((mod->majorVer() == 1 && mod->minorVer() >= 3) ||
(mod->majorVer() == 2 && mod->minorVer() < 3)) {
if (mod->verCompare(1, 3) >= 0 && mod->verCompare(2, 3) < 0)
m_argCount = stream->get16();
} else if ((mod->majorVer() == 2 && mod->minorVer() >= 3) ||
(mod->majorVer() >= 3)) {
else if (mod->verCompare(2, 3) >= 0)
m_argCount = stream->get32();
}
if (mod->majorVer() >= 3) {
if (mod->majorVer() >= 3)
m_kwOnlyArgCount = stream->get32();
}
if ((mod->majorVer() == 1 && mod->minorVer() >= 3) ||
(mod->majorVer() == 2 && mod->minorVer() < 3)) {
if (mod->verCompare(1, 3) >= 0 && mod->verCompare(2, 3) < 0)
m_numLocals = stream->get16();
} else if ((mod->majorVer() == 2 && mod->minorVer() >= 3) ||
(mod->majorVer() >= 3)) {
else if (mod->verCompare(2, 3) >= 0)
m_numLocals = stream->get32();
}
if ((mod->majorVer() == 1 && mod->minorVer() >= 5) ||
(mod->majorVer() == 2 && mod->minorVer() < 3)) {
if (mod->verCompare(1, 5) >= 0 && mod->verCompare(2, 3) < 0)
m_stackSize = stream->get16();
} else if ((mod->majorVer() == 2 && mod->minorVer() >= 3) ||
(mod->majorVer() >= 3)) {
else if (mod->verCompare(2, 3) >= 0)
m_stackSize = stream->get32();
}
if ((mod->majorVer() == 1 && mod->minorVer() >= 3) ||
(mod->majorVer() == 2 && mod->minorVer() < 3)) {
if (mod->verCompare(1, 3) >= 0 && mod->verCompare(2, 3) < 0)
m_flags = stream->get16();
} else if ((mod->majorVer() == 2 && mod->minorVer() >= 3) ||
(mod->majorVer() >= 3)) {
else if (mod->verCompare(2, 3) >= 0)
m_flags = stream->get32();
}
m_code = LoadObject(stream, mod).cast<PycString>();
m_consts = LoadObject(stream, mod).cast<PycTuple>();
m_names = LoadObject(stream, mod).cast<PycTuple>();
if ((mod->majorVer() == 1 && mod->minorVer() >= 3) ||
(mod->majorVer() >= 2)) {
if (mod->verCompare(1, 3) >= 0)
m_varNames = LoadObject(stream, mod).cast<PycTuple>();
}
if ((mod->majorVer() == 2 && mod->minorVer() >= 1) ||
(mod->majorVer() >= 3)) {
if (mod->verCompare(2, 1) >= 0)
m_freeVars = LoadObject(stream, mod).cast<PycTuple>();
}
if ((mod->majorVer() == 2 && mod->minorVer() >= 1) ||
(mod->majorVer() >= 3)) {
if (mod->verCompare(2, 1) >= 0)
m_cellVars = LoadObject(stream, mod).cast<PycTuple>();
}
m_fileName = LoadObject(stream, mod).cast<PycString>();
m_name = LoadObject(stream, mod).cast<PycString>();
if ((mod->majorVer() == 1 && mod->minorVer() >= 5) ||
(mod->majorVer() == 2 && mod->minorVer() < 3)) {
if (mod->verCompare(1, 5) >= 0 && mod->verCompare(2, 3) < 0)
m_firstLine = stream->get16();
} else if ((mod->majorVer() == 2 && mod->minorVer() >= 3) ||
(mod->majorVer() >= 3)) {
else if (mod->verCompare(2, 3) >= 0)
m_firstLine = stream->get32();
}
if ((mod->majorVer() == 1 && mod->minorVer() >= 5) ||
(mod->majorVer() >= 2)) {
if (mod->verCompare(1, 5) >= 0)
m_lnTable = LoadObject(stream, mod).cast<PycString>();
}
}