diff options
| -rw-r--r-- | Assembly.cpp | 1 | ||||
| -rw-r--r-- | Assembly.h | 1 | ||||
| -rw-r--r-- | Parser.cpp | 5 |
3 files changed, 4 insertions, 3 deletions
diff --git a/Assembly.cpp b/Assembly.cpp index 7016b286..f4d700f9 100644 --- a/Assembly.cpp +++ b/Assembly.cpp @@ -22,7 +22,6 @@ #include "Assembly.h" #include <libethential/Log.h> -#include <libethcore/CommonEth.h> using namespace std; using namespace eth; @@ -25,7 +25,6 @@ #include <sstream> #include <libethential/Common.h> #include <libevmface/Instruction.h> -#include <libethcore/SHA3.h> #include "Exceptions.h" namespace eth @@ -24,7 +24,6 @@ #include <boost/spirit/include/qi.hpp> #include <boost/spirit/include/phoenix.hpp> #include <boost/spirit/include/support_utree.hpp> -#include <libethcore/CommonEth.h> using namespace std; using namespace eth; @@ -73,6 +72,10 @@ void eth::parseTreeLLL(string const& _s, sp::utree& o_out) typedef sp::basic_string<std::string, sp::utree_type::symbol_type> symbol_type; typedef string::const_iterator it; + static const u256 ether = u256(1000000000) * 1000000000; + static const u256 finney = u256(1000000000) * 1000000; + static const u256 szabo = u256(1000000000) * 1000; + qi::rule<it, qi::ascii::space_type, sp::utree()> element; qi::rule<it, string()> str = '"' > qi::lexeme[+(~qi::char_(std::string("\"") + '\0'))] > '"'; qi::rule<it, string()> strsh = '\'' > qi::lexeme[+(~qi::char_(std::string(" ;@()[]{}:") + '\0'))]; |