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

Merge pull request #1329 from ethereum/lll-lit-changes

Browse Source 
LLL: improvements (and fixes) to the lit keyword
This commit is contained in:
Alex Beregszaszi 2016-11-26 15:22:14 +00:00 committed by GitHub
commit 4a67a2862c
1 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
liblll/CodeFragment.cpp
View File

@ -278,42 +278,43 @@ void CodeFragment::constructOperation(sp::utree const& _t, CompilerState& _s)
bytes data; bytes data;
for (auto const& i: _t) for (auto const& i: _t)
{ {
if (ii == 1) if (ii == 0)
{
ii++;
continue;
}
else if (ii == 1)
{ {
pos = CodeFragment(i, _s); pos = CodeFragment(i, _s);
if (pos.m_asm.deposit() != 1) if (pos.m_asm.deposit() != 1)
error<InvalidDeposit>(); error<InvalidDeposit>();
} }
else if (ii == 2 && !i.tag() && i.which() == sp::utree_type::string_type) else if (i.tag() != 0)
{
error<InvalidLiteral>();
}
else if (i.which() == sp::utree_type::string_type)
{ {
auto sr = i.get<sp::basic_string<boost::iterator_range<char const*>, sp::utree_type::string_type>>(); auto sr = i.get<sp::basic_string<boost::iterator_range<char const*>, sp::utree_type::string_type>>();
data = bytes((byte const*)sr.begin(), (byte const*)sr.end()); data.insert(data.end(), (byte const *)sr.begin(), (byte const*)sr.end());
} }
else if (ii >= 2 && !i.tag() && i.which() == sp::utree_type::any_type) else if (i.which() == sp::utree_type::any_type)
{ {
bigint bi = *i.get<bigint*>(); bigint bi = *i.get<bigint*>();
if (bi < 0) if (bi < 0)
error<IntegerOutOfRange>(); error<IntegerOutOfRange>();
else if (bi > bigint(u256(0) - 1))
{
if (ii == 2 && _t.size() == 3)
{
// One big int - allow it as hex.
data.resize(bytesRequired(bi));
toBigEndian(bi, data);
}
else else
error<IntegerOutOfRange>(); {
bytes tmp = toCompactBigEndian(bi);
data.insert(data.end(), tmp.begin(), tmp.end());
}
} }
else else
{ {
data.resize(data.size() + 32);
*(h256*)(&data.back() - 31) = (u256)bi;
}
}
else if (ii)
error<InvalidLiteral>(); error<InvalidLiteral>();
++ii; }
ii++;
} }
m_asm.append((u256)data.size()); m_asm.append((u256)data.size());
m_asm.append(Instruction::DUP1); m_asm.append(Instruction::DUP1);