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

16
ASTree.cpp
View File

@@ -486,7 +486,7 @@ PycRef<ASTNode> BuildFromCode(PycRef<PycCode> code, PycModule* mod)
{
PycRef<ASTNode> name;
if (mod->majorVer() == 1 && mod->minorVer() < 3)
if (mod->verCompare(1, 3) < 0)
name = new ASTName(code->getName(operand));
else
name = new ASTName(code->getVarName(operand));
@@ -701,7 +701,7 @@ PycRef<ASTNode> BuildFromCode(PycRef<PycCode> code, PycModule* mod)
} else {
PycRef<ASTNode> fromlist = stack.top();
stack.pop();
if (mod->majorVer() > 2 || mod->minorVer() >= 5)
if (mod->verCompare(2, 5) >= 0)
stack.pop(); // Level -- we don't care
stack.push(new ASTImport(new ASTName(code->getName(operand)), fromlist));
}
@@ -1202,7 +1202,7 @@ PycRef<ASTNode> BuildFromCode(PycRef<PycCode> code, PycModule* mod)
stack.push(new ASTName(code->getCellVar(operand).cast<PycString>()));
break;
case Pyc::LOAD_FAST_A:
if (mod->majorVer() == 1 && mod->minorVer() < 3)
if (mod->verCompare(1, 3) < 0)
stack.push(new ASTName(code->getName(operand)));
else
stack.push(new ASTName(code->getVarName(operand)));
@@ -1384,8 +1384,7 @@ PycRef<ASTNode> BuildFromCode(PycRef<PycCode> code, PycModule* mod)
if ((curblock->blktype() == ASTBlock::BLK_IF
|| curblock->blktype() == ASTBlock::BLK_ELSE)
&& stack_hist.size()
&& ((mod->majorVer() == 2 && mod->minorVer() >= 6)
|| mod->majorVer() > 2)) {
&& (mod->verCompare(2, 6) >= 0)) {
stack = stack_hist.top();
stack_hist.pop();
@@ -1407,8 +1406,7 @@ PycRef<ASTNode> BuildFromCode(PycRef<PycCode> code, PycModule* mod)
if ((curblock->blktype() == ASTBlock::BLK_IF
|| curblock->blktype() == ASTBlock::BLK_ELSE)
&& stack_hist.size()
&& ((mod->majorVer() == 2 && mod->minorVer() >= 6)
|| mod->majorVer() > 2)) {
&& (mod->verCompare(2, 6) >= 0)) {
stack = stack_hist.top();
stack_hist.pop();
@@ -1618,7 +1616,7 @@ PycRef<ASTNode> BuildFromCode(PycRef<PycCode> code, PycModule* mod)
if (unpack) {
PycRef<ASTNode> name;
if (mod->majorVer() == 1 && mod->minorVer() < 3)
if (mod->verCompare(1, 3) < 0)
name = new ASTName(code->getName(operand));
else
name = new ASTName(code->getVarName(operand));
@@ -1648,7 +1646,7 @@ PycRef<ASTNode> BuildFromCode(PycRef<PycCode> code, PycModule* mod)
stack.pop();
PycRef<ASTNode> name;
if (mod->majorVer() == 1 && mod->minorVer() < 3)
if (mod->verCompare(1, 3) < 0)
name = new ASTName(code->getName(operand));
else
name = new ASTName(code->getVarName(operand));

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>();
}
}