diff options
| author | chriseth <chris@ethereum.org> | 2018-09-04 00:44:41 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-04 00:44:41 +0800 |
| commit | 2783905babfbe2fd01ff5f7b2a2499bd13754f10 (patch) | |
| tree | 6373b9ee28cc664018ebb8a1de9ebc95b9ad4e7d /libsolidity/analysis | |
| parent | 378f69160884ba23f6876d57a3eb6425bfa1d2cf (diff) | |
| parent | 551e0bf47cd0a1d1cb24a878f2309fd9f3253d00 (diff) | |
| download | dexon-solidity-2783905babfbe2fd01ff5f7b2a2499bd13754f10.tar dexon-solidity-2783905babfbe2fd01ff5f7b2a2499bd13754f10.tar.gz dexon-solidity-2783905babfbe2fd01ff5f7b2a2499bd13754f10.tar.bz2 dexon-solidity-2783905babfbe2fd01ff5f7b2a2499bd13754f10.tar.lz dexon-solidity-2783905babfbe2fd01ff5f7b2a2499bd13754f10.tar.xz dexon-solidity-2783905babfbe2fd01ff5f7b2a2499bd13754f10.tar.zst dexon-solidity-2783905babfbe2fd01ff5f7b2a2499bd13754f10.zip | |
Merge pull request #4837 from chase1745/default-to-unspecified
Rename `Location::Default` to `Location::Unspecified`
Diffstat (limited to 'libsolidity/analysis')
| -rw-r--r-- | libsolidity/analysis/ReferencesResolver.cpp | 8 | ||||
| -rw-r--r-- | libsolidity/analysis/TypeChecker.cpp | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/libsolidity/analysis/ReferencesResolver.cpp b/libsolidity/analysis/ReferencesResolver.cpp index f33de7b7..8750b47b 100644 --- a/libsolidity/analysis/ReferencesResolver.cpp +++ b/libsolidity/analysis/ReferencesResolver.cpp @@ -332,7 +332,7 @@ void ReferencesResolver::endVisit(VariableDeclaration const& _variable) case Location::Memory: return "\"memory\""; case Location::Storage: return "\"storage\""; case Location::CallData: return "\"calldata\""; - case Location::Default: return "none"; + case Location::Unspecified: return "none"; } return {}; }; @@ -368,12 +368,12 @@ void ReferencesResolver::endVisit(VariableDeclaration const& _variable) // Find correct data location. if (_variable.isEventParameter()) { - solAssert(varLoc == Location::Default, ""); + solAssert(varLoc == Location::Unspecified, ""); typeLoc = DataLocation::Memory; } else if (_variable.isStateVariable()) { - solAssert(varLoc == Location::Default, ""); + solAssert(varLoc == Location::Unspecified, ""); typeLoc = _variable.isConstant() ? DataLocation::Memory : DataLocation::Storage; } else if ( @@ -394,7 +394,7 @@ void ReferencesResolver::endVisit(VariableDeclaration const& _variable) case Location::CallData: typeLoc = DataLocation::CallData; break; - case Location::Default: + case Location::Unspecified: solAssert(!_variable.hasReferenceOrMappingType(), "Data location not properly set."); } diff --git a/libsolidity/analysis/TypeChecker.cpp b/libsolidity/analysis/TypeChecker.cpp index fca64f6a..ae733cff 100644 --- a/libsolidity/analysis/TypeChecker.cpp +++ b/libsolidity/analysis/TypeChecker.cpp @@ -1217,7 +1217,7 @@ bool TypeChecker::visit(VariableDeclarationStatement const& _statement) if (ref->dataStoredIn(DataLocation::Storage)) { string errorText{"Uninitialized storage pointer."}; - if (varDecl.referenceLocation() == VariableDeclaration::Location::Default) + if (varDecl.referenceLocation() == VariableDeclaration::Location::Unspecified) errorText += " Did you mean '<type> memory " + varDecl.name() + "'?"; solAssert(m_scope, ""); m_errorReporter.declarationError(varDecl.location(), errorText); |