Add support for named external block

include/NZSL/Ast/Compare.inl

@@ -524,6 +524,9 @@
 		if (!Compare(lhs.variableId, rhs.variableId, params))
 			return false;
 
+		if (!Compare(lhs.prefix, rhs.prefix, params))
+			return false;
+
 		return true;
 	}
 
@@ -609,6 +612,9 @@
 		if (!Compare(lhs.tag, rhs.tag, params))
 			return false;
 
+		if (!Compare(lhs.name, rhs.name, params))
+			return false;
+
 		if (!Compare(lhs.externalVars, rhs.externalVars, params))
 			return false;
 

include/NZSL/Ast/Nodes.hpp

@@ -242,6 +242,7 @@ namespace nzsl::Ast
 		void Visit(ExpressionVisitor& visitor) override;
 
 		std::size_t variableId;
+		std::string prefix;
 	};
 
 	struct NZSL_API UnaryExpression : Expression
@@ -347,6 +348,7 @@ namespace nzsl::Ast
 			SourceLocation sourceLocation;
 		};
 
+		std::string name;
 		std::string tag;
 		std::vector<ExternalVar> externalVars;
 		ExpressionValue<std::uint32_t> bindingSet;

include/NZSL/Ast/SanitizeVisitor.hpp

@@ -148,6 +148,7 @@ namespace nzsl::Ast
 			std::size_t RegisterIntrinsic(std::string name, IntrinsicType type);
 			std::size_t RegisterModule(std::string moduleIdentifier, std::size_t moduleIndex);
 			void RegisterReservedName(std::string name);
+			void RegisterExternalName(std::string name, const SourceLocation& sourceLocation);
 			std::size_t RegisterStruct(std::string name, std::optional<StructDescription*> description, std::optional<std::size_t> index, const SourceLocation& sourceLocation);
 			std::size_t RegisterType(std::string name, std::optional<ExpressionType> expressionType, std::optional<std::size_t> index, const SourceLocation& sourceLocation);
 			std::size_t RegisterType(std::string name, std::optional<PartialType> partialType, std::optional<std::size_t> index, const SourceLocation& sourceLocation);
@@ -207,6 +208,7 @@ namespace nzsl::Ast
 			{
 				Alias,
 				Constant,
+				External,
 				Function,
 				Intrinsic,
 				Module,

src/NZSL/Ast/Cloner.cpp

@@ -128,6 +128,7 @@ namespace nzsl::Ast
 		clone->autoBinding = Clone(node.autoBinding);
 		clone->bindingSet = Clone(node.bindingSet);
 		clone->tag = node.tag;
+		clone->name = node.name;
 
 		clone->externalVars.reserve(node.externalVars.size());
 		for (const auto& var : node.externalVars)
@@ -593,6 +594,7 @@ namespace nzsl::Ast
 	{
 		auto clone = std::make_unique<VariableValueExpression>();
 		clone->variableId = node.variableId;
+		clone->prefix = node.prefix;
 
 		clone->cachedExpressionType = node.cachedExpressionType;
 		clone->sourceLocation = node.sourceLocation;

src/NZSL/Ast/ReflectVisitor.cpp

@@ -57,7 +57,7 @@ namespace nzsl::Ast
 			for (const auto& extVar : node.externalVars)
 			{
 				if (extVar.varIndex)
-					m_callbacks->onVariableIndex(extVar.name, *extVar.varIndex, extVar.sourceLocation);
+					m_callbacks->onVariableIndex(node.name + extVar.name, *extVar.varIndex, extVar.sourceLocation);
 			}
 		}
 

src/NZSL/Ast/SanitizeVisitor.cpp

@@ -312,11 +312,12 @@
 
 		MandatoryExpr(node.expr, node.sourceLocation);
 
-		// Handle module access (TODO: Add namespace expression?)
+		// Handle module access and named external access (TODO: Add namespace expression?)
 		if (node.expr->GetType() == NodeType::IdentifierExpression && node.identifiers.size() == 1)
 		{
 			auto& identifierExpr = static_cast<IdentifierExpression&>(*node.expr);
 			const IdentifierData* identifierData = FindIdentifier(identifierExpr.identifier);
+
 			if (identifierData && identifierData->category == IdentifierCategory::Module)
 			{
 				std::size_t moduleIndex = m_context->moduleIndices.Retrieve(identifierData->index, node.sourceLocation);
@@ -331,6 +332,17 @@
 					return HandleIdentifier(identifierData, node.identifiers.front().sourceLocation);
 				}
 			}
+
+			if (identifierData && identifierData->category == IdentifierCategory::External)
+			{
+				identifierData = FindIdentifier(identifierExpr.identifier + node.identifiers.front().identifier);
+				if (identifierData)
+				{
+					auto variableValuePtr = HandleIdentifier(identifierData, node.identifiers.front().sourceLocation);
+					static_cast<VariableValueExpression*>(variableValuePtr.get())->prefix = identifierExpr.identifier;
+					return variableValuePtr;
+				}
+			}
 		}
 
 		ExpressionPtr indexedExpr = CloneExpression(node.expr);
@@ -1464,27 +1476,36 @@
 			}
 		};
 
+		if (!clone->name.empty())
+		{
+			RegisterExternalName(clone->name, clone->sourceLocation);
+		}
+
 		bool hasUnresolved = false;
 		Nz::StackVector<std::size_t> autoBindingEntries = NazaraStackVector(std::size_t, clone->externalVars.size());
 		for (std::size_t i = 0; i < clone->externalVars.size(); ++i)
 		{
 			auto& extVar = clone->externalVars[i];
+
+			SanitizeIdentifier(extVar.name, IdentifierScope::ExternalVariable);
+
+			std::string fullName = clone->name + extVar.name;
 
 			Context::UsedExternalData usedBindingData;
 			usedBindingData.conditionalStatementIndex = m_context->currentConditionalIndex;
 
-			if (auto it = m_context->declaredExternalVar.find(extVar.name); it != m_context->declaredExternalVar.end())
+			if (auto it = m_context->declaredExternalVar.find(fullName); it != m_context->declaredExternalVar.end())
 			{
 				if (it->second.conditionalStatementIndex == m_context->currentConditionalIndex || usedBindingData.conditionalStatementIndex == m_context->currentConditionalIndex)
 					throw CompilerExtAlreadyDeclaredError{ extVar.sourceLocation, extVar.name };
 			}
 
-			m_context->declaredExternalVar.emplace(extVar.name, usedBindingData);
+			m_context->declaredExternalVar.emplace(fullName, usedBindingData);
 
 			std::optional<ExpressionType> resolvedType = ResolveTypeExpr(extVar.type, false, node.sourceLocation);
 			if (!resolvedType.has_value())
 			{
-				RegisterUnresolved(extVar.name);
+				RegisterUnresolved(fullName);
 				hasUnresolved = true;
 				continue;
 			}
@@ -1555,8 +1576,7 @@
 			}
 
 			extVar.type = std::move(resolvedType).value();
-			extVar.varIndex = RegisterVariable(extVar.name, std::move(varType), extVar.varIndex, extVar.sourceLocation);
-			SanitizeIdentifier(extVar.name, IdentifierScope::ExternalVariable);
+			extVar.varIndex = RegisterVariable(fullName, std::move(varType), extVar.varIndex, extVar.sourceLocation);
 		}
 
 		// Resolve auto-binding entries when explicit binding are known
@@ -2870,6 +2890,9 @@
 				return Clone(constantExpr); //< Turn ConstantExpression into ConstantValueExpression
 			}
 
+			case IdentifierCategory::External:
+				throw AstUnexpectedIdentifierError{ sourceLocation, "external" };
+
 			case IdentifierCategory::Function:
 			{
 				// Replace IdentifierExpression by FunctionExpression
@@ -3741,6 +3764,20 @@
 		});
 	}
 
+	void SanitizeVisitor::RegisterExternalName(std::string name, const SourceLocation& sourceLocation)
+	{
+		if (!IsIdentifierAvailable(name))
+			throw CompilerIdentifierAlreadyUsedError{ sourceLocation, name };
+
+		m_context->currentEnv->identifiersInScope.push_back({
+			std::move(name),
+			{
+				std::numeric_limits<std::size_t>::max(),
+				IdentifierCategory::External
+			}
+			});
+	}
+
 	std::size_t SanitizeVisitor::RegisterStruct(std::string name, std::optional<StructDescription*> description, std::optional<std::size_t> index, const SourceLocation& sourceLocation)
 	{
 		bool unresolved = false;

src/NZSL/GlslWriter.cpp

@@ -2270,7 +2270,7 @@ namespace nzsl
 					AppendComment("struct tag: " + structInfo.desc->tag);
 			}
 
-			std::string varName = externalVar.name + m_currentState->moduleSuffix;
+			std::string varName = node.name + externalVar.name + m_currentState->moduleSuffix;
 
 			// Layout handling
 			bool hasLayout = false;

src/NZSL/LangWriter.cpp

@@ -1260,6 +1260,11 @@ namespace nzsl
 
 	void LangWriter::Visit(Ast::VariableValueExpression& node)
 	{
+		if (!node.prefix.empty())
+		{
+			Append(node.prefix, '.');
+		}
+
 		AppendIdentifier(m_currentState->variables, node.variableId);
 	}
 
@@ -1366,7 +1371,13 @@ namespace nzsl
 	void LangWriter::Visit(Ast::DeclareExternalStatement& node)
 	{
 		AppendAttributes(true, SetAttribute{ node.bindingSet }, AutoBindingAttribute{ node.autoBinding }, TagAttribute{ node.tag });
-		AppendLine("external");
+		Append("external");
+
+		if (!node.name.empty())
+			Append(" ", node.name);
+
+		AppendLine();
+
 		EnterScope();
 
 		bool first = true;

src/NZSL/Parser.cpp

@@ -708,11 +708,15 @@ namespace nzsl
 		NAZARA_USE_ANONYMOUS_NAMESPACE
 
 		const Token& externalToken = Expect(Advance(), TokenType::External);
-		Expect(Advance(), TokenType::OpenCurlyBracket);
-
+
 		std::unique_ptr<Ast::DeclareExternalStatement> externalStatement = std::make_unique<Ast::DeclareExternalStatement>();
 		externalStatement->sourceLocation = externalToken.location;
 
+		if (const Token& peekToken = Peek(); peekToken.type == TokenType::Identifier)
+			externalStatement->name = ParseIdentifierAsName(nullptr);
+
+		Expect(Advance(), TokenType::OpenCurlyBracket);
+
 		Ast::ExpressionValue<bool> condition;
 
 		for (auto&& attribute : attributes)

src/NZSL/SpirvWriter.cpp

@@ -190,7 +190,7 @@ namespace nzsl
 					ExternalVar& extVarData = extVars[*extVar.varIndex];
 
 					SpirvConstantCache::Variable variable;
-					variable.debugName = extVar.name;
+					variable.debugName = node.name + extVar.name;
 
 					const Ast::ExpressionType& extVarType = extVar.type.GetResultingValue();
 

tests/src/Tests/ErrorsTests.cpp

@@ -636,6 +636,47 @@ fn main()
 }
 )"), "(28,19 -> 28): CFunctionCallUnmatchingParameterType error: function GetValue parameter #0 type mismatch (expected array[struct Inner, 3], got array[uniform[struct Inner], 3])");
 
+		CHECK_THROWS_WITH(Compile(R"(
+[nzsl_version("1.0")]
+module;
+
+external Viewer
+{
+	[tag("Color map")]
+	[binding(0)] tex: sampler2D[f32]
+}
+
+external Viewer
+{
+	[tag("Color map")]
+	[binding(1)] tex2: sampler2D[f32]
+}
+
+[entry(frag)]
+fn main()
+{
+	let value = Viewer.tex.Sample(vec2[f32](0.0, 0.0));
+}
+)"), "(11,1 -> 8): CIdentifierAlreadyUsed error: identifier Viewer is already used");
+
+		CHECK_THROWS_WITH(Compile(R"(
+[nzsl_version("1.0")]
+module;
+
+external Viewer
+{
+	[tag("Color map")]
+	[binding(0)] tex: sampler2D[f32]
+}
+
+[entry(frag)]
+fn main()
+{
+	let Viewer = 0.0;
+	let value = Viewer.tex.Sample(vec2[f32](0.0, 0.0));
+}
+)"), "(14,2 -> 18): CIdentifierAlreadyUsed error: identifier Viewer is already used");
+
 		}
 
 		/************************************************************************/