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

Tests updated.

Browse Source 
Fixes to executive logging.
Trie testing made considerably more rigourous.
This commit is contained in:
Gav Wood 2014-05-28 16:28:41 +02:00
parent d48033009a
commit f781485d28
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
main.cpp
View File

@ -25,6 +25,7 @@
#include <liblll/Compiler.h> #include <liblll/Compiler.h>
#include <libethsupport/CommonIO.h> #include <libethsupport/CommonIO.h>
#include <libethsupport/CommonData.h> #include <libethsupport/CommonData.h>
#include <libethcore/Instruction.h>
#include "BuildInfo.h" #include "BuildInfo.h"
using namespace std; using namespace std;
using namespace eth; using namespace eth;
@ -51,7 +52,7 @@ void version()
exit(0); exit(0);
} }
enum Mode { Binary, Hex, Assembly, ParseTree }; enum Mode { Binary, Hex, Assembly, ParseTree, Disassemble };
int main(int argc, char** argv) int main(int argc, char** argv)
{ {
@ -74,6 +75,8 @@ int main(int argc, char** argv)
mode = ParseTree; mode = ParseTree;
else if ((arg == "-o" || arg == "--optimise") && argc > i + 1) else if ((arg == "-o" || arg == "--optimise") && argc > i + 1)
optimise = atoi(argv[++i]); optimise = atoi(argv[++i]);
else if (arg == "-d" || arg == "--disassemble")
mode = Disassemble;
else if (arg == "-V" || arg == "--version") else if (arg == "-V" || arg == "--version")
version(); version();
else else
@ -96,6 +99,10 @@ int main(int argc, char** argv)
vector<string> errors; vector<string> errors;
if (src.empty()) if (src.empty())
cerr << "Empty file." << endl; cerr << "Empty file." << endl;
else if (mode == Disassemble)
{
cout << disassemble(fromHex(src)) << endl;
}
else if (mode == Binary || mode == Hex) else if (mode == Binary || mode == Hex)
{ {
auto bs = compileLLL(src, optimise ? true : false, &errors); auto bs = compileLLL(src, optimise ? true : false, &errors);