Add an error when importing a symbol not existing in module

NazaraEngine · Aug 11, 2024 · 46aad44 · 46aad44
1 parent de4a36a
commit 46aad44
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 11 deletions.
diff --git a/include/NZSL/Lang/ErrorList.hpp b/include/NZSL/Lang/ErrorList.hpp
@@ -102,6 +102,7 @@ NZSL_SHADERLANG_COMPILER_ERROR(FunctionCallUnmatchingParameterType, "function {}
 NZSL_SHADERLANG_COMPILER_ERROR(FunctionDeclarationInsideFunction, "a function cannot be defined inside another function")
 NZSL_SHADERLANG_COMPILER_ERROR(IdentifierAlreadyUsed, "identifier {} is already used", std::string)
 NZSL_SHADERLANG_COMPILER_ERROR(ImportIdentifierAlreadyPresent, "{} identifier was already imported", std::string)
+NZSL_SHADERLANG_COMPILER_ERROR(ImportIdentifierNotFound, "identifier {} not found in module {}", std::string, std::string)
 NZSL_SHADERLANG_COMPILER_ERROR(ImportMultipleWildcard, "only one wildcard can be present in an import directive")
 NZSL_SHADERLANG_COMPILER_ERROR(ImportWildcardRename, "wildcard cannot be renamed")
 NZSL_SHADERLANG_COMPILER_ERROR(IndexRequiresIntegerIndices, "index access requires integer indices (got {})", std::string)

diff --git a/src/NZSL/Ast/SanitizeVisitor.cpp b/src/NZSL/Ast/SanitizeVisitor.cpp
@@ -2580,20 +2580,23 @@ namespace nzsl::Ast
 		std::vector<DeclareAliasStatementPtr> aliasStatements;
 		std::vector<DeclareConstStatementPtr> constStatements;
 
-		std::vector<std::string> wildcardImport{ std::string{} };
-
-		auto CheckImport = [&](const std::string& identifier) -> std::pair<bool, const std::vector<std::string>*>
+		auto CheckImport = [&](const std::string& identifier) -> std::pair<bool, std::vector<std::string>>
 		{
 			auto it = importedSymbols.find(identifier);
 			if (it == importedSymbols.end())
 			{
 				if (!importEverythingElse)
-					return { false, nullptr };
+					return { false, {} };
 
-				return { true, &wildcardImport };
+				return { true, { std::string{} } };
 			}
 			else
-				return { true, &it->second };
+			{
+				std::vector<std::string> imports = std::move(it->second);
+				importedSymbols.erase(it);
+
+				return { true, std::move(imports) };
+			}
 		};
 
 		ExportVisitor::Callbacks callbacks;
@@ -2617,7 +2620,7 @@ namespace nzsl::Ast
 				return ShaderBuilder::Constant(*node.constIndex, GetConstantType(*value));
 			};
 
-			for (const std::string& aliasName : *aliasesName)
+			for (const std::string& aliasName : aliasesName)
 			{
 				if (aliasName.empty())
 				{
@@ -2644,7 +2647,7 @@ namespace nzsl::Ast
 			if (moduleData.dependenciesVisitor)
 				moduleData.dependenciesVisitor->MarkFunctionAsUsed(*node.funcIndex);
 
-			for (const std::string& aliasName : *aliasesName)
+			for (const std::string& aliasName : aliasesName)
 			{
 				if (aliasName.empty())
 				{
@@ -2671,7 +2674,7 @@ namespace nzsl::Ast
 			if (moduleData.dependenciesVisitor)
 				moduleData.dependenciesVisitor->MarkStructAsUsed(*node.structIndex);
 
-			for (const std::string& aliasName : *aliasesName)
+			for (const std::string& aliasName : aliasesName)
 			{
 				if (aliasName.empty())
 				{
@@ -2690,6 +2693,12 @@ namespace nzsl::Ast
 		ExportVisitor exportVisitor;
 		exportVisitor.Visit(*m_context->currentModule->importedModules[moduleIndex].module->rootNode, callbacks);
 
+		if (!importedSymbols.empty())
+		{
+			for (const auto& [identifier, aliasesName] : importedSymbols)
+				throw CompilerImportIdentifierNotFoundError{ node.sourceLocation, identifier, node.moduleName };
+		}
+
 		if (aliasStatements.empty() && constStatements.empty())
 			return ShaderBuilder::NoOp();
 

diff --git a/tests/src/Tests/ErrorsTests.cpp b/tests/src/Tests/ErrorsTests.cpp
@@ -842,26 +842,39 @@ module Module;
 
 external
 {
+	[binding(0)]
 	data: mat4[f32]
 }
 )";
 
-			std::string_view shaderSource = R"(
+			std::string_view wildcardImportSource = R"(
 [nzsl_version("1.0")]
 module;
 
 import * from Module;
 )";
 
-			nzsl::Ast::ModulePtr shaderModule = nzsl::Parse(shaderSource);
+			nzsl::Ast::ModulePtr shaderModule;
 
 			auto directoryModuleResolver = std::make_shared<nzsl::FilesystemModuleResolver>();
 			directoryModuleResolver->RegisterModule(importedSource);
 
 			nzsl::Ast::SanitizeVisitor::Options sanitizeOpt;
 			sanitizeOpt.moduleResolver = directoryModuleResolver;
 
+			shaderModule = nzsl::Parse(wildcardImportSource);
 			CHECK_THROWS_WITH(nzsl::Ast::Sanitize(*shaderModule, sanitizeOpt), "(5,1 -> 21): CModuleFeatureMismatch error: module Module requires feature primitive_externals");
+
+			std::string_view nonExistentImportShaderSource = R"(
+[nzsl_version("1.0")]
+[feature(primitive_externals)]
+module;
+
+import Foo from Module;
+)";
+
+			shaderModule = nzsl::Parse(nonExistentImportShaderSource);
+			CHECK_THROWS_WITH(nzsl::Ast::Sanitize(*shaderModule, sanitizeOpt), "(6,1 -> 23): CImportIdentifierNotFound error: identifier Foo not found in module Module");
 		}
 
 		/************************************************************************/