diff --git a/include/Nazara/Shader/Ast/AstCloner.hpp b/include/Nazara/Shader/Ast/AstCloner.hpp index 809c03f25..ef4b50670 100644 --- a/include/Nazara/Shader/Ast/AstCloner.hpp +++ b/include/Nazara/Shader/Ast/AstCloner.hpp @@ -36,8 +36,8 @@ namespace Nz::ShaderAst virtual ExpressionPtr CloneExpression(Expression& expr); virtual StatementPtr CloneStatement(Statement& statement); - virtual ExpressionPtr Clone(AccessMemberIdentifierExpression& node); - virtual ExpressionPtr Clone(AccessMemberIndexExpression& node); + virtual ExpressionPtr Clone(AccessIdentifierExpression& node); + virtual ExpressionPtr Clone(AccessIndexExpression& node); virtual ExpressionPtr Clone(AssignExpression& node); virtual ExpressionPtr Clone(BinaryExpression& node); virtual ExpressionPtr Clone(CallFunctionExpression& node); diff --git a/include/Nazara/Shader/Ast/AstNodeList.hpp b/include/Nazara/Shader/Ast/AstNodeList.hpp index f68fe4276..37f694d5d 100644 --- a/include/Nazara/Shader/Ast/AstNodeList.hpp +++ b/include/Nazara/Shader/Ast/AstNodeList.hpp @@ -26,8 +26,8 @@ #define NAZARA_SHADERAST_STATEMENT_LAST(X) NAZARA_SHADERAST_STATEMENT(X) #endif -NAZARA_SHADERAST_EXPRESSION(AccessMemberIdentifierExpression) -NAZARA_SHADERAST_EXPRESSION(AccessMemberIndexExpression) +NAZARA_SHADERAST_EXPRESSION(AccessIdentifierExpression) +NAZARA_SHADERAST_EXPRESSION(AccessIndexExpression) NAZARA_SHADERAST_EXPRESSION(AssignExpression) NAZARA_SHADERAST_EXPRESSION(BinaryExpression) NAZARA_SHADERAST_EXPRESSION(CallFunctionExpression) diff --git a/include/Nazara/Shader/Ast/AstRecursiveVisitor.hpp b/include/Nazara/Shader/Ast/AstRecursiveVisitor.hpp index 13a78ce1c..5b1428633 100644 --- a/include/Nazara/Shader/Ast/AstRecursiveVisitor.hpp +++ b/include/Nazara/Shader/Ast/AstRecursiveVisitor.hpp @@ -20,8 +20,8 @@ namespace Nz::ShaderAst AstRecursiveVisitor() = default; ~AstRecursiveVisitor() = default; - void Visit(AccessMemberIdentifierExpression& node) override; - void Visit(AccessMemberIndexExpression& node) override; + void Visit(AccessIdentifierExpression& node) override; + void Visit(AccessIndexExpression& node) override; void Visit(AssignExpression& node) override; void Visit(BinaryExpression& node) override; void Visit(CallFunctionExpression& node) override; diff --git a/include/Nazara/Shader/Ast/AstSerializer.hpp b/include/Nazara/Shader/Ast/AstSerializer.hpp index 20af6f2b4..932f7991a 100644 --- a/include/Nazara/Shader/Ast/AstSerializer.hpp +++ b/include/Nazara/Shader/Ast/AstSerializer.hpp @@ -23,8 +23,8 @@ namespace Nz::ShaderAst AstSerializerBase(AstSerializerBase&&) = delete; ~AstSerializerBase() = default; - void Serialize(AccessMemberIdentifierExpression& node); - void Serialize(AccessMemberIndexExpression& node); + void Serialize(AccessIdentifierExpression& node); + void Serialize(AccessIndexExpression& node); void Serialize(AssignExpression& node); void Serialize(BinaryExpression& node); void Serialize(CallFunctionExpression& node); diff --git a/include/Nazara/Shader/Ast/AstUtils.hpp b/include/Nazara/Shader/Ast/AstUtils.hpp index 560e482b6..e020c10ed 100644 --- a/include/Nazara/Shader/Ast/AstUtils.hpp +++ b/include/Nazara/Shader/Ast/AstUtils.hpp @@ -31,8 +31,8 @@ namespace Nz::ShaderAst private: using AstExpressionVisitor::Visit; - void Visit(AccessMemberIdentifierExpression& node) override; - void Visit(AccessMemberIndexExpression& node) override; + void Visit(AccessIdentifierExpression& node) override; + void Visit(AccessIndexExpression& node) override; void Visit(AssignExpression& node) override; void Visit(BinaryExpression& node) override; void Visit(CallFunctionExpression& node) override; diff --git a/include/Nazara/Shader/Ast/Nodes.hpp b/include/Nazara/Shader/Ast/Nodes.hpp index 28ba5cd0e..5d06cd862 100644 --- a/include/Nazara/Shader/Ast/Nodes.hpp +++ b/include/Nazara/Shader/Ast/Nodes.hpp @@ -64,21 +64,21 @@ namespace Nz::ShaderAst std::optional cachedExpressionType; }; - struct NAZARA_SHADER_API AccessMemberIdentifierExpression : public Expression + struct NAZARA_SHADER_API AccessIdentifierExpression : public Expression { NodeType GetType() const override; void Visit(AstExpressionVisitor& visitor) override; - ExpressionPtr structExpr; + ExpressionPtr expr; std::vector memberIdentifiers; }; - struct NAZARA_SHADER_API AccessMemberIndexExpression : public Expression + struct NAZARA_SHADER_API AccessIndexExpression : public Expression { NodeType GetType() const override; void Visit(AstExpressionVisitor& visitor) override; - ExpressionPtr structExpr; + ExpressionPtr expr; std::vector memberIndices; }; diff --git a/include/Nazara/Shader/Ast/SanitizeVisitor.hpp b/include/Nazara/Shader/Ast/SanitizeVisitor.hpp index 54f67ec7c..54428455c 100644 --- a/include/Nazara/Shader/Ast/SanitizeVisitor.hpp +++ b/include/Nazara/Shader/Ast/SanitizeVisitor.hpp @@ -47,7 +47,7 @@ namespace Nz::ShaderAst using AstCloner::CloneExpression; - ExpressionPtr Clone(AccessMemberIdentifierExpression& node) override; + ExpressionPtr Clone(AccessIdentifierExpression& node) override; ExpressionPtr Clone(AssignExpression& node) override; ExpressionPtr Clone(BinaryExpression& node) override; ExpressionPtr Clone(CallFunctionExpression& node) override; diff --git a/include/Nazara/Shader/GlslWriter.hpp b/include/Nazara/Shader/GlslWriter.hpp index c59422b43..cbe1e58c9 100644 --- a/include/Nazara/Shader/GlslWriter.hpp +++ b/include/Nazara/Shader/GlslWriter.hpp @@ -79,7 +79,7 @@ namespace Nz void Visit(ShaderAst::ExpressionPtr& expr, bool encloseIfRequired = false); - void Visit(ShaderAst::AccessMemberIndexExpression& node) override; + void Visit(ShaderAst::AccessIndexExpression& node) override; void Visit(ShaderAst::AssignExpression& node) override; void Visit(ShaderAst::BinaryExpression& node) override; void Visit(ShaderAst::CallFunctionExpression& node) override; diff --git a/include/Nazara/Shader/LangWriter.hpp b/include/Nazara/Shader/LangWriter.hpp index fac98f803..a3fc8f7f1 100644 --- a/include/Nazara/Shader/LangWriter.hpp +++ b/include/Nazara/Shader/LangWriter.hpp @@ -80,7 +80,7 @@ namespace Nz void Visit(ShaderAst::ExpressionPtr& expr, bool encloseIfRequired = false); - void Visit(ShaderAst::AccessMemberIndexExpression& node) override; + void Visit(ShaderAst::AccessIndexExpression& node) override; void Visit(ShaderAst::AssignExpression& node) override; void Visit(ShaderAst::BinaryExpression& node) override; void Visit(ShaderAst::CastExpression& node) override; diff --git a/include/Nazara/Shader/ShaderBuilder.hpp b/include/Nazara/Shader/ShaderBuilder.hpp index 78a5e114e..cacfec9ed 100644 --- a/include/Nazara/Shader/ShaderBuilder.hpp +++ b/include/Nazara/Shader/ShaderBuilder.hpp @@ -19,12 +19,12 @@ namespace Nz::ShaderBuilder { struct AccessIndex { - inline std::unique_ptr operator()(ShaderAst::ExpressionPtr structExpr, std::vector memberIndices) const; + inline std::unique_ptr operator()(ShaderAst::ExpressionPtr expr, std::vector memberIndices) const; }; struct AccessMember { - inline std::unique_ptr operator()(ShaderAst::ExpressionPtr structExpr, std::vector memberIdentifiers) const; + inline std::unique_ptr operator()(ShaderAst::ExpressionPtr expr, std::vector memberIdentifiers) const; }; struct Assign diff --git a/include/Nazara/Shader/ShaderBuilder.inl b/include/Nazara/Shader/ShaderBuilder.inl index 4cb702f13..bbe87c6a0 100644 --- a/include/Nazara/Shader/ShaderBuilder.inl +++ b/include/Nazara/Shader/ShaderBuilder.inl @@ -7,19 +7,19 @@ namespace Nz::ShaderBuilder { - inline std::unique_ptr Impl::AccessMember::operator()(ShaderAst::ExpressionPtr structExpr, std::vector memberIdentifiers) const + inline std::unique_ptr Impl::AccessMember::operator()(ShaderAst::ExpressionPtr expr, std::vector memberIdentifiers) const { - auto accessMemberNode = std::make_unique(); - accessMemberNode->structExpr = std::move(structExpr); + auto accessMemberNode = std::make_unique(); + accessMemberNode->expr = std::move(expr); accessMemberNode->memberIdentifiers = std::move(memberIdentifiers); return accessMemberNode; } - inline std::unique_ptr Impl::AccessIndex::operator()(ShaderAst::ExpressionPtr structExpr, std::vector memberIndices) const + inline std::unique_ptr Impl::AccessIndex::operator()(ShaderAst::ExpressionPtr expr, std::vector memberIndices) const { - auto accessMemberNode = std::make_unique(); - accessMemberNode->structExpr = std::move(structExpr); + auto accessMemberNode = std::make_unique(); + accessMemberNode->expr = std::move(expr); accessMemberNode->memberIndices = std::move(memberIndices); return accessMemberNode; diff --git a/include/Nazara/Shader/SpirvAstVisitor.hpp b/include/Nazara/Shader/SpirvAstVisitor.hpp index 6b4c123bb..d6301d5f3 100644 --- a/include/Nazara/Shader/SpirvAstVisitor.hpp +++ b/include/Nazara/Shader/SpirvAstVisitor.hpp @@ -41,7 +41,7 @@ namespace Nz using ExpressionVisitorExcept::Visit; using StatementVisitorExcept::Visit; - void Visit(ShaderAst::AccessMemberIndexExpression& node) override; + void Visit(ShaderAst::AccessIndexExpression& node) override; void Visit(ShaderAst::AssignExpression& node) override; void Visit(ShaderAst::BinaryExpression& node) override; void Visit(ShaderAst::BranchStatement& node) override; diff --git a/include/Nazara/Shader/SpirvExpressionLoad.hpp b/include/Nazara/Shader/SpirvExpressionLoad.hpp index b85ccc471..8ad84cb3d 100644 --- a/include/Nazara/Shader/SpirvExpressionLoad.hpp +++ b/include/Nazara/Shader/SpirvExpressionLoad.hpp @@ -30,7 +30,7 @@ namespace Nz UInt32 Evaluate(ShaderAst::Expression& node); using ExpressionVisitorExcept::Visit; - void Visit(ShaderAst::AccessMemberIndexExpression& node) override; + void Visit(ShaderAst::AccessIndexExpression& node) override; void Visit(ShaderAst::VariableExpression& node) override; SpirvExpressionLoad& operator=(const SpirvExpressionLoad&) = delete; diff --git a/include/Nazara/Shader/SpirvExpressionStore.hpp b/include/Nazara/Shader/SpirvExpressionStore.hpp index 097c78560..83c39e8e7 100644 --- a/include/Nazara/Shader/SpirvExpressionStore.hpp +++ b/include/Nazara/Shader/SpirvExpressionStore.hpp @@ -29,7 +29,7 @@ namespace Nz void Store(ShaderAst::ExpressionPtr& node, UInt32 resultId); using ExpressionVisitorExcept::Visit; - void Visit(ShaderAst::AccessMemberIndexExpression& node) override; + void Visit(ShaderAst::AccessIndexExpression& node) override; void Visit(ShaderAst::SwizzleExpression& node) override; void Visit(ShaderAst::VariableExpression& node) override; diff --git a/src/Nazara/Shader/Ast/AstCloner.cpp b/src/Nazara/Shader/Ast/AstCloner.cpp index aa016a304..262cac2de 100644 --- a/src/Nazara/Shader/Ast/AstCloner.cpp +++ b/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(); + auto clone = std::make_unique(); 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(); + auto clone = std::make_unique(); clone->memberIndices = node.memberIndices; - clone->structExpr = CloneExpression(node.structExpr); + clone->expr = CloneExpression(node.expr); clone->cachedExpressionType = node.cachedExpressionType; diff --git a/src/Nazara/Shader/Ast/AstRecursiveVisitor.cpp b/src/Nazara/Shader/Ast/AstRecursiveVisitor.cpp index 6c2c68823..a26867a2e 100644 --- a/src/Nazara/Shader/Ast/AstRecursiveVisitor.cpp +++ b/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) diff --git a/src/Nazara/Shader/Ast/AstSerializer.cpp b/src/Nazara/Shader/Ast/AstSerializer.cpp index bcf189ee9..113b0aec3 100644 --- a/src/Nazara/Shader/Ast/AstSerializer.cpp +++ b/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) diff --git a/src/Nazara/Shader/Ast/AstUtils.cpp b/src/Nazara/Shader/Ast/AstUtils.cpp index 798bba828..db9b50895 100644 --- a/src/Nazara/Shader/Ast/AstUtils.cpp +++ b/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*/) diff --git a/src/Nazara/Shader/Ast/SanitizeVisitor.cpp b/src/Nazara/Shader/Ast/SanitizeVisitor.cpp index d9cbef23b..01716f1f5 100644 --- a/src/Nazara/Shader/Ast/SanitizeVisitor.cpp +++ b/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(); - accessMemberIndex->structExpr = std::move(structExpr); + // Transform to AccessIndexExpression + auto accessMemberIndex = std::make_unique(); + accessMemberIndex->expr = std::move(structExpr); StackArray structIndices = NazaraStackArrayNoInit(std::size_t, node.memberIdentifiers.size()); diff --git a/src/Nazara/Shader/GlslWriter.cpp b/src/Nazara/Shader/GlslWriter.cpp index d4829b8f2..455b29a07 100644 --- a/src/Nazara/Shader/GlslWriter.cpp +++ b/src/Nazara/Shader/GlslWriter.cpp @@ -650,11 +650,11 @@ namespace Nz Append(")"); } - void GlslWriter::Visit(ShaderAst::AccessMemberIndexExpression& node) + void GlslWriter::Visit(ShaderAst::AccessIndexExpression& node) { - Visit(node.structExpr, true); + Visit(node.expr, true); - const ShaderAst::ExpressionType& exprType = GetExpressionType(*node.structExpr); + const ShaderAst::ExpressionType& exprType = GetExpressionType(*node.expr); assert(IsStructType(exprType)); AppendField(std::get(exprType).structIndex, node.memberIndices.data(), node.memberIndices.size()); diff --git a/src/Nazara/Shader/LangWriter.cpp b/src/Nazara/Shader/LangWriter.cpp index 6b4182787..2cb3459df 100644 --- a/src/Nazara/Shader/LangWriter.cpp +++ b/src/Nazara/Shader/LangWriter.cpp @@ -438,11 +438,11 @@ namespace Nz Append(")"); } - void LangWriter::Visit(ShaderAst::AccessMemberIndexExpression& node) + void LangWriter::Visit(ShaderAst::AccessIndexExpression& node) { - Visit(node.structExpr, true); + Visit(node.expr, true); - const ShaderAst::ExpressionType& exprType = GetExpressionType(*node.structExpr); + const ShaderAst::ExpressionType& exprType = GetExpressionType(*node.expr); assert(IsStructType(exprType)); AppendField(std::get(exprType).structIndex, node.memberIndices.data(), node.memberIndices.size()); diff --git a/src/Nazara/Shader/ShaderLangParser.cpp b/src/Nazara/Shader/ShaderLangParser.cpp index 470cbed8b..9d605f490 100644 --- a/src/Nazara/Shader/ShaderLangParser.cpp +++ b/src/Nazara/Shader/ShaderLangParser.cpp @@ -816,8 +816,8 @@ namespace Nz::ShaderLang if (currentOp.type == TokenType::Dot) { - std::unique_ptr accessMemberNode = std::make_unique(); - accessMemberNode->structExpr = std::move(lhs); + std::unique_ptr accessMemberNode = std::make_unique(); + accessMemberNode->expr = std::move(lhs); do { @@ -833,7 +833,7 @@ namespace Nz::ShaderLang if (Peek().type == TokenType::OpenParenthesis) { auto parameters = ParseParameters(); - parameters.insert(parameters.begin(), std::move(accessMemberNode->structExpr)); + parameters.insert(parameters.begin(), std::move(accessMemberNode->expr)); lhs = ShaderBuilder::Intrinsic(ShaderAst::IntrinsicType::SampleTexture, std::move(parameters)); continue; diff --git a/src/Nazara/Shader/SpirvAstVisitor.cpp b/src/Nazara/Shader/SpirvAstVisitor.cpp index b8c741fb2..f32035280 100644 --- a/src/Nazara/Shader/SpirvAstVisitor.cpp +++ b/src/Nazara/Shader/SpirvAstVisitor.cpp @@ -35,7 +35,7 @@ namespace Nz return *m_variables[varIndex]; } - void SpirvAstVisitor::Visit(ShaderAst::AccessMemberIndexExpression& node) + void SpirvAstVisitor::Visit(ShaderAst::AccessIndexExpression& node) { SpirvExpressionLoad accessMemberVisitor(m_writer, *this, *m_currentBlock); PushResultId(accessMemberVisitor.Evaluate(node)); diff --git a/src/Nazara/Shader/SpirvExpressionLoad.cpp b/src/Nazara/Shader/SpirvExpressionLoad.cpp index 12c0d2838..d2c59cebe 100644 --- a/src/Nazara/Shader/SpirvExpressionLoad.cpp +++ b/src/Nazara/Shader/SpirvExpressionLoad.cpp @@ -40,9 +40,9 @@ namespace Nz }, m_value); } - void SpirvExpressionLoad::Visit(ShaderAst::AccessMemberIndexExpression& node) + void SpirvExpressionLoad::Visit(ShaderAst::AccessIndexExpression& node) { - node.structExpr->Visit(*this); + node.expr->Visit(*this); const ShaderAst::ExpressionType& exprType = GetExpressionType(node); diff --git a/src/Nazara/Shader/SpirvExpressionStore.cpp b/src/Nazara/Shader/SpirvExpressionStore.cpp index 6015319c0..1298cae3c 100644 --- a/src/Nazara/Shader/SpirvExpressionStore.cpp +++ b/src/Nazara/Shader/SpirvExpressionStore.cpp @@ -37,9 +37,9 @@ namespace Nz }, m_value); } - void SpirvExpressionStore::Visit(ShaderAst::AccessMemberIndexExpression& node) + void SpirvExpressionStore::Visit(ShaderAst::AccessIndexExpression& node) { - node.structExpr->Visit(*this); + node.expr->Visit(*this); const ShaderAst::ExpressionType& exprType = GetExpressionType(node); diff --git a/src/Nazara/Shader/SpirvWriter.cpp b/src/Nazara/Shader/SpirvWriter.cpp index 24784c551..c4182666a 100644 --- a/src/Nazara/Shader/SpirvWriter.cpp +++ b/src/Nazara/Shader/SpirvWriter.cpp @@ -71,7 +71,7 @@ namespace Nz }); } - void Visit(ShaderAst::AccessMemberIndexExpression& node) override + void Visit(ShaderAst::AccessIndexExpression& node) override { AstRecursiveVisitor::Visit(node);