Merge pull request #4837 from chase1745/default-to-unspecified

Rename `Location::Default` to `Location::Unspecified`
This commit is contained in:
chriseth
2018-09-03 18:44:41 +02:00
committed by GitHub
6 changed files with 12 additions and 12 deletions
+2 -2
View File
@@ -517,7 +517,7 @@ set<VariableDeclaration::Location> VariableDeclaration::allowedDataLocations() c
using Location = VariableDeclaration::Location;
if (!hasReferenceOrMappingType() || isStateVariable() || isEventParameter())
return set<Location>{ Location::Default };
return set<Location>{ Location::Unspecified };
else if (isStateVariable() && isConstant())
return set<Location>{ Location::Memory };
else if (isExternalCallableParameter())
@@ -546,7 +546,7 @@ set<VariableDeclaration::Location> VariableDeclaration::allowedDataLocations() c
}
else
// Struct members etc.
return set<Location>{ Location::Default };
return set<Location>{ Location::Unspecified };
}
TypePointer VariableDeclaration::type() const
+2 -2
View File
@@ -655,7 +655,7 @@ private:
class VariableDeclaration: public Declaration
{
public:
enum Location { Default, Storage, Memory, CallData };
enum Location { Unspecified, Storage, Memory, CallData };
VariableDeclaration(
SourceLocation const& _sourceLocation,
@@ -666,7 +666,7 @@ public:
bool _isStateVar = false,
bool _isIndexed = false,
bool _isConstant = false,
Location _referenceLocation = Location::Default
Location _referenceLocation = Location::Unspecified
):
Declaration(_sourceLocation, _name, _visibility),
m_typeName(_type),
+1 -1
View File
@@ -739,7 +739,7 @@ string ASTJsonConverter::location(VariableDeclaration::Location _location)
{
switch (_location)
{
case VariableDeclaration::Location::Default:
case VariableDeclaration::Location::Unspecified:
return "default";
case VariableDeclaration::Location::Storage:
return "storage";