Replaced "inheritable" by "internal".

3 files changed, 7 insertions, 7 deletions

diff --git a/AST.h b/AST.h
index 064457d3..138abf36 100644
--- a/AST.h
+++ b/AST.h
@@ -133,7 +133,7 @@ class Declaration: public ASTNode
 {
 public:
 	/// Visibility ordered from restricted to unrestricted.
-	enum class Visibility { Default, Private, Inheritable, Public, External };
+	enum class Visibility { Default, Private, Internal, Public, External };
 
 	Declaration(Location const& _location, ASTPointer<ASTString> const& _name,
 				Visibility _visibility = Visibility::Default):
@@ -144,7 +144,7 @@ public:
 	Visibility getVisibility() const { return m_visibility == Visibility::Default ? getDefaultVisibility() : m_visibility; }
 	bool isPublic() const { return getVisibility() >= Visibility::Public; }
 	bool isVisibleInContract() const { return getVisibility() != Visibility::External; }
-	bool isVisibleInDerivedContracts() const { return isVisibleInContract() && getVisibility() >= Visibility::Inheritable; }
+	bool isVisibleInDerivedContracts() const { return isVisibleInContract() && getVisibility() >= Visibility::Internal; }
 
 	/// @returns the scope this declaration resides in. Can be nullptr if it is the global scope.
 	/// Available only after name and type resolution step.
@@ -459,7 +459,7 @@ public:
 	bool isIndexed() const { return m_isIndexed; }
 
 protected:
-	Visibility getDefaultVisibility() const override { return Visibility::Inheritable; }
+	Visibility getDefaultVisibility() const override { return Visibility::Internal; }
 
 private:
 	ASTPointer<TypeName> m_typeName;    ///< can be empty ("var")
diff --git a/Parser.cpp b/Parser.cpp
index 9940fb8d..9fe1af22 100644
--- a/Parser.cpp
+++ b/Parser.cpp
@@ -187,8 +187,8 @@ Declaration::Visibility Parser::parseVisibilitySpecifier(Token::Value _token)
 	Declaration::Visibility visibility(Declaration::Visibility::Default);
 	if (_token == Token::Public)
 		visibility = Declaration::Visibility::Public;
-	else if (_token == Token::Inheritable)
-		visibility = Declaration::Visibility::Inheritable;
+	else if (_token == Token::Internal)
+		visibility = Declaration::Visibility::Internal;
 	else if (_token == Token::Private)
 		visibility = Declaration::Visibility::Private;
 	else if (_token == Token::External)
diff --git a/Token.h b/Token.h
index 4aa00047..5e4a6317 100644
--- a/Token.h
+++ b/Token.h
@@ -162,7 +162,7 @@ namespace solidity
 	K(New, "new", 0)                                                   \
 	K(Public, "public", 0)                                             \
 	K(Private, "private", 0)                                           \
-	K(Inheritable, "inheritable", 0)                                   \
+	K(Internal, "internal", 0)                                   \
 	K(Return, "return", 0)                                             \
 	K(Returns, "returns", 0)                                           \
 	K(Struct, "struct", 0)                                             \
@@ -380,7 +380,7 @@ public:
 	static bool isCountOp(Value op) { return op == Inc || op == Dec; }
 	static bool isShiftOp(Value op) { return (SHL <= op) && (op <= SHR); }
 	static bool isVisibilitySpecifier(Value op) { return isVariableVisibilitySpecifier(op) || op == External; }
-	static bool isVariableVisibilitySpecifier(Value op) { return op == Public || op == Private || op == Inheritable; }
+	static bool isVariableVisibilitySpecifier(Value op) { return op == Public || op == Private || op == Internal; }
 	static bool isEtherSubdenomination(Value op) { return op == SubWei || op == SubSzabo || op == SubFinney || op == Token::SubEther; }
 
 	// Returns a string corresponding to the JS token string