Merge pull request #738 from LefterisJP/sol_abiFunctionHash

Canonical Function signature creation in solidity

4 files changed, 21 insertions, 0 deletions

diff --git a/AST.cpp b/AST.cpp
index c7d617b4..04771106 100644
--- a/AST.cpp
+++ b/AST.cpp
@@ -110,6 +110,11 @@ void FunctionDefinition::checkTypeRequirements()
 	m_body->checkTypeRequirements();
 }
 
+string FunctionDefinition::getCanonicalSignature() const
+{
+	return getName() + FunctionType(*this).getCanonicalSignature();
+}
+
 void Block::checkTypeRequirements()
 {
 	for (shared_ptr<Statement> const& statement: m_statements)
diff --git a/AST.h b/AST.h
index b7c3dc6c..8493d432 100644
--- a/AST.h
+++ b/AST.h
@@ -277,6 +277,11 @@ public:
 	/// Checks that all parameters have allowed types and calls checkTypeRequirements on the body.
 	void checkTypeRequirements();
 
+	/// @returns the canonical signature of the function
+	/// That consists of the name of the function followed by the types of the
+	/// arguments separated by commas all enclosed in parentheses without any spaces.
+	std::string getCanonicalSignature() const;
+
 private:
 	bool m_isPublic;
 	ASTPointer<ParameterList> m_parameters;
diff --git a/Types.cpp b/Types.cpp
index c87ce2e6..7a81b65f 100644
--- a/Types.cpp
+++ b/Types.cpp
@@ -484,6 +484,16 @@ unsigned FunctionType::getSizeOnStack() const
 	}
 }
 
+string FunctionType::getCanonicalSignature() const
+{
+	string ret = "(";
+
+	for (auto it = m_parameterTypes.cbegin(); it != m_parameterTypes.cend(); ++it)
+		ret += (*it)->toString() + (it + 1 == m_parameterTypes.cend() ? "" : ",");
+
+	return ret + ")";
+}
+
 bool MappingType::operator==(Type const& _other) const
 {
 	if (_other.getCategory() != getCategory())
diff --git a/Types.h b/Types.h
index 0afa0ccd..ff8a4887 100644
--- a/Types.h
+++ b/Types.h
@@ -338,6 +338,7 @@ public:
 	virtual unsigned getSizeOnStack() const override;
 
 	Location const& getLocation() const { return m_location; }
+	std::string getCanonicalSignature() const;
 
 private:
 	TypePointers m_parameterTypes;