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

Merge pull request #119 from chriseth/winfail

Browse Source 
Fix boost error.
This commit is contained in:
Lefteris Karapetsas 2015-10-07 12:56:17 +02:00
commit 5053e153ec
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
libsolidity/InterfaceHandler.cpp
View File

@ -1,8 +1,6 @@
#include <libsolidity/InterfaceHandler.h> #include <libsolidity/InterfaceHandler.h>
#include <boost/range/adaptor/transformed.hpp>
#include <boost/range/irange.hpp> #include <boost/range/irange.hpp>
#include <boost/algorithm/string/join.hpp>
#include <libsolidity/AST.h> #include <libsolidity/AST.h>
#include <libsolidity/CompilerStack.h> #include <libsolidity/CompilerStack.h>
using namespace std; using namespace std;
@ -111,15 +109,16 @@ string InterfaceHandler::abiInterface(ContractDefinition const& _contractDef)
string InterfaceHandler::ABISolidityInterface(ContractDefinition const& _contractDef) string InterfaceHandler::ABISolidityInterface(ContractDefinition const& _contractDef)
{ {
using namespace boost::adaptors;
using namespace boost::algorithm;
string ret = (_contractDef.isLibrary() ? "library " : "contract ") + _contractDef.name() + "{"; string ret = (_contractDef.isLibrary() ? "library " : "contract ") + _contractDef.name() + "{";
auto populateParameters = [](vector<string> const& _paramNames, vector<string> const& _paramTypes) auto populateParameters = [](vector<string> const& _paramNames, vector<string> const& _paramTypes)
{ {
return "(" + join(boost::irange<size_t>(0, _paramNames.size()) | transformed([&](size_t _i) { string ret = "(";
return _paramTypes[_i] + " " + _paramNames[_i]; for (size_t i = 0; i < _paramNames.size(); ++i)
}), ",") + ")"; ret += _paramTypes[i] + " " + _paramNames[i] + ",";
if (ret.size() != 1)
ret.pop_back();
return ret + ")";
}; };
// If this is a library, include all its enum and struct types. Should be more intelligent // If this is a library, include all its enum and struct types. Should be more intelligent
// in the future and check what is actually used (it might even use types from other libraries // in the future and check what is actually used (it might even use types from other libraries
@ -135,10 +134,12 @@ string InterfaceHandler::ABISolidityInterface(ContractDefinition const& _contrac
} }
for (auto const& enu: _contractDef.definedEnums()) for (auto const& enu: _contractDef.definedEnums())
{ {
ret += "enum " + enu->name() + "{" + ret += "enum " + enu->name() + "{";
join(enu->members() | transformed([](ASTPointer<EnumValue> const& _value) { for (ASTPointer<EnumValue> const& val: enu->members())
return _value->name(); ret += val->name() + ",";
}), ",") + "}"; if (ret.back() == ',')
ret.pop_back();
ret += "}";
} }
} }
if (_contractDef.constructor()) if (_contractDef.constructor())