cerc-io/solidity
16
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 #3007 from ethereum/lll-better-errors

Browse Source 
lll: better error reporting in some cases
This commit is contained in:
Alex Beregszaszi 2017-10-02 12:14:15 +01:00 committed by GitHub
commit 2a8e965bb1
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
liblll/CodeFragment.cpp
View File

@ -103,7 +103,7 @@ CodeFragment::CodeFragment(sp::utree const& _t, CompilerState& _s, bool _allowAS
{ {
bigint i = *_t.get<bigint*>(); bigint i = *_t.get<bigint*>();
if (i < 0 || i > bigint(u256(0) - 1)) if (i < 0 || i > bigint(u256(0) - 1))
error<IntegerOutOfRange>(); error<IntegerOutOfRange>(toString(i));
m_asm.append((u256)i); m_asm.append((u256)i);
break; break;
} }
@ -157,7 +157,7 @@ void CodeFragment::constructOperation(sp::utree const& _t, CompilerState& _s)
{ {
auto i = *++_t.begin(); auto i = *++_t.begin();
if (i.tag()) if (i.tag())
error<InvalidName>(); error<InvalidName>(toString(i));
if (i.which() == sp::utree_type::string_type) 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>>();
@ -244,7 +244,7 @@ void CodeFragment::constructOperation(sp::utree const& _t, CompilerState& _s)
if (ii == 1) if (ii == 1)
{ {
if (i.tag()) if (i.tag())
error<InvalidName>(); error<InvalidName>(toString(i));
if (i.which() == sp::utree_type::string_type) 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>>();
@ -303,11 +303,11 @@ void CodeFragment::constructOperation(sp::utree const& _t, CompilerState& _s)
{ {
pos = CodeFragment(i, _s); pos = CodeFragment(i, _s);
if (pos.m_asm.deposit() != 1) if (pos.m_asm.deposit() != 1)
error<InvalidDeposit>(us); error<InvalidDeposit>(toString(i));
} }
else if (i.tag() != 0) else if (i.tag() != 0)
{ {
error<InvalidLiteral>(); error<InvalidLiteral>(toString(i));
} }
else if (i.which() == sp::utree_type::string_type) else if (i.which() == sp::utree_type::string_type)
{ {
@ -318,7 +318,7 @@ void CodeFragment::constructOperation(sp::utree const& _t, CompilerState& _s)
{ {
bigint bi = *i.get<bigint*>(); bigint bi = *i.get<bigint*>();
if (bi < 0) if (bi < 0)
error<IntegerOutOfRange>(); error<IntegerOutOfRange>(toString(i));
else else
{ {
bytes tmp = toCompactBigEndian(bi); bytes tmp = toCompactBigEndian(bi);
@ -327,7 +327,7 @@ void CodeFragment::constructOperation(sp::utree const& _t, CompilerState& _s)
} }
else else
{ {
error<InvalidLiteral>(); error<InvalidLiteral>(toString(i));
} }
ii++; ii++;