diff options
author | Lefteris Karapetsas <lefteris@refu.co> | 2015-02-21 23:25:28 +0800 |
---|---|---|
committer | Lefteris Karapetsas <lefteris@refu.co> | 2015-02-21 23:31:25 +0800 |
commit | 3367bf4b954ce4ac4c85286c1a0816e0143f016b (patch) | |
tree | ac3b686b019cb0c3f8055e81ebf46b4fc329db46 /CompilerStack.cpp | |
parent | 7b709c7c8ad1553feabd294f83e3b7ce2281114a (diff) | |
download | dexon-solidity-3367bf4b954ce4ac4c85286c1a0816e0143f016b.tar dexon-solidity-3367bf4b954ce4ac4c85286c1a0816e0143f016b.tar.gz dexon-solidity-3367bf4b954ce4ac4c85286c1a0816e0143f016b.tar.bz2 dexon-solidity-3367bf4b954ce4ac4c85286c1a0816e0143f016b.tar.lz dexon-solidity-3367bf4b954ce4ac4c85286c1a0816e0143f016b.tar.xz dexon-solidity-3367bf4b954ce4ac4c85286c1a0816e0143f016b.tar.zst dexon-solidity-3367bf4b954ce4ac4c85286c1a0816e0143f016b.zip |
Removing temporary contracts
- They are now added as importable libraries
Diffstat (limited to 'CompilerStack.cpp')
-rw-r--r-- | CompilerStack.cpp | 55 |
1 files changed, 2 insertions, 53 deletions
diff --git a/CompilerStack.cpp b/CompilerStack.cpp index a5cd9198..69dbced0 100644 --- a/CompilerStack.cpp +++ b/CompilerStack.cpp @@ -65,7 +65,7 @@ bool CompilerStack::addSource(string const& _name, string const& _content, bool { bool existed = m_sources.count(_name) != 0; reset(true); - m_sources[_name].scanner = make_shared<Scanner>(CharStream(expanded(_content)), _name); + m_sources[_name].scanner = make_shared<Scanner>(CharStream(_content), _name); m_sources[_name].isLibrary = _isLibrary; return existed; } @@ -73,7 +73,7 @@ bool CompilerStack::addSource(string const& _name, string const& _content, bool void CompilerStack::setSource(string const& _sourceCode) { reset(); - addSource("", expanded(_sourceCode)); + addSource("", _sourceCode); } void CompilerStack::parse() @@ -127,57 +127,6 @@ vector<string> CompilerStack::getContractNames() const return contractNames; } -////// BEGIN: TEMPORARY ONLY -/// -/// NOTE: THIS INVALIDATES SOURCE POINTERS AND CAN CRASH THE COMPILER -/// -/// remove once import works properly and we have genesis contracts - -string CompilerStack::expanded(string const& _sourceCode) -{ - const map<string, string> c_standardSources = map<string, string>{ - { "Config", "contract Config{function lookup(uint256 service)constant returns(address a){}function kill(){}function unregister(uint256 id){}function register(uint256 id,address service){}}" }, - { "Coin", "contract Coin{function isApprovedFor(address _target,address _proxy)constant returns(bool _r){}function isApproved(address _proxy)constant returns(bool _r){}function sendCoinFrom(address _from,uint256 _val,address _to){}function coinBalanceOf(address _a)constant returns(uint256 _r){}function sendCoin(uint256 _val,address _to){}function coinBalance()constant returns(uint256 _r){}function approve(address _a){}}"}, - { "CoinReg", "contract CoinReg{function count()constant returns(uint256 r){}function info(uint256 i)constant returns(address addr,string3 name,uint256 denom){}function register(string3 name,uint256 denom){}function unregister(){}}" }, - { "coin", "#require CoinReg\ncontract coin {function coin(string3 name, uint denom) {CoinReg(Config().lookup(3)).register(name, denom);}}" }, - { "service", "#require Config\ncontract service{function service(uint _n){Config().register(_n, this);}}" }, - { "owned", "contract owned{function owned(){owner = msg.sender;}modifier onlyowner(){if(msg.sender==owner)_}address owner;}" }, - { "mortal", "#require owned\ncontract mortal is owned {function kill() { if (msg.sender == owner) suicide(owner); }}" }, - { "NameReg", "contract NameReg{function register(string32 name){}function addressOf(string32 name)constant returns(address addr){}function unregister(){}function nameOf(address addr)constant returns(string32 name){}}" }, - { "named", "#require Config NameReg\ncontract named {function named(string32 name) {NameReg(Config().lookup(1)).register(name);}}" }, - { "std", "#require owned mortal Config NameReg named" }, - }; - - string sub; - set<string> got; - function<string(string const&)> localExpanded; - localExpanded = [&](string const& s) -> string - { - string ret = s; - for (size_t p = 0; p != string::npos;) - if ((p = ret.find("#require ")) != string::npos) - { - string n = ret.substr(p + 9, ret.find_first_of('\n', p + 9) - p - 9); - ret.replace(p, n.size() + 9, ""); - vector<string> rs; - boost::split(rs, n, boost::is_any_of(" \t,"), boost::token_compress_on); - for (auto const& r: rs) - if (!got.count(r)) - { - if (c_standardSources.count(r)) - sub.append("\n" + localExpanded(c_standardSources.at(r)) + "\n"); - got.insert(r); - } - } - // TODO: remove once we have genesis contracts. - else if ((p = ret.find("Config()")) != string::npos) - ret.replace(p, 8, "Config(0xc6d9d2cd449a754c494264e1809c50e34d64562b)"); - return ret; - }; - return sub + localExpanded(_sourceCode); -} - -////// END: TEMPORARY ONLY void CompilerStack::compile(bool _optimize) { |