t

Author: SirLynix

include/NZSL/Ast/ExpressionType.hpp

@@ -241,7 +241,7 @@ namespace nzsl::Ast
 		std::string name;
 		std::string tag;
 		std::vector<StructMember> members;
-		bool isConditional = false;
+		unsigned int conditionIndex = 0;
 	};
 
 	inline bool IsAliasType(const ExpressionType& type);

include/NZSL/Ast/SanitizeVisitor.hpp

@@ -227,7 +227,7 @@ namespace nzsl::Ast
 			{
 				std::size_t index;
 				IdentifierCategory category;
-				bool isConditional = false;
+				unsigned int conditionalIndex = 0;
 			};
 
 			struct Identifier

src/NZSL/Ast/SanitizeVisitor.cpp

@@ -185,7 +185,7 @@ namespace nzsl::Ast
 
 		struct UsedExternalData
 		{
-			bool isConditional;
+			unsigned int conditionalStatementIndex;
 		};
 
 		static constexpr std::size_t ModuleIdSentinel = std::numeric_limits<std::size_t>::max();
@@ -212,8 +212,9 @@ namespace nzsl::Ast
 		Options options;
 		FunctionData* currentFunction = nullptr;
 		bool allowUnknownIdentifiers = false;
-		bool inConditionalStatement = false;
 		bool inLoop = false;
+		unsigned int conditionalStatementIndex = 0;
+		unsigned int nextConditionalIndex = 1;
 	};
 
 	ModulePtr SanitizeVisitor::Sanitize(const Module& module, const Options& options, std::string* error)
@@ -447,7 +448,7 @@ namespace nzsl::Ast
 
 				if (!fieldPtr)
 				{
-					if (s->isConditional)
+					if (s->conditionIndex != m_context->conditionalStatementIndex)
 						return Cloner::Clone(node); //< unresolved
 
 					throw CompilerUnknownFieldError{ indexedExpr->sourceLocation, identifierEntry.identifier };
@@ -1354,9 +1355,9 @@ namespace nzsl::Ast
 
 		if (!conditionValue.has_value())
 		{
-			bool wasInConditionalStatement = m_context->inConditionalStatement;
-			m_context->inConditionalStatement = true;
-			Nz::CallOnExit restoreCond([=] { m_context->inConditionalStatement = wasInConditionalStatement; });
+			unsigned int prevCondStatementIndex = m_context->conditionalStatementIndex;
+			m_context->conditionalStatementIndex = m_context->nextConditionalIndex++;
+			Nz::CallOnExit restoreCond([=] { m_context->conditionalStatementIndex = prevCondStatementIndex; });
 
 			// Unresolvable condition
 			auto condStatement = ShaderBuilder::ConditionalStatement(std::move(cloneCondition), Cloner::Clone(*node.statement));
@@ -1447,7 +1448,7 @@ namespace nzsl::Ast
 				std::uint64_t bindingKey = BuildBindingKey(bindingSet, bindingIndex + i);
 				if (auto it = m_context->usedBindingIndexes.find(bindingKey); it != m_context->usedBindingIndexes.end())
 				{
-					if (!it->second.isConditional || !usedBindingData.isConditional)
+					if (it->second.conditionalStatementIndex == m_context->conditionalStatementIndex || usedBindingData.conditionalStatementIndex == m_context->conditionalStatementIndex)
 						throw CompilerExtBindingAlreadyUsedError{ sourceLoc, bindingSet, bindingIndex };
 				}
 
@@ -1462,11 +1463,11 @@ namespace nzsl::Ast
 			auto& extVar = clone->externalVars[i];
 
 			Context::UsedExternalData usedBindingData;
-			usedBindingData.isConditional = m_context->inConditionalStatement;
+			usedBindingData.conditionalStatementIndex = m_context->conditionalStatementIndex;
 
 			if (auto it = m_context->declaredExternalVar.find(extVar.name); it != m_context->declaredExternalVar.end())
 			{
-				if (!it->second.isConditional || !usedBindingData.isConditional)
+				if (it->second.conditionalStatementIndex == m_context->conditionalStatementIndex || usedBindingData.conditionalStatementIndex == m_context->conditionalStatementIndex)
 					throw CompilerExtAlreadyDeclaredError{ extVar.sourceLocation, extVar.name };
 			}
 
@@ -1586,7 +1587,7 @@ namespace nzsl::Ast
 					bindingIndex++;
 
 				Context::UsedExternalData usedBindingData;
-				usedBindingData.isConditional = m_context->inConditionalStatement;
+				usedBindingData.conditionalStatementIndex = m_context->conditionalStatementIndex;
 
 				extVar.bindingIndex = bindingIndex;
 				RegisterBinding(arraySize, bindingSet, bindingIndex, usedBindingData, extVar.sourceLocation);
@@ -1912,7 +1913,7 @@ namespace nzsl::Ast
 			}
 		}
 
-		clone->description.isConditional = m_context->inConditionalStatement;
+		clone->description.conditionIndex = m_context->conditionalStatementIndex;
 
 		clone->structIndex = RegisterStruct(clone->description.name, &clone->description, clone->structIndex, clone->sourceLocation);
 		SanitizeIdentifier(clone->description.name, IdentifierScope::Struct);
@@ -3547,7 +3548,7 @@ namespace nzsl::Ast
 		bool unresolved = false;
 		if (const IdentifierData* identifierData = FindIdentifier(name))
 		{
-			if (!m_context->inConditionalStatement || !identifierData->isConditional)
+			if (identifierData->conditionalIndex == m_context->conditionalStatementIndex)
 				throw CompilerIdentifierAlreadyUsedError{ sourceLocation, name };
 			else
 				unresolved = true;
@@ -3571,7 +3572,7 @@ namespace nzsl::Ast
 				{
 					aliasIndex,
 					IdentifierCategory::Alias,
-					m_context->inConditionalStatement
+					m_context->conditionalStatementIndex
 				}
 			});
 		}
@@ -3602,7 +3603,7 @@ namespace nzsl::Ast
 			{
 				constantIndex,
 				IdentifierCategory::Constant,
-				m_context->inConditionalStatement
+				m_context->conditionalStatementIndex
 			}
 		});
 
@@ -3654,7 +3655,7 @@ namespace nzsl::Ast
 			{
 				functionIndex,
 				IdentifierCategory::Function,
-				m_context->inConditionalStatement
+				m_context->conditionalStatementIndex
 			}
 		});
 
@@ -3673,7 +3674,7 @@ namespace nzsl::Ast
 			{
 				intrinsicIndex,
 				IdentifierCategory::Intrinsic,
-				m_context->inConditionalStatement
+				m_context->conditionalStatementIndex
 			}
 		});
 
@@ -3692,7 +3693,7 @@ namespace nzsl::Ast
 			{
 				moduleIndex,
 				IdentifierCategory::Module,
-				m_context->inConditionalStatement
+				m_context->conditionalStatementIndex
 			}
 		});
 
@@ -3706,7 +3707,7 @@ namespace nzsl::Ast
 			{
 				std::numeric_limits<std::size_t>::max(),
 				IdentifierCategory::ReservedName,
-				m_context->inConditionalStatement
+				m_context->conditionalStatementIndex
 			}
 		});
 	}
@@ -3716,7 +3717,7 @@ namespace nzsl::Ast
 		bool unresolved = false;
 		if (const IdentifierData* identifierData = FindIdentifier(name))
 		{
-			if (!m_context->inConditionalStatement || !identifierData->isConditional)
+			if (identifierData->conditionalIndex == m_context->conditionalStatementIndex)
 				throw CompilerIdentifierAlreadyUsedError{ sourceLocation, name };
 			else
 				unresolved = true;
@@ -3740,7 +3741,7 @@ namespace nzsl::Ast
 				{
 					structIndex,
 					IdentifierCategory::Struct,
-					m_context->inConditionalStatement
+					m_context->conditionalStatementIndex
 				}
 			});
 		}
@@ -3771,7 +3772,7 @@ namespace nzsl::Ast
 			{
 				typeIndex,
 				IdentifierCategory::Type,
-				m_context->inConditionalStatement
+				m_context->conditionalStatementIndex
 			}
 		});
 
@@ -3805,7 +3806,7 @@ namespace nzsl::Ast
 			{
 				typeIndex,
 				IdentifierCategory::Type,
-				m_context->inConditionalStatement
+				m_context->conditionalStatementIndex
 			}
 		});
 
@@ -3819,7 +3820,7 @@ namespace nzsl::Ast
 			{
 				std::numeric_limits<std::size_t>::max(),
 				IdentifierCategory::Unresolved,
-				m_context->inConditionalStatement
+				m_context->conditionalStatementIndex
 			}
 		});
 	}
@@ -3832,7 +3833,8 @@ namespace nzsl::Ast
 			// Allow variable shadowing
 			if (identifier->category != IdentifierCategory::Variable)
 				throw CompilerIdentifierAlreadyUsedError{ sourceLocation, name };
-			else if (identifier->isConditional && m_context->inConditionalStatement)
+
+			if (identifier->conditionalIndex != m_context->conditionalStatementIndex)
 				unresolved = true; //< right variable isn't know from this point
 		}
 
@@ -3854,7 +3856,7 @@ namespace nzsl::Ast
 				{
 					varIndex,
 					IdentifierCategory::Variable,
-					m_context->inConditionalStatement
+					m_context->conditionalStatementIndex
 				}
 			});
 		}

tests/src/Tests/ShaderUtils.cpp

@@ -294,7 +294,6 @@ void ExpectGLSL(nzsl::ShaderStageType stageType, const nzsl::Ast::Module& shader
 
 void ExpectGLSL(const nzsl::Ast::Module& shaderModule, std::string_view expectedOutput, const nzsl::ShaderWriter::States& options, const nzsl::GlslWriter::Environment& env, bool testShaderCompilation)
 {
-
 	// Retrieve entry-point to get shader type
 	std::optional<nzsl::ShaderStageType> entryShaderStage;