fixup! Add and update tests

matheusaaguiar · matheusaaguiar · commit 2722f7f13455 · 2025-12-14T23:09:43.000-03:00
diff --git a/libsolidity/analysis/NameAndTypeResolver.cpp b/libsolidity/analysis/NameAndTypeResolver.cpp
@@ -561,6 +561,17 @@ bool DeclarationRegistrationHelper::registerDeclaration(
 			);
 	}
 
+	if (TokenTraits::isFutureSolidityKeyword(_declaration.name()))
+		_errorReporter.warning(
+			6335_error,
+			_declaration.location(),
+			fmt::format(
+				"\"{}\" will be promoted to keyword in the next breaking version"
+				" and will not be allowed as an identifier anymore.",
+				_declaration.name()
+			)
+		);
+
 	if (!_container.registerDeclaration(_declaration, _name, _errorLocation, !_declaration.isVisibleInContract() || _inactive, false))
 	{
 		SourceLocation firstDeclarationLocation;
diff --git a/libsolidity/analysis/SyntaxChecker.cpp b/libsolidity/analysis/SyntaxChecker.cpp
@@ -530,17 +530,3 @@ bool SyntaxChecker::visitNode(ASTNode const& _node)
 	return ASTConstVisitor::visitNode(_node);
 }
 
-
-void SyntaxChecker::checkFutureKeyword(Declaration const& _declaration)
-{
-	if (TokenTraits::isFutureSolidityKeyword(_declaration.name()))
-		m_errorReporter.warning(
-			6335_error,
-			_declaration.location(),
-			fmt::format(
-				"\"{}\" will be promoted to keyword in the next breaking version"
-				" and will not be allowed as an identifier anymore.",
-				_declaration.name()
-			)
-		);
-}
diff --git a/libsolidity/analysis/SyntaxChecker.h b/libsolidity/analysis/SyntaxChecker.h
@@ -66,10 +66,6 @@ class SyntaxChecker: private ASTConstVisitor
 	/// without a block.
 	void checkSingleStatementVariableDeclaration(ASTNode const& _statement);
 
-	/// Reports a warning if the declaration name is scheduled to be
-	/// promoted to a keyword in the near future.
-	void checkFutureKeyword(Declaration const& _declaration);
-
 	bool visit(IfStatement const& _ifStatement) override;
 	bool visit(WhileStatement const& _whileStatement) override;
 	void endVisit(WhileStatement const& _whileStatement) override;
diff --git a/test/libsolidity/syntaxTests/duplicateFunctions/illegal_names_functions.sol b/test/libsolidity/syntaxTests/duplicateFunctions/illegal_names_functions.sol
@@ -10,10 +10,10 @@ contract C {
     }
 }
 // ----
-// Warning 6335: (84-117): "super" will be promoted to keyword in the next breaking version and will not be allowed as an identifier anymore.
-// Warning 6335: (123-155): "this" will be promoted to keyword in the next breaking version and will not be allowed as an identifier anymore.
 // DeclarationError 3726: (17-78): The name "_" is reserved.
 // DeclarationError 3726: (84-117): The name "super" is reserved.
+// Warning 6335: (84-117): "super" will be promoted to keyword in the next breaking version and will not be allowed as an identifier anymore.
 // DeclarationError 3726: (123-155): The name "this" is reserved.
+// Warning 6335: (123-155): "this" will be promoted to keyword in the next breaking version and will not be allowed as an identifier anymore.
 // Warning 2319: (84-117): This declaration shadows a builtin symbol.
 // Warning 2319: (123-155): This declaration shadows a builtin symbol.
diff --git a/test/libsolidity/syntaxTests/enums/illegal_names.sol b/test/libsolidity/syntaxTests/enums/illegal_names.sol
@@ -21,15 +21,15 @@ contract C {
     E e;
 }
 // ----
-// Warning 6335: (0-19): "this" will be promoted to keyword in the next breaking version and will not be allowed as an identifier anymore.
-// Warning 6335: (20-40): "super" will be promoted to keyword in the next breaking version and will not be allowed as an identifier anymore.
-// Warning 6335: (72-76): "this" will be promoted to keyword in the next breaking version and will not be allowed as an identifier anymore.
-// Warning 6335: (82-87): "super" will be promoted to keyword in the next breaking version and will not be allowed as an identifier anymore.
 // DeclarationError 3726: (0-19): The name "this" is reserved.
+// Warning 6335: (0-19): "this" will be promoted to keyword in the next breaking version and will not be allowed as an identifier anymore.
 // DeclarationError 3726: (20-40): The name "super" is reserved.
+// Warning 6335: (20-40): "super" will be promoted to keyword in the next breaking version and will not be allowed as an identifier anymore.
 // DeclarationError 3726: (41-57): The name "_" is reserved.
 // DeclarationError 3726: (72-76): The name "this" is reserved.
+// Warning 6335: (72-76): "this" will be promoted to keyword in the next breaking version and will not be allowed as an identifier anymore.
 // DeclarationError 3726: (82-87): The name "super" is reserved.
+// Warning 6335: (82-87): "super" will be promoted to keyword in the next breaking version and will not be allowed as an identifier anymore.
 // DeclarationError 3726: (93-94): The name "_" is reserved.
 // Warning 2319: (0-19): This declaration shadows a builtin symbol.
 // Warning 2319: (20-40): This declaration shadows a builtin symbol.
diff --git a/test/libsolidity/syntaxTests/errors/struct_named_error.sol b/test/libsolidity/syntaxTests/errors/struct_named_error.sol
@@ -4,3 +4,4 @@ contract C {
     error x;
 }
 // ----
+// Warning 6335: (52-74): "error" will be promoted to keyword in the next breaking version and will not be allowed as an identifier anymore.
diff --git a/test/libsolidity/syntaxTests/freeFunctions/illegal_names.sol b/test/libsolidity/syntaxTests/freeFunctions/illegal_names.sol
@@ -10,10 +10,10 @@ contract C {
 	}
 }
 // ----
-// Warning 6335: (0-18): "this" will be promoted to keyword in the next breaking version and will not be allowed as an identifier anymore.
-// Warning 6335: (19-38): "super" will be promoted to keyword in the next breaking version and will not be allowed as an identifier anymore.
 // DeclarationError 3726: (0-18): The name "this" is reserved.
+// Warning 6335: (0-18): "this" will be promoted to keyword in the next breaking version and will not be allowed as an identifier anymore.
 // DeclarationError 3726: (19-38): The name "super" is reserved.
+// Warning 6335: (19-38): "super" will be promoted to keyword in the next breaking version and will not be allowed as an identifier anymore.
 // DeclarationError 3726: (39-54): The name "_" is reserved.
 // Warning 2319: (0-18): This declaration shadows a builtin symbol.
 // Warning 2319: (19-38): This declaration shadows a builtin symbol.
diff --git a/test/libsolidity/syntaxTests/functionTypes/function_type_with_transient_param.sol b/test/libsolidity/syntaxTests/functionTypes/function_type_with_transient_param.sol
@@ -4,7 +4,7 @@ contract C {
 }
 // ----
 // Warning 6162: (27-41): Naming function type parameters is deprecated.
-// Warning 6335: (27-41): "transient" will be promoted to keyword in the next breaking version and will not be allowed as an identifier anymore.
 // Warning 6162: (69-85): Naming function type parameters is deprecated.
+// Warning 6335: (27-41): "transient" will be promoted to keyword in the next breaking version and will not be allowed as an identifier anymore.
 // Warning 6335: (69-85): "transient" will be promoted to keyword in the next breaking version and will not be allowed as an identifier anymore.
 // TypeError 6651: (69-85): Data location must be "memory" or "calldata" for parameter in function, but none was given.
diff --git a/test/libsolidity/syntaxTests/immutable/illegal_names.sol b/test/libsolidity/syntaxTests/immutable/illegal_names.sol
@@ -4,10 +4,10 @@ contract C {
     uint immutable this;
 }
 // ----
-// Warning 6335: (17-37): "super" will be promoted to keyword in the next breaking version and will not be allowed as an identifier anymore.
-// Warning 6335: (65-84): "this" will be promoted to keyword in the next breaking version and will not be allowed as an identifier anymore.
 // DeclarationError 3726: (17-37): The name "super" is reserved.
+// Warning 6335: (17-37): "super" will be promoted to keyword in the next breaking version and will not be allowed as an identifier anymore.
 // DeclarationError 3726: (43-59): The name "_" is reserved.
 // DeclarationError 3726: (65-84): The name "this" is reserved.
+// Warning 6335: (65-84): "this" will be promoted to keyword in the next breaking version and will not be allowed as an identifier anymore.
 // Warning 2319: (17-37): This declaration shadows a builtin symbol.
 // Warning 2319: (65-84): This declaration shadows a builtin symbol.
diff --git a/test/libsolidity/syntaxTests/modifiers/illegal_name.sol b/test/libsolidity/syntaxTests/modifiers/illegal_name.sol
@@ -5,7 +5,9 @@ contract C {
 }
 // ----
 // DeclarationError 3726: (14-34): The name "this" is reserved.
+// Warning 6335: (14-34): "this" will be promoted to keyword in the next breaking version and will not be allowed as an identifier anymore.
 // DeclarationError 3726: (36-57): The name "super" is reserved.
+// Warning 6335: (36-57): "super" will be promoted to keyword in the next breaking version and will not be allowed as an identifier anymore.
 // DeclarationError 3726: (59-76): The name "_" is reserved.
 // Warning 2319: (14-34): This declaration shadows a builtin symbol.
 // Warning 2319: (36-57): This declaration shadows a builtin symbol.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/shadowsBuiltin/illegal_names_function_parameters.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/shadowsBuiltin/illegal_names_function_parameters.sol
@@ -16,15 +16,15 @@ contract C {
     }
 }
 // ----
-// Warning 6335: (28-38): "super" will be promoted to keyword in the next breaking version and will not be allowed as an identifier anymore.
-// Warning 6335: (70-79): "this" will be promoted to keyword in the next breaking version and will not be allowed as an identifier anymore.
-// Warning 6335: (167-177): "super" will be promoted to keyword in the next breaking version and will not be allowed as an identifier anymore.
-// Warning 6335: (238-247): "this" will be promoted to keyword in the next breaking version and will not be allowed as an identifier anymore.
 // DeclarationError 3726: (28-38): The name "super" is reserved.
+// Warning 6335: (28-38): "super" will be promoted to keyword in the next breaking version and will not be allowed as an identifier anymore.
 // DeclarationError 3726: (70-79): The name "this" is reserved.
+// Warning 6335: (70-79): "this" will be promoted to keyword in the next breaking version and will not be allowed as an identifier anymore.
 // DeclarationError 3726: (111-117): The name "_" is reserved.
 // DeclarationError 3726: (167-177): The name "super" is reserved.
+// Warning 6335: (167-177): "super" will be promoted to keyword in the next breaking version and will not be allowed as an identifier anymore.
 // DeclarationError 3726: (238-247): The name "this" is reserved.
+// Warning 6335: (238-247): "this" will be promoted to keyword in the next breaking version and will not be allowed as an identifier anymore.
 // DeclarationError 3726: (308-314): The name "_" is reserved.
 // Warning 2319: (28-38): This declaration shadows a builtin symbol.
 // Warning 2319: (70-79): This declaration shadows a builtin symbol.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/shadowsBuiltin/illegal_names_library_using_for.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/shadowsBuiltin/illegal_names_library_using_for.sol
@@ -19,10 +19,10 @@ contract C {
     using _ for int;
 }
 // ----
-// Warning 6335: (0-49): "super" will be promoted to keyword in the next breaking version and will not be allowed as an identifier anymore.
-// Warning 6335: (51-99): "this" will be promoted to keyword in the next breaking version and will not be allowed as an identifier anymore.
 // DeclarationError 3726: (0-49): The name "super" is reserved.
+// Warning 6335: (0-49): "super" will be promoted to keyword in the next breaking version and will not be allowed as an identifier anymore.
 // DeclarationError 3726: (51-99): The name "this" is reserved.
+// Warning 6335: (51-99): "this" will be promoted to keyword in the next breaking version and will not be allowed as an identifier anymore.
 // DeclarationError 3726: (100-145): The name "_" is reserved.
 // Warning 2319: (0-49): This declaration shadows a builtin symbol.
 // Warning 2319: (51-99): This declaration shadows a builtin symbol.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/shadowsBuiltin/illegal_names_using_for.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/shadowsBuiltin/illegal_names_using_for.sol
@@ -26,7 +26,9 @@ contract C {
 }
 // ----
 // DeclarationError 3726: (56-84): The name "super" is reserved.
+// Warning 6335: (56-84): "super" will be promoted to keyword in the next breaking version and will not be allowed as an identifier anymore.
 // DeclarationError 3726: (95-122): The name "this" is reserved.
+// Warning 6335: (95-122): "this" will be promoted to keyword in the next breaking version and will not be allowed as an identifier anymore.
 // DeclarationError 3726: (133-157): The name "_" is reserved.
 // Warning 2319: (56-84): This declaration shadows a builtin symbol.
 // Warning 2319: (95-122): This declaration shadows a builtin symbol.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/shadowsBuiltin/this_super.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/shadowsBuiltin/this_super.sol
@@ -5,9 +5,9 @@ contract C {
     }
 }
 // ----
-// Warning 6335: (52-62): "super" will be promoted to keyword in the next breaking version and will not be allowed as an identifier anymore.
-// Warning 6335: (76-85): "this" will be promoted to keyword in the next breaking version and will not be allowed as an identifier anymore.
 // DeclarationError 3726: (52-62): The name "super" is reserved.
+// Warning 6335: (52-62): "super" will be promoted to keyword in the next breaking version and will not be allowed as an identifier anymore.
 // DeclarationError 3726: (76-85): The name "this" is reserved.
+// Warning 6335: (76-85): "this" will be promoted to keyword in the next breaking version and will not be allowed as an identifier anymore.
 // Warning 2319: (52-62): This declaration shadows a builtin symbol.
 // Warning 2319: (76-85): This declaration shadows a builtin symbol.
diff --git a/test/libsolidity/syntaxTests/structs/illegal_names.sol b/test/libsolidity/syntaxTests/structs/illegal_names.sol
@@ -9,7 +9,9 @@ contract C {
 }
 // ----
 // DeclarationError 3726: (0-23): The name "this" is reserved.
+// Warning 6335: (0-23): "this" will be promoted to keyword in the next breaking version and will not be allowed as an identifier anymore.
 // DeclarationError 3726: (24-48): The name "super" is reserved.
+// Warning 6335: (24-48): "super" will be promoted to keyword in the next breaking version and will not be allowed as an identifier anymore.
 // DeclarationError 3726: (49-69): The name "_" is reserved.
 // Warning 2319: (0-23): This declaration shadows a builtin symbol.
 // Warning 2319: (24-48): This declaration shadows a builtin symbol.
diff --git a/test/libsolidity/syntaxTests/variableDeclaration/illegal_names.sol b/test/libsolidity/syntaxTests/variableDeclaration/illegal_names.sol
@@ -12,21 +12,21 @@ contract D {
 	struct _ { uint super; }
 }
 // ----
-// Warning 6335: (0-22): "this" will be promoted to keyword in the next breaking version and will not be allowed as an identifier anymore.
-// Warning 6335: (24-47): "super" will be promoted to keyword in the next breaking version and will not be allowed as an identifier anymore.
-// Warning 6335: (84-96): "this" will be promoted to keyword in the next breaking version and will not be allowed as an identifier anymore.
-// Warning 6335: (99-108): "super" will be promoted to keyword in the next breaking version and will not be allowed as an identifier anymore.
-// Warning 6335: (160-174): "this" will be promoted to keyword in the next breaking version and will not be allowed as an identifier anymore.
-// Warning 6335: (188-198): "super" will be promoted to keyword in the next breaking version and will not be allowed as an identifier anymore.
 // DeclarationError 3726: (0-22): The name "this" is reserved.
+// Warning 6335: (0-22): "this" will be promoted to keyword in the next breaking version and will not be allowed as an identifier anymore.
 // DeclarationError 3726: (24-47): The name "super" is reserved.
+// Warning 6335: (24-47): "super" will be promoted to keyword in the next breaking version and will not be allowed as an identifier anymore.
 // DeclarationError 3726: (49-68): The name "_" is reserved.
 // DeclarationError 3726: (84-96): The name "this" is reserved.
+// Warning 6335: (84-96): "this" will be promoted to keyword in the next breaking version and will not be allowed as an identifier anymore.
 // DeclarationError 3726: (99-108): The name "super" is reserved.
+// Warning 6335: (99-108): "super" will be promoted to keyword in the next breaking version and will not be allowed as an identifier anymore.
 // DeclarationError 3726: (111-141): The name "_" is reserved.
 // DeclarationError 3726: (160-174): The name "this" is reserved.
+// Warning 6335: (160-174): "this" will be promoted to keyword in the next breaking version and will not be allowed as an identifier anymore.
 // DeclarationError 3726: (177-201): The name "_" is reserved.
 // DeclarationError 3726: (188-198): The name "super" is reserved.
+// Warning 6335: (188-198): "super" will be promoted to keyword in the next breaking version and will not be allowed as an identifier anymore.
 // Warning 2519: (84-96): This declaration shadows an existing declaration.
 // Warning 2519: (99-108): This declaration shadows an existing declaration.
 // Warning 2519: (111-141): This declaration shadows an existing declaration.

Original file line number	Diff line number	Diff line change
`@@ -10,10 +10,10 @@ contract C {`
`10`	`10`	`}`
`11`	`11`	`}`
`12`	`12`	`// ----`
`13`		`-// Warning 6335: (84-117): "super" will be promoted to keyword in the next breaking version and will not be allowed as an identifier anymore.`
`14`		`-// Warning 6335: (123-155): "this" will be promoted to keyword in the next breaking version and will not be allowed as an identifier anymore.`
`15`	`13`	`// DeclarationError 3726: (17-78): The name "_" is reserved.`
`16`	`14`	`// DeclarationError 3726: (84-117): The name "super" is reserved.`
	`15`	`+// Warning 6335: (84-117): "super" will be promoted to keyword in the next breaking version and will not be allowed as an identifier anymore.`
`17`	`16`	`// DeclarationError 3726: (123-155): The name "this" is reserved.`
	`17`	`+// Warning 6335: (123-155): "this" will be promoted to keyword in the next breaking version and will not be allowed as an identifier anymore.`
`18`	`18`	`// Warning 2319: (84-117): This declaration shadows a builtin symbol.`
`19`	`19`	`// Warning 2319: (123-155): This declaration shadows a builtin symbol.`
Original file line number	Diff line number	Diff line change
`@@ -4,3 +4,4 @@ contract C {`
`4`	`4`	`error x;`
`5`	`5`	`}`
`6`	`6`	`// ----`
	`7`	`+// Warning 6335: (52-74): "error" will be promoted to keyword in the next breaking version and will not be allowed as an identifier anymore.`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ contract C {`
`4`	`4`	`}`
`5`	`5`	`// ----`
`6`	`6`	`// Warning 6162: (27-41): Naming function type parameters is deprecated.`
`7`		`-// Warning 6335: (27-41): "transient" will be promoted to keyword in the next breaking version and will not be allowed as an identifier anymore.`
`8`	`7`	`// Warning 6162: (69-85): Naming function type parameters is deprecated.`
	`8`	`+// Warning 6335: (27-41): "transient" will be promoted to keyword in the next breaking version and will not be allowed as an identifier anymore.`
`9`	`9`	`// Warning 6335: (69-85): "transient" will be promoted to keyword in the next breaking version and will not be allowed as an identifier anymore.`
`10`	`10`	`// TypeError 6651: (69-85): Data location must be "memory" or "calldata" for parameter in function, but none was given.`