aboutsummaryrefslogtreecommitdiffstats
path: root/liblll/Compiler.cpp
diff options
context:
space:
mode:
authorchriseth <chris@ethereum.org>2016-11-01 18:59:05 +0800
committerGitHub <noreply@github.com>2016-11-01 18:59:05 +0800
commit1a2c150e3b2f98ef44834aca281692734b74c0db (patch)
tree4cfc7d03d285133fe373b6f9df0b68a7412a9260 /liblll/Compiler.cpp
parent9cb1d30eab34e530f3c8bf67367c04787048bace (diff)
parentac3c8a553a0b943984742f6b12d9d0a3cabcb877 (diff)
downloaddexon-solidity-1a2c150e3b2f98ef44834aca281692734b74c0db.tar
dexon-solidity-1a2c150e3b2f98ef44834aca281692734b74c0db.tar.gz
dexon-solidity-1a2c150e3b2f98ef44834aca281692734b74c0db.tar.bz2
dexon-solidity-1a2c150e3b2f98ef44834aca281692734b74c0db.tar.lz
dexon-solidity-1a2c150e3b2f98ef44834aca281692734b74c0db.tar.xz
dexon-solidity-1a2c150e3b2f98ef44834aca281692734b74c0db.tar.zst
dexon-solidity-1a2c150e3b2f98ef44834aca281692734b74c0db.zip
Merge pull request #1298 from ethereum/lll-error-reporting
LLL: further improve error reporting
Diffstat (limited to 'liblll/Compiler.cpp')
-rw-r--r--liblll/Compiler.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/liblll/Compiler.cpp b/liblll/Compiler.cpp
index 68499106..4008022f 100644
--- a/liblll/Compiler.cpp
+++ b/liblll/Compiler.cpp
@@ -34,8 +34,7 @@ bytes dev::eth::compileLLL(string const& _src, bool _opt, vector<string>* _error
{
CompilerState cs;
cs.populateStandard();
- auto f = CodeFragment::compile(_src, cs);
- bytes ret = f.assembly(cs).optimise(_opt).assemble().bytecode;
+ bytes ret = CodeFragment::compile(_src, cs).assembly(cs).optimise(_opt).assemble().bytecode;
for (auto i: cs.treesToKill)
killBigints(i);
return ret;
@@ -59,7 +58,7 @@ bytes dev::eth::compileLLL(string const& _src, bool _opt, vector<string>* _error
catch (...)
{
if (_errors)
- _errors->push_back("Internal parse exception.");
+ _errors->push_back("Internal compiler exception.");
}
return bytes();
}
@@ -93,7 +92,7 @@ std::string dev::eth::compileLLLToAsm(std::string const& _src, bool _opt, std::v
catch (...)
{
if (_errors)
- _errors->push_back("Internal parse exception.");
+ _errors->push_back("Internal compiler exception.");
}
return string();
}