From 2859834e58e37e7b15a15f7df60feef3e1527c97 Mon Sep 17 00:00:00 2001 From: Balajiganapathi S Date: Sun, 29 Oct 2017 13:38:40 +0530 Subject: Suggest alternatives when identifier not found. --- libsolidity/analysis/DeclarationContainer.cpp | 63 ++++++++++++++++++++++++++- 1 file changed, 62 insertions(+), 1 deletion(-) (limited to 'libsolidity/analysis/DeclarationContainer.cpp') diff --git a/libsolidity/analysis/DeclarationContainer.cpp b/libsolidity/analysis/DeclarationContainer.cpp index b33c8568..d41bc7d3 100644 --- a/libsolidity/analysis/DeclarationContainer.cpp +++ b/libsolidity/analysis/DeclarationContainer.cpp @@ -105,7 +105,7 @@ bool DeclarationContainer::registerDeclaration( return true; } -std::vector DeclarationContainer::resolveName(ASTString const& _name, bool _recursive) const +vector DeclarationContainer::resolveName(ASTString const& _name, bool _recursive) const { solAssert(!_name.empty(), "Attempt to resolve empty name."); auto result = m_declarations.find(_name); @@ -115,3 +115,64 @@ std::vector DeclarationContainer::resolveName(ASTString cons return m_enclosingContainer->resolveName(_name, true); return vector({}); } + +vector DeclarationContainer::similarNames(ASTString const& _name) const +{ + vector similar; + + for (auto const& declaration: m_declarations) + { + string const& declarationName = declaration.first; + if (DeclarationContainer::areSimilarNames(_name, declarationName)) + similar.push_back(declarationName); + } + + if (m_enclosingContainer) + { + vector enclosingSimilar = m_enclosingContainer->similarNames(_name); + similar.insert(similar.end(), enclosingSimilar.begin(), enclosingSimilar.end()); + } + + return similar; +} + +bool DeclarationContainer::areSimilarNames(ASTString const& _name1, ASTString const& _name2) +{ + if (_name1 == _name2) + return true; + + size_t n1 = _name1.size(), n2 = _name2.size(); + vector> dp(n1 + 1, vector(n2 + 1)); + + // In this dp formulation of Damerau–Levenshtein distance we are assuming that the strings are 1-based to make base case storage easier. + // So index accesser to _name1 and _name2 have to be adjusted accordingly + for (size_t i1 = 0; i1 <= n1; ++i1) + { + for (size_t i2 = 0; i2 <= n2; ++i2) + { + if (min(i1, i2) == 0) // base case + dp[i1][i2] = max(i1, i2); + else + { + dp[i1][i2] = min(dp[i1-1][i2] + 1, dp[i1][i2-1] + 1); + // Deletion and insertion + if (_name1[i1-1] == _name2[i2-1]) + // Same chars, can skip + dp[i1][i2] = min(dp[i1][i2], dp[i1-1][i2-1]); + else + // Different chars so try substitution + dp[i1][i2] = min(dp[i1][i2], dp[i1-1][i2-1] + 1); + + if (i1 > 1 && i2 > 1 && _name1[i1-1] == _name2[i2-2] && _name1[i1-2] == _name2[i2-1]) + // Try transposing + dp[i1][i2] = min(dp[i1][i2], dp[i1-2][i2-2] + 1); + } + } + } + + size_t distance = dp[n1][n2]; + + // If distance is not greater than MAXIMUM_DISTANCE, and distance is strictly less than length of both names, + // they can be considered similar this is to avoid irrelevant suggestions + return distance <= MAXIMUM_DISTANCE && distance < n1 && distance < n2; +} -- cgit v1.2.3 From b1417b318f3b3cbfd0bf79a4cabc656825a84e5a Mon Sep 17 00:00:00 2001 From: Balajiganapathi S Date: Fri, 17 Nov 2017 21:41:15 +0530 Subject: Move string distance function to utils and format error message --- libsolidity/analysis/DeclarationContainer.cpp | 44 ++------------------------- 1 file changed, 2 insertions(+), 42 deletions(-) (limited to 'libsolidity/analysis/DeclarationContainer.cpp') diff --git a/libsolidity/analysis/DeclarationContainer.cpp b/libsolidity/analysis/DeclarationContainer.cpp index d41bc7d3..f9a52dc6 100644 --- a/libsolidity/analysis/DeclarationContainer.cpp +++ b/libsolidity/analysis/DeclarationContainer.cpp @@ -23,6 +23,7 @@ #include #include #include +#include using namespace std; using namespace dev; @@ -123,7 +124,7 @@ vector DeclarationContainer::similarNames(ASTString const& _name) con for (auto const& declaration: m_declarations) { string const& declarationName = declaration.first; - if (DeclarationContainer::areSimilarNames(_name, declarationName)) + if (stringWithinDistance(_name, declarationName, MAXIMUM_DISTANCE)) similar.push_back(declarationName); } @@ -135,44 +136,3 @@ vector DeclarationContainer::similarNames(ASTString const& _name) con return similar; } - -bool DeclarationContainer::areSimilarNames(ASTString const& _name1, ASTString const& _name2) -{ - if (_name1 == _name2) - return true; - - size_t n1 = _name1.size(), n2 = _name2.size(); - vector> dp(n1 + 1, vector(n2 + 1)); - - // In this dp formulation of Damerau–Levenshtein distance we are assuming that the strings are 1-based to make base case storage easier. - // So index accesser to _name1 and _name2 have to be adjusted accordingly - for (size_t i1 = 0; i1 <= n1; ++i1) - { - for (size_t i2 = 0; i2 <= n2; ++i2) - { - if (min(i1, i2) == 0) // base case - dp[i1][i2] = max(i1, i2); - else - { - dp[i1][i2] = min(dp[i1-1][i2] + 1, dp[i1][i2-1] + 1); - // Deletion and insertion - if (_name1[i1-1] == _name2[i2-1]) - // Same chars, can skip - dp[i1][i2] = min(dp[i1][i2], dp[i1-1][i2-1]); - else - // Different chars so try substitution - dp[i1][i2] = min(dp[i1][i2], dp[i1-1][i2-1] + 1); - - if (i1 > 1 && i2 > 1 && _name1[i1-1] == _name2[i2-2] && _name1[i1-2] == _name2[i2-1]) - // Try transposing - dp[i1][i2] = min(dp[i1][i2], dp[i1-2][i2-2] + 1); - } - } - } - - size_t distance = dp[n1][n2]; - - // If distance is not greater than MAXIMUM_DISTANCE, and distance is strictly less than length of both names, - // they can be considered similar this is to avoid irrelevant suggestions - return distance <= MAXIMUM_DISTANCE && distance < n1 && distance < n2; -} -- cgit v1.2.3 From 8a491c77ba9680afdf8c33664e905b978152b095 Mon Sep 17 00:00:00 2001 From: Balajiganapathi S Date: Tue, 21 Nov 2017 22:20:35 +0530 Subject: Restructure code for alternative identifier suggestions --- libsolidity/analysis/DeclarationContainer.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'libsolidity/analysis/DeclarationContainer.cpp') diff --git a/libsolidity/analysis/DeclarationContainer.cpp b/libsolidity/analysis/DeclarationContainer.cpp index f9a52dc6..7508ad9e 100644 --- a/libsolidity/analysis/DeclarationContainer.cpp +++ b/libsolidity/analysis/DeclarationContainer.cpp @@ -119,20 +119,19 @@ vector DeclarationContainer::resolveName(ASTString const& _n vector DeclarationContainer::similarNames(ASTString const& _name) const { + static size_t const MAXIMUM_EDIT_DISTANCE = 2; + vector similar; for (auto const& declaration: m_declarations) { string const& declarationName = declaration.first; - if (stringWithinDistance(_name, declarationName, MAXIMUM_DISTANCE)) + if (stringWithinDistance(_name, declarationName, MAXIMUM_EDIT_DISTANCE)) similar.push_back(declarationName); } if (m_enclosingContainer) - { - vector enclosingSimilar = m_enclosingContainer->similarNames(_name); - similar.insert(similar.end(), enclosingSimilar.begin(), enclosingSimilar.end()); - } + similar += m_enclosingContainer->similarNames(_name); return similar; } -- cgit v1.2.3