diff options
| author | chriseth <chris@ethereum.org> | 2016-12-01 19:41:43 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-01 19:41:43 +0800 |
| commit | 83a0ad73ce9c0435d5f08eaaa2451a00a7c3a1c8 (patch) | |
| tree | 3a46f416161dfdc765e9b06b35da635770b1ab1d /liblll/Parser.cpp | |
| parent | 5d1d81d270430815c15fd09f612f6299ddda68ff (diff) | |
| parent | 4cecedcb49188a49ed70241f36e19ec8cb542a4c (diff) | |
| download | dexon-solidity-83a0ad73ce9c0435d5f08eaaa2451a00a7c3a1c8.tar dexon-solidity-83a0ad73ce9c0435d5f08eaaa2451a00a7c3a1c8.tar.gz dexon-solidity-83a0ad73ce9c0435d5f08eaaa2451a00a7c3a1c8.tar.bz2 dexon-solidity-83a0ad73ce9c0435d5f08eaaa2451a00a7c3a1c8.tar.lz dexon-solidity-83a0ad73ce9c0435d5f08eaaa2451a00a7c3a1c8.tar.xz dexon-solidity-83a0ad73ce9c0435d5f08eaaa2451a00a7c3a1c8.tar.zst dexon-solidity-83a0ad73ce9c0435d5f08eaaa2451a00a7c3a1c8.zip | |
Merge pull request #1313 from ethereum/lll-strict-parser
LLL: stricter parser
Diffstat (limited to 'liblll/Parser.cpp')
| -rw-r--r-- | liblll/Parser.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/liblll/Parser.cpp b/liblll/Parser.cpp index 219d4f54..ad5e1885 100644 --- a/liblll/Parser.cpp +++ b/liblll/Parser.cpp @@ -100,7 +100,7 @@ void dev::eth::parseTreeLLL(string const& _s, sp::utree& o_out) qi::rule<it, string()> str = '"' > qi::lexeme[+(~qi::char_(std::string("\"") + '\0'))] > '"'; qi::rule<it, string()> strsh = '\'' > qi::lexeme[+(~qi::char_(std::string(" ;$@()[]{}:\n\t") + '\0'))]; qi::rule<it, symbol_type()> symbol = qi::lexeme[+(~qi::char_(std::string(" $@[]{}:();\"\x01-\x1f\x7f") + '\0'))]; - qi::rule<it, string()> intstr = qi::lexeme[ qi::no_case["0x"][qi::_val = "0x"] >> *qi::char_("0-9a-fA-F")[qi::_val += qi::_1]] | qi::lexeme[+qi::char_("0-9")[qi::_val += qi::_1]]; + qi::rule<it, string()> intstr = qi::lexeme[ qi::no_case["0x"][qi::_val = "0x"] >> +qi::char_("0-9a-fA-F")[qi::_val += qi::_1]] | qi::lexeme[+qi::char_("0-9")[qi::_val += qi::_1]]; qi::rule<it, sp::utree()> integer = intstr[qi::_val = px::construct<sp::any_ptr>(px::new_<bigint>(qi::_1))]; qi::rule<it, space_type, sp::utree()> atom = integer[qi::_val = qi::_1] | (str | strsh)[qi::_val = qi::_1] | symbol[qi::_val = qi::_1]; qi::rule<it, space_type, sp::utree::list_type()> seq = '{' > *element > '}'; @@ -109,7 +109,7 @@ void dev::eth::parseTreeLLL(string const& _s, sp::utree& o_out) qi::rule<it, space_type, sp::utree::list_type()> mstore = '[' > element > ']' > -qi::lit(":") > element; qi::rule<it, space_type, sp::utree::list_type()> sstore = qi::lit("[[") > element > qi::lit("]]") > -qi::lit(":") > element; qi::rule<it, space_type, sp::utree::list_type()> calldataload = qi::lit("$") > element; - qi::rule<it, space_type, sp::utree::list_type()> list = '(' > *element > ')'; + qi::rule<it, space_type, sp::utree::list_type()> list = '(' > +element > ')'; qi::rule<it, space_type, sp::utree()> extra = sload[tagNode<2>()] | mload[tagNode<1>()] | sstore[tagNode<4>()] | mstore[tagNode<3>()] | seq[tagNode<5>()] | calldataload[tagNode<6>()]; element = atom | list | extra; |