Make parser accept transient as location (but not a keyword)

ethereum · Apr 7, 2024 · 1ea64d6 · 1ea64d6
1 parent 3d7b3d9
commit 1ea64d6
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 3 deletions.
diff --git a/libsolidity/analysis/DeclarationTypeChecker.cpp b/libsolidity/analysis/DeclarationTypeChecker.cpp
@@ -407,6 +407,7 @@ void DeclarationTypeChecker::endVisit(VariableDeclaration const& _variable)
 			{
 				case Location::Memory: return "\"memory\"";
 				case Location::Storage: return "\"storage\"";
+				case Location::Transient: return "\"transient\"";
 				case Location::CallData: return "\"calldata\"";
 				case Location::Unspecified: return "none";
 			}
@@ -456,8 +457,18 @@ void DeclarationTypeChecker::endVisit(VariableDeclaration const& _variable)
 	}
 	else if (_variable.isStateVariable())
 	{
-		solAssert(varLoc == Location::Unspecified, "");
-		typeLoc = (_variable.isConstant() || _variable.immutable()) ? DataLocation::Memory : DataLocation::Storage;
+		switch (varLoc)
+		{
+			case Location::Unspecified:
+				typeLoc = (_variable.isConstant() || _variable.immutable()) ? DataLocation::Memory : DataLocation::Storage;
+				break;
+			case Location::Transient:
+				solAssert(false, "Transient storage type checking not implemented yet");
+				break;
+			default:
+				solAssert(false, "");
+				break;
+		}
 	}
 	else if (
 		dynamic_cast<StructDefinition const*>(_variable.scope()) ||
@@ -477,6 +488,9 @@ void DeclarationTypeChecker::endVisit(VariableDeclaration const& _variable)
 			case Location::CallData:
 				typeLoc = DataLocation::CallData;
 				break;
+			case Location::Transient:
+				solAssert(false, "Transient storage type checking not implemented yet");
+				break;
 			case Location::Unspecified:
 				solAssert(!_variable.hasReferenceOrMappingType(), "Data location not properly set.");
 		}

diff --git a/libsolidity/ast/AST.h b/libsolidity/ast/AST.h
@@ -1053,7 +1053,7 @@ class FunctionDefinition: public CallableDeclaration, public StructurallyDocumen
 class VariableDeclaration: public Declaration, public StructurallyDocumented
 {
 public:
-	enum Location { Unspecified, Storage, Memory, CallData };
+	enum Location { Unspecified, Storage, Transient, Memory, CallData };
 	enum class Mutability { Mutable, Immutable, Constant };
 	static std::string mutabilityToString(Mutability _mutability)
 	{

diff --git a/libsolidity/ast/ASTJsonExporter.cpp b/libsolidity/ast/ASTJsonExporter.cpp
@@ -1059,6 +1059,8 @@ std::string ASTJsonExporter::location(VariableDeclaration::Location _location)
 		return "memory";
 	case VariableDeclaration::Location::CallData:
 		return "calldata";
+	case VariableDeclaration::Location::Transient:
+		return "transient";
 	}
 	// To make the compiler happy
 	return {};

diff --git a/libsolidity/parsing/Parser.cpp b/libsolidity/parsing/Parser.cpp
@@ -899,6 +899,23 @@ ASTPointer<VariableDeclaration> Parser::parseVariableDeclaration(
 	{
 		nodeFactory.markEndPosition();
 		tie(identifier, nameLocation) = expectIdentifierWithLocation();
+		if (
+			*identifier == "transient" &&
+			m_scanner->currentToken() == Token::Identifier &&
+			(
+				_options.allowLocationSpecifier ||
+				_options.kind == VarDeclKind::State
+			)
+		)
+		{
+			if (location != VariableDeclaration::Location::Unspecified)
+				parserError(ErrorId{3548}, "Location already specified.");
+			else
+				location = VariableDeclaration::Location::Transient;
+
+			nodeFactory.markEndPosition();
+			tie(identifier, nameLocation) = expectIdentifierWithLocation();
+		}
 	}
 	ASTPointer<Expression> value;
 	if (_options.allowInitialValue)