Move around experimental tests

ethereum · Sep 5, 2023 · 2cdf9c5 · 2cdf9c5
1 parent 8721283
commit 2cdf9c5
Show file tree

Hide file tree

Showing 17 changed files with 43 additions and 2 deletions.
diff --git a/libsolidity/experimental/analysis/TypeInference.h b/libsolidity/experimental/analysis/TypeInference.h
@@ -64,6 +64,7 @@ class TypeInference: public ASTConstVisitor
 	bool visit(SourceUnit const&) override { return true; }
 	bool visit(ContractDefinition const&) override { return true; }
 	bool visit(InlineAssembly const& _inlineAssembly) override;
+	bool visit(ImportDirective const&) override { return true; }
 	bool visit(PragmaDirective const&) override { return false; }
 
 	bool visit(IfStatement const&) override { return true; }

diff --git a/libsolidity/interface/CompilerStack.h b/libsolidity/interface/CompilerStack.h
@@ -240,6 +240,13 @@ class CompilerStack: public langutil::CharStreamProvider
 	/// @returns false on error.
 	bool compile(State _stopAfter = State::CompilationSuccessful);
 
+	/// Checks whether experimental analysis is on; used in SyntaxTests to skip compilation in case it's ``true``.
+	/// @returns true if experimental analysis is set
+	bool isExperimentalAnalysis() const
+	{
+		return !!m_experimentalAnalysis;
+	}
+
 	/// @returns the list of sources (paths) used
 	std::vector<std::string> sourceNames() const;
 

diff --git a/test/libsolidity/SyntaxTest.cpp b/test/libsolidity/SyntaxTest.cpp
@@ -67,7 +67,7 @@ void SyntaxTest::parseAndAnalyze()
 {
 	setupCompiler();
 
-	if (compiler().parse() && compiler().analyze())
+	if (compiler().parse() && compiler().analyze() && !compiler().isExperimentalAnalysis())
 		try
 		{
 			if (!compiler().compile())

diff --git a/...taxTests/pragma/experimental_solidity.sol → ...rimental/import/experimental_solidity.sol b/...taxTests/pragma/experimental_solidity.sol → ...rimental/import/experimental_solidity.sol
diff --git a/...l_solidity_multisource_not_all_enable.sol → ...l_solidity_multisource_not_all_enable.sol b/...l_solidity_multisource_not_all_enable.sol → ...l_solidity_multisource_not_all_enable.sol
diff --git a/.../experimental_solidity_out_of_order_1.sol → .../experimental_solidity_out_of_order_1.sol b/.../experimental_solidity_out_of_order_1.sol → .../experimental_solidity_out_of_order_1.sol
diff --git a/.../experimental_solidity_out_of_order_2.sol → .../experimental_solidity_out_of_order_2.sol b/.../experimental_solidity_out_of_order_2.sol → .../experimental_solidity_out_of_order_2.sol
diff --git a/...perimental_solidity_wrong_evm_version.sol → ...perimental_solidity_wrong_evm_version.sol b/...perimental_solidity_wrong_evm_version.sol → ...perimental_solidity_wrong_evm_version.sol
diff --git a/.../experimental/parsing_stdlib_import_1.sol → ...mental/import/parsing_stdlib_import_1.sol b/.../experimental/parsing_stdlib_import_1.sol → ...mental/import/parsing_stdlib_import_1.sol
@@ -6,3 +6,5 @@ import std.stub;
 // ----
 // Warning 2264: (std.stub:63-92): Experimental features are turned on. Do not use experimental features on live deployments.
 // Warning 2264: (0-29): Experimental features are turned on. Do not use experimental features on live deployments.
+// Info 4164: (std.stub:94-117): Inferred type: () -> ()
+// Info 4164: (std.stub:111-113): Inferred type: ()
diff --git a/.../experimental/parsing_stdlib_import_2.sol → ...mental/import/parsing_stdlib_import_2.sol b/.../experimental/parsing_stdlib_import_2.sol → ...mental/import/parsing_stdlib_import_2.sol
@@ -6,3 +6,5 @@ import std.stub as stub;
 // ----
 // Warning 2264: (std.stub:63-92): Experimental features are turned on. Do not use experimental features on live deployments.
 // Warning 2264: (0-29): Experimental features are turned on. Do not use experimental features on live deployments.
+// Info 4164: (std.stub:94-117): Inferred type: () -> ()
+// Info 4164: (std.stub:111-113): Inferred type: ()
diff --git a/.../experimental/parsing_stdlib_import_3.sol → ...mental/import/parsing_stdlib_import_3.sol b/.../experimental/parsing_stdlib_import_3.sol → ...mental/import/parsing_stdlib_import_3.sol
@@ -6,3 +6,6 @@ import { identity } from std.stub;
 // ----
 // Warning 2264: (std.stub:63-92): Experimental features are turned on. Do not use experimental features on live deployments.
 // Warning 2264: (0-29): Experimental features are turned on. Do not use experimental features on live deployments.
+// Info 4164: (std.stub:94-117): Inferred type: () -> ()
+// Info 4164: (std.stub:111-113): Inferred type: ()
+// Info 4164: (40-48): Inferred type: () -> ()
diff --git a/.../experimental/parsing_stdlib_import_4.sol → ...mental/import/parsing_stdlib_import_4.sol b/.../experimental/parsing_stdlib_import_4.sol → ...mental/import/parsing_stdlib_import_4.sol
@@ -6,3 +6,5 @@ import * as stub from std.stub;
 // ----
 // Warning 2264: (std.stub:63-92): Experimental features are turned on. Do not use experimental features on live deployments.
 // Warning 2264: (0-29): Experimental features are turned on. Do not use experimental features on live deployments.
+// Info 4164: (std.stub:94-117): Inferred type: () -> ()
+// Info 4164: (std.stub:111-113): Inferred type: ()
diff --git a/...arsing_stdlib_import_without_pragma_1.sol → ...arsing_stdlib_import_without_pragma_1.sol b/...arsing_stdlib_import_without_pragma_1.sol → ...arsing_stdlib_import_without_pragma_1.sol
diff --git a/...arsing_stdlib_import_without_pragma_2.sol → ...arsing_stdlib_import_without_pragma_2.sol b/...arsing_stdlib_import_without_pragma_2.sol → ...arsing_stdlib_import_without_pragma_2.sol
diff --git a/...ity/syntaxTests/experimental_keywords.sol → ...ental/inference/experimental_keywords.sol b/...ity/syntaxTests/experimental_keywords.sol → ...ental/inference/experimental_keywords.sol
diff --git a/test/libsolidity/syntaxTests/experimental/inference/import_and_call_stdlib_function.sol b/test/libsolidity/syntaxTests/experimental/inference/import_and_call_stdlib_function.sol
@@ -0,0 +1,24 @@
+pragma experimental solidity;
+
+import { identity as id } from std.stub;
+
+contract C
+{
+    fallback() external
+    {
+        id();
+    }
+}
+
+// ====
+// EVMVersion: >=constantinople
+// ----
+// Warning 2264: (std.stub:63-92): Experimental features are turned on. Do not use experimental features on live deployments.
+// Warning 2264: (0-29): Experimental features are turned on. Do not use experimental features on live deployments.
+// Info 4164: (std.stub:94-117): Inferred type: () -> ()
+// Info 4164: (std.stub:111-113): Inferred type: ()
+// Info 4164: (40-48): Inferred type: () -> ()
+// Info 4164: (90-135): Inferred type: () -> ()
+// Info 4164: (98-100): Inferred type: ()
+// Info 4164: (124-128): Inferred type: ()
+// Info 4164: (124-126): Inferred type: () -> ()
diff --git a/test/stopAfterParseTests.sh b/test/stopAfterParseTests.sh
@@ -70,5 +70,5 @@ while read -r file; do
 		echo "$file"
 		exit 1
 	fi
-done < <(find "${REPO_ROOT}/test" -iname "*.sol" -and -not -name "documentation.sol" -and -not -name "boost_filesystem_bug.sol")
+done < <(find "${REPO_ROOT}/test" -iname "*.sol" -and -not -name "documentation.sol" -and -not -name "boost_filesystem_bug.sol" -not -path "*/experimental/*")
 echo