Shader/ShaderAst: Rename AccessMember* to Access*

src/Nazara/Shader/Ast/AstCloner.cpp

@@ -158,22 +158,22 @@ namespace Nz::ShaderAst
 		return clone;
 	}
 
-	ExpressionPtr AstCloner::Clone(AccessMemberIdentifierExpression& node)
+	ExpressionPtr AstCloner::Clone(AccessIdentifierExpression& node)
 	{
-		auto clone = std::make_unique<AccessMemberIdentifierExpression>();
+		auto clone = std::make_unique<AccessIdentifierExpression>();
 		clone->memberIdentifiers = node.memberIdentifiers;
-		clone->structExpr = CloneExpression(node.structExpr);
+		clone->expr = CloneExpression(node.expr);
 
 		clone->cachedExpressionType = node.cachedExpressionType;
 
 		return clone;
 	}
 
-	ExpressionPtr AstCloner::Clone(AccessMemberIndexExpression& node)
+	ExpressionPtr AstCloner::Clone(AccessIndexExpression& node)
 	{
-		auto clone = std::make_unique<AccessMemberIndexExpression>();
+		auto clone = std::make_unique<AccessIndexExpression>();
 		clone->memberIndices = node.memberIndices;
-		clone->structExpr = CloneExpression(node.structExpr);
+		clone->expr = CloneExpression(node.expr);
 
 		clone->cachedExpressionType = node.cachedExpressionType;
 

src/Nazara/Shader/Ast/AstRecursiveVisitor.cpp

@@ -7,14 +7,14 @@
 
 namespace Nz::ShaderAst
 {
-	void AstRecursiveVisitor::Visit(AccessMemberIdentifierExpression& node)
+	void AstRecursiveVisitor::Visit(AccessIdentifierExpression& node)
 	{
-		node.structExpr->Visit(*this);
+		node.expr->Visit(*this);
 	}
 
-	void AstRecursiveVisitor::Visit(AccessMemberIndexExpression& node)
+	void AstRecursiveVisitor::Visit(AccessIndexExpression& node)
 	{
-		node.structExpr->Visit(*this);
+		node.expr->Visit(*this);
 	}
 
 	void AstRecursiveVisitor::Visit(AssignExpression& node)

src/Nazara/Shader/Ast/AstSerializer.cpp

@@ -33,18 +33,18 @@ namespace Nz::ShaderAst
 		};
 	}
 
-	void AstSerializerBase::Serialize(AccessMemberIdentifierExpression& node)
+	void AstSerializerBase::Serialize(AccessIdentifierExpression& node)
 	{
-		Node(node.structExpr);
+		Node(node.expr);
 
 		Container(node.memberIdentifiers);
 		for (std::string& identifier : node.memberIdentifiers)
 			Value(identifier);
 	}
 
-	void AstSerializerBase::Serialize(AccessMemberIndexExpression& node)
+	void AstSerializerBase::Serialize(AccessIndexExpression& node)
 	{
-		Node(node.structExpr);
+		Node(node.expr);
 
 		Container(node.memberIndices);
 		for (std::size_t& identifier : node.memberIndices)

src/Nazara/Shader/Ast/AstUtils.cpp

@@ -13,14 +13,14 @@ namespace Nz::ShaderAst
 		return m_expressionCategory;
 	}
 
-	void ShaderAstValueCategory::Visit(AccessMemberIdentifierExpression& node)
+	void ShaderAstValueCategory::Visit(AccessIdentifierExpression& node)
 	{
-		node.structExpr->Visit(*this);
+		node.expr->Visit(*this);
 	}
 
-	void ShaderAstValueCategory::Visit(AccessMemberIndexExpression& node)
+	void ShaderAstValueCategory::Visit(AccessIndexExpression& node)
 	{
-		node.structExpr->Visit(*this);
+		node.expr->Visit(*this);
 	}
 
 	void ShaderAstValueCategory::Visit(AssignExpression& /*node*/)

src/Nazara/Shader/Ast/SanitizeVisitor.cpp

@@ -116,9 +116,9 @@ namespace Nz::ShaderAst
 			return member.type;
 	}
 
-	ExpressionPtr SanitizeVisitor::Clone(AccessMemberIdentifierExpression& node)
+	ExpressionPtr SanitizeVisitor::Clone(AccessIdentifierExpression& node)
 	{
-		auto structExpr = CloneExpression(MandatoryExpr(node.structExpr));
+		auto structExpr = CloneExpression(MandatoryExpr(node.expr));
 
 		const ExpressionType& exprType = GetExpressionType(*structExpr);
 		if (IsVectorType(exprType))
@@ -177,9 +177,9 @@ namespace Nz::ShaderAst
 			return swizzle;
 		}
 
-		// Transform to AccessMemberIndexExpression
-		auto accessMemberIndex = std::make_unique<AccessMemberIndexExpression>();
-		accessMemberIndex->structExpr = std::move(structExpr);
+		// Transform to AccessIndexExpression
+		auto accessMemberIndex = std::make_unique<AccessIndexExpression>();
+		accessMemberIndex->expr = std::move(structExpr);
 
 		StackArray<std::size_t> structIndices = NazaraStackArrayNoInit(std::size_t, node.memberIdentifiers.size());