Modifications to Mix to adapt to FunctionDescription

libsolidity/AST.cpp

@@ -607,6 +607,16 @@ Declaration const* FunctionDescription::getDeclaration() const
 	return m_description.second;
 }
 
+VariableDeclaration const* FunctionDescription::getVariableDeclaration() const
+{
+	return dynamic_cast<VariableDeclaration const*>(m_description.second);
+}
+
+FunctionDefinition const* FunctionDescription::getFunctionDefinition() const
+{
+	return dynamic_cast<FunctionDefinition const*>(m_description.second);
+}
+
 shared_ptr<FunctionType const> FunctionDescription::getFunctionTypeShared() const
 {
 	return m_description.first;

libsolidity/AST.h

@@ -200,8 +200,12 @@ struct FunctionDescription
 	std::vector<ParamDescription> const getParameters() const;
 	/// @returns the return parameters of the function
 	std::vector<ParamDescription> const getReturnParameters() const;
-	/// @returns the Declaration AST Node pointer
+	/// @returns a generic Declaration AST Node pointer which can be either a FunctionDefinition or a VariableDeclaration
 	Declaration const* getDeclaration() const;
+	/// @returns the VariableDeclaration AST Node pointer or nullptr if it's not a VariableDeclaration
+	VariableDeclaration const* getVariableDeclaration() const;
+	/// @returns the FunctionDefinition AST Node pointer or nullptr if it's not a FunctionDefinition
+	FunctionDefinition const* getFunctionDefinition() const;
 	/// @returns a created shared pointer with the type of the function
 	std::shared_ptr<FunctionType> makeFunctionType() const;
 	/// @returns a pointer to the function type

mix/QBasicNodeDefinition.h

@@ -38,6 +38,7 @@ public:
 	QBasicNodeDefinition(): QObject() {}
 	~QBasicNodeDefinition() {}
 	QBasicNodeDefinition(solidity::Declaration const* _d): QObject(), m_name(QString::fromStdString(_d->getName())) {}
+	QBasicNodeDefinition(std::string const& _name): QObject(), m_name(QString::fromStdString(_name)) {}
 	/// Get the name of the node.
 	QString name() const { return m_name; }
 

mix/QContractDefinition.cpp

@@ -38,9 +38,6 @@ QContractDefinition::QContractDefinition(dev::solidity::ContractDefinition const
 	else
 		m_constructor = new QFunctionDefinition();
 
-	auto interfaceFunctions = _contract->getInterfaceFunctions();
-	unsigned i = 0;
-	for (auto it = interfaceFunctions.cbegin(); it != interfaceFunctions.cend(); ++it, ++i)
-		m_functions.append(new QFunctionDefinition(it->second, i));
-}
+	for (auto const& it: _contract->getInterfaceFunctions())
+		m_functions.append(new QFunctionDefinition(it.second));}
 

mix/QFunctionDefinition.cpp

@@ -21,19 +21,36 @@
 
 #include <libsolidity/AST.h>
 #include <libdevcrypto/SHA3.h>
+#include <libdevcore/Exceptions.h>
 #include "QVariableDeclaration.h"
 #include "QFunctionDefinition.h"
 
 using namespace dev::solidity;
 using namespace dev::mix;
 
-QFunctionDefinition::QFunctionDefinition(dev::solidity::FunctionDefinition const* _f, int _index): QBasicNodeDefinition(_f), m_index(_index), m_hash(dev::sha3(_f->getCanonicalSignature()))
+QFunctionDefinition::QFunctionDefinition(dev::solidity::FunctionDescription const& _f): QBasicNodeDefinition(_f.getDeclaration()), m_hash(dev::sha3(_f.getSignature()))
 {
-	std::vector<std::shared_ptr<VariableDeclaration>> parameters = _f->getParameterList().getParameters();
-	for (unsigned i = 0; i < parameters.size(); i++)
-		m_parameters.append(new QVariableDeclaration(parameters.at(i).get()));
+	FunctionDefinition const* funcDef;
+	VariableDeclaration const* varDecl;
+	if ((funcDef = _f.getFunctionDefinition()))
+	{
+		std::vector<std::shared_ptr<VariableDeclaration>> parameters = funcDef->getParameterList().getParameters();
+		for (unsigned i = 0; i < parameters.size(); i++)
+			m_parameters.append(new QVariableDeclaration(parameters.at(i).get()));
 
-	std::vector<std::shared_ptr<VariableDeclaration>> returnParameters = _f->getReturnParameters();
-	for (unsigned i = 0; i < returnParameters.size(); i++)
-		m_returnParameters.append(new QVariableDeclaration(returnParameters.at(i).get()));
+		std::vector<std::shared_ptr<VariableDeclaration>> returnParameters = funcDef->getReturnParameters();
+		for (unsigned i = 0; i < returnParameters.size(); i++)
+			m_returnParameters.append(new QVariableDeclaration(returnParameters.at(i).get()));
+	}
+	else
+	{
+		if (!(varDecl = _f.getVariableDeclaration()))
+			BOOST_THROW_EXCEPTION(Exception() << errinfo_comment("Malformed FunctionDescription. Should never happen."));
+
+		// only the return parameter for now.
+		// TODO: change this for other state variables like mapping and maybe abstract this inside solidity and not here
+		auto returnParams = _f.getReturnParameters();
+		m_returnParameters.append(new QVariableDeclaration(returnParams[0]));
+
+	}
 }

mix/QFunctionDefinition.h

@@ -36,19 +36,16 @@ class QFunctionDefinition: public QBasicNodeDefinition
 {
 	Q_OBJECT
 	Q_PROPERTY(QQmlListProperty<dev::mix::QVariableDeclaration> parameters READ parameters)
-	Q_PROPERTY(int index READ index)
 
 public:
 	QFunctionDefinition() {}
-	QFunctionDefinition(solidity::FunctionDefinition const* _f, int _index);
+	QFunctionDefinition(solidity::FunctionDescription const& _f);
 	/// Get all input parameters of this function.
 	QList<QVariableDeclaration*> const& parametersList() const { return m_parameters; }
 	/// Get all input parameters of this function as QML property.
 	QQmlListProperty<QVariableDeclaration> parameters() const { return QQmlListProperty<QVariableDeclaration>(const_cast<QFunctionDefinition*>(this), const_cast<QFunctionDefinition*>(this)->m_parameters); }
 	/// Get all return parameters of this function.
 	QList<QVariableDeclaration*> returnParameters() const { return m_returnParameters; }
-	/// Get the index of this function on the contract ABI.
-	int index() const { return m_index; }
 	/// Get the hash of this function declaration on the contract ABI.
 	FixedHash<4> hash() const { return m_hash; }
 

mix/QVariableDeclaration.h

@@ -37,6 +37,7 @@ class QVariableDeclaration: public QBasicNodeDefinition
 public:
 	QVariableDeclaration() {}
 	QVariableDeclaration(solidity::VariableDeclaration const* _v): QBasicNodeDefinition(_v), m_type(QString::fromStdString(_v->getType()->toString())) {}
+	QVariableDeclaration(solidity::ParamDescription const& _v): QBasicNodeDefinition(_v.getName()), m_type(QString::fromStdString(_v.getType())) {}
 	QString type() const { return m_type; }
 private:
 	QString m_type;