cerc-io/solidity
10
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix problem with release version string.

Browse Source
This commit is contained in:
chriseth 2016-09-08 17:56:28 +02:00
parent c1b39b8538
commit 6a55405160
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libsolidity/interface/Version.cpp
View File

@ -58,12 +58,14 @@ bytes dev::solidity::binaryVersion()
solAssert(i < VersionString.size() && VersionString[i] == '.', ""); solAssert(i < VersionString.size() && VersionString[i] == '.', "");
++i; ++i;
ret.push_back(byte(parseDecimal())); ret.push_back(byte(parseDecimal()));
solAssert(i < VersionString.size() && VersionString[i] == '-', ""); solAssert(i < VersionString.size() && (VersionString[i] == '-' || VersionString[i] == '+'), "");
++i; ++i;
size_t commitpos = VersionString.find("commit.");
solAssert(commitpos != string::npos, "");
i = commitpos + 7;
solAssert(i + 7 < VersionString.size(), ""); solAssert(i + 7 < VersionString.size(), "");
bytes commitHash = fromHex(VersionString.substr(i, 8)); bytes commitHash = fromHex(VersionString.substr(i, 8));
if (commitHash.empty()) solAssert(!commitHash.empty(), "");
commitHash = bytes(4, 0);
ret += commitHash; ret += commitHash;
solAssert(ret.size() == 1 + 3 + 4, ""); solAssert(ret.size() == 1 + 3 + 4, "");

2
test/libsolidity/SolidityEndToEndTest.cpp
View File

@ -5961,7 +5961,7 @@ BOOST_AUTO_TEST_CASE(version_stamp_for_libraries)
bytes runtimeCode = compileAndRun(sourceCode, 0, "lib"); bytes runtimeCode = compileAndRun(sourceCode, 0, "lib");
BOOST_CHECK(runtimeCode.size() >= 8); BOOST_CHECK(runtimeCode.size() >= 8);
BOOST_CHECK_EQUAL(runtimeCode[0], int(Instruction::PUSH6)); // might change once we switch to 1.x.x BOOST_CHECK_EQUAL(runtimeCode[0], int(Instruction::PUSH6)); // might change once we switch to 1.x.x
BOOST_CHECK_EQUAL(runtimeCode[1], 3); // might change once we switch away from x.3.x BOOST_CHECK_EQUAL(runtimeCode[1], 4); // might change once we switch away from x.4.x
BOOST_CHECK_EQUAL(runtimeCode[7], int(Instruction::POP)); BOOST_CHECK_EQUAL(runtimeCode[7], int(Instruction::POP));
} }