Shader: Improve attribute source location

include/Nazara/Shader/Ast/AstCloner.hpp

@@ -11,7 +11,7 @@
 #include <Nazara/Shader/Config.hpp>
 #include <Nazara/Shader/Ast/AstExpressionVisitor.hpp>
 #include <Nazara/Shader/Ast/AstStatementVisitor.hpp>
-#include <Nazara/Shader/Ast/Attribute.hpp>
+#include <Nazara/Shader/Ast/ExpressionValue.hpp>
 #include <vector>
 
 namespace Nz::ShaderAst

include/Nazara/Shader/Ast/AstCompare.hpp

@@ -10,7 +10,7 @@
 #include <Nazara/Prerequisites.hpp>
 #include <Nazara/Shader/Config.hpp>
 #include <Nazara/Shader/ShaderLangSourceLocation.hpp>
-#include <Nazara/Shader/Ast/Attribute.hpp>
+#include <Nazara/Shader/Ast/ExpressionValue.hpp>
 #include <Nazara/Shader/Ast/Module.hpp>
 #include <vector>
 

include/Nazara/Shader/Ast/ExpressionType.hpp

@@ -9,8 +9,8 @@
 
 #include <Nazara/Prerequisites.hpp>
 #include <Nazara/Shader/ShaderLangSourceLocation.hpp>
-#include <Nazara/Shader/Ast/Attribute.hpp>
 #include <Nazara/Shader/Ast/Enums.hpp>
+#include <Nazara/Shader/Ast/ExpressionValue.hpp>
 #include <Nazara/Utility/Enums.hpp>
 #include <optional>
 #include <string>

include/Nazara/Shader/Ast/ExpressionValue.hpp

@@ -4,13 +4,11 @@
 
 #pragma once
 
-#ifndef NAZARA_SHADER_AST_ATTRIBUTE_HPP
-#define NAZARA_SHADER_AST_ATTRIBUTE_HPP
+#ifndef NAZARA_SHADER_AST_EXPRESSIONVALUE_HPP
+#define NAZARA_SHADER_AST_EXPRESSIONVALUE_HPP
 
 #include <Nazara/Prerequisites.hpp>
 #include <Nazara/Shader/Ast/Enums.hpp>
-#include <memory>
-#include <optional>
 #include <variant>
 
 namespace Nz::ShaderAst
@@ -47,16 +45,8 @@ namespace Nz::ShaderAst
 		private:
 			std::variant<std::monostate, T, ExpressionPtr> m_value;
 	};
-
-	struct ExprValue
-	{
-		using Param = std::optional<ExpressionPtr>;
-
-		AttributeType type;
-		Param args;
-	};
 }
 
-#include <Nazara/Shader/Ast/Attribute.inl>
+#include <Nazara/Shader/Ast/ExpressionValue.inl>
 
-#endif // NAZARA_SHADER_AST_ATTRIBUTE_HPP
+#endif // NAZARA_SHADER_AST_EXPRESSIONVALUE_HPP

include/Nazara/Shader/Ast/ExpressionValue.inl

@@ -2,7 +2,7 @@
 // This file is part of the "Nazara Engine - Shader module"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
-#include <Nazara/Shader/Ast/Attribute.hpp>
+#include <Nazara/Shader/Ast/ExpressionValue.hpp>
 #include <cassert>
 #include <stdexcept>
 #include <Nazara/Shader/Debug.hpp>

include/Nazara/Shader/Ast/Nodes.hpp

@@ -13,10 +13,10 @@
 #include <Nazara/Math/Vector4.hpp>
 #include <Nazara/Shader/Config.hpp>
 #include <Nazara/Shader/ShaderLangSourceLocation.hpp>
-#include <Nazara/Shader/Ast/Attribute.hpp>
 #include <Nazara/Shader/Ast/ConstantValue.hpp>
 #include <Nazara/Shader/Ast/Enums.hpp>
 #include <Nazara/Shader/Ast/ExpressionType.hpp>
+#include <Nazara/Shader/Ast/ExpressionValue.hpp>
 #include <array>
 #include <memory>
 #include <optional>