Fixes after rebasing on develop

libsolidity/AST.cpp

@@ -563,7 +563,7 @@ vector<ParamDescription> const FunctionDescription::getParameters() const
 	if (function)
 	{
 		vector<ParamDescription> paramsDescription;
-		for (auto const& param: function->getReturnParameters())
+		for (auto const& param: function->getParameters())
 			paramsDescription.push_back(ParamDescription(param->getName(), param->getType()->toString()));
 
 		return paramsDescription;
@@ -580,7 +580,7 @@ vector<ParamDescription> const FunctionDescription::getReturnParameters() const
 	if (function)
 	{
 		vector<ParamDescription> paramsDescription;
-		for (auto const& param: function->getParameters())
+		for (auto const& param: function->getReturnParameters())
 			paramsDescription.push_back(ParamDescription(param->getName(), param->getType()->toString()));
 
 		return paramsDescription;

libsolidity/AST.h

@@ -182,6 +182,10 @@ struct FunctionDescription
 	FunctionDescription(std::shared_ptr<FunctionType const> _type, Declaration const* _decl):
 		m_description(_type, _decl){}
 
+	/// constructor for a constructor's function definition. Used only inside mix.
+	FunctionDescription(Declaration const* _def):
+	m_description(nullptr, _def){}
+
 	FunctionDescription():
 		m_description(nullptr, nullptr){}
 

libsolidity/ExpressionCompiler.h

@@ -130,8 +130,7 @@ private:
 		/// also removes the reference from the stack (note that is does not reset the type to @a NONE).
 		/// @a _expression is the current expression, used for error reporting.
 		void retrieveValue(Expression const& _expression, bool _remove = false) const;
-		/// Convenience function to retrive Value from Storage. Specific version of
+		/// Convenience function to retrive Value from Storage. Specific version of @ref retrieveValue
-		/// @ref retrieveValue
 		void retrieveValueFromStorage(Expression const& _expression, bool _remove = false) const;
 		/// Stores a value (from the stack directly beneath the reference, which is assumed to
 		/// be on the top of the stack, if any) in the lvalue and removes the reference.

mix/QContractDefinition.cpp

@@ -34,7 +34,10 @@ using namespace dev::mix;
 QContractDefinition::QContractDefinition(dev::solidity::ContractDefinition const* _contract): QBasicNodeDefinition(_contract)
 {
 	if (_contract->getConstructor() != nullptr)
-		m_constructor = new QFunctionDefinition(_contract->getConstructor(), -1);
+	{
+		FunctionDescription desc(_contract->getConstructor());
+		m_constructor = new QFunctionDefinition(desc);
+	}
 	else
 		m_constructor = new QFunctionDefinition();