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

LLL: simplify the LIT parsing code

Browse Source
This commit is contained in:
Alex Beregszaszi 2016-11-08 17:16:45 +00:00
parent 75b1ae8910
commit eee10f1af2
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
liblll/CodeFragment.cpp
View File

@ -281,18 +281,27 @@ 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.insert(data.end(), (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)
@ -303,9 +312,12 @@ void CodeFragment::constructOperation(sp::utree const& _t, CompilerState& _s)
data.insert(data.end(), tmp.begin(), tmp.end()); data.insert(data.end(), tmp.begin(), tmp.end());
} }
} }
else if (ii) else
{
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);