Updated Pipe

Author: muit

Extern/Pipe

@@ -77,7 +77,7 @@ namespace rift::ast
 	struct CExprCallId : public CExpression
 	{
 		using Super = CExpression;
-		P_STRUCT(CExprCallId, p::TF_NotSerialized)
+		P_STRUCT(CExprCallId, p::TF_NotSerialized || p::TF_ECS_AutoModify)
 
 		// Id pointing to the function declaration
 		P_PROP(functionId)

Libs/AST/Include/AST/Components/Expressions.h

@@ -4,6 +4,7 @@
 #include "AST/Components/CFileRef.h"
 #include "AST/Components/Expressions.h"
 
+#include <PipeECS.h>
 #include <PipeReflect.h>
 
 
@@ -17,11 +18,9 @@ namespace rift::ast
 		P_STRUCT(TDirty<T>, p::TF_NotSerialized)
 	};
 
-	using CDirty = TDirty<void>;
+	using CDirty = p::CMdfd<void>;
 
 	// Marks a type as dirty, meaning is has been modified
-	using CFileDirty = TDirty<CFileRef>;
+	using CFileDirty = p::CMdfd<CFileRef>;
 
-	// Marks a type as dirty, meaning is has been modified
-	using CCallDirty = TDirty<CExprCallId>;
 }    // namespace rift::ast

Libs/AST/Include/AST/Components/Tags/CDirty.h

@@ -22,17 +22,16 @@ namespace rift::ast::FunctionsSystem
 	{};
 
 	void Init(Tree& ast);
-	void ResolveCallFunctionIds(
-	    p::TAccessRef<p::TWrite<CExprCallId>, CExprCall, CDeclFunction, CNamespace, CParent, CChild>
-	        access);
-	void PushInvalidPinsBack(
-	    p::TAccessRef<p::TWrite<CExprInputs>, p::TWrite<CExprOutputs>, CInvalid> access);
+	void ResolveCallFunctionIds(p::TIdScopeRef<p::Writes<CExprCallId>, CExprCall, CDeclFunction,
+	    CNamespace, CParent, CChild>
+	        scope);
+	void PushInvalidPinsBack(p::TIdScopeRef<p::Writes<CExprInputs, CExprOutputs>, CInvalid> scope);
 
 	// Marks calls referencing dirty functions as dirty theirselfs
 	void PropagateDirtyIntoCalls(Tree& ast);
 	void SyncCallPinsFromFunction(Tree& ast);
-	using InvalidDisconnectedPinAccess = p::TAccessRef<CInvalid, CExprInputs,
-	    p::TWrite<CTmpInvalidKeep>, p::TWrite<CChild>, p::TWrite<CParent>>;
-	void RemoveInvalidDisconnectedArgs(InvalidDisconnectedPinAccess access);
+	using InvalidDisconnectedPinAccess =
+	    p::TIdScopeRef<p::Writes<CTmpInvalidKeep, CChild, CParent>, CInvalid, CExprInputs>;
+	void RemoveInvalidDisconnectedArgs(InvalidDisconnectedPinAccess scope);
 	void ClearAddedTags(Tree& ast);
 }    // namespace rift::ast::FunctionsSystem

Libs/AST/Include/AST/Systems/FunctionsSystem.h

@@ -41,7 +41,7 @@ namespace rift::ast::LoadSystem
 	    Tree& ast, p::TView<ModuleTypePaths> pathsByModule, p::TArray<Id>& ids);
 
 	void LoadFileStrings(
-	    p::TAccessRef<CFileRef> access, p::TView<Id> nodes, p::TArray<p::String>& strings);
+	    p::TIdScopeRef<CFileRef> scope, p::TView<Id> nodes, p::TArray<p::String>& strings);
 
 	void DeserializeModules(Tree& ast, p::TView<Id> moduleIds, p::TView<p::String> strings);
 	void DeserializeTypes(Tree& ast, p::TView<Id> typeIds, p::TView<p::String> strings);

Libs/AST/Include/AST/Systems/LoadSystem.h

@@ -17,14 +17,14 @@ namespace rift::ast::TypeSystem
 {
 	void Init(Tree& ast);
 
-	using PropagateVariableTypesAccess =
-	    p::TAccessRef<CExprDeclRefId, CDeclVariable, p::TWrite<CExprTypeId>>;
-	void PropagateVariableTypes(PropagateVariableTypesAccess access);
+	using PropagateVariableTypesScope =
+	    p::TIdScopeRef<p::Writes<CExprTypeId>, CExprDeclRefId, CDeclVariable>;
+	void PropagateVariableTypes(PropagateVariableTypesScope scope);
 
-	using PropagateExpressionTypesAccess = p::TAccessRef<CDeclType, CChanged, CExprInputs,
-	    CExprOutputs, p::TWrite<CExprTypeId>, CExprUnaryOperator, CExprBinaryOperator, p::CParent>;
-	void PropagateExpressionTypes(PropagateExpressionTypesAccess access);
+	using PropagateExpressionTypesScope = p::TIdScopeRef<p::Writes<CExprTypeId>, CDeclType,
+	    CChanged, CExprInputs, CExprOutputs, CExprUnaryOperator, CExprBinaryOperator, p::CParent>;
+	void PropagateExpressionTypes(PropagateExpressionTypesScope scope);
 
 	void ResolveExprTypeIds(
-	    p::TAccessRef<p::TWrite<CExprTypeId>, CExprType, CNamespace, p::CParent, p::CChild> access);
+	    p::TIdScopeRef<p::Writes<CExprTypeId>, CExprType, CNamespace, p::CParent, p::CChild> scope);
 }    // namespace rift::ast::TypeSystem

Libs/AST/Include/AST/Systems/TypeSystem.h

@@ -29,7 +29,7 @@ namespace rift::ast
 	};
 
 
-	struct Tree : public p::EntityContext
+	struct Tree : public p::IdContext
 	{
 	private:
 		static p::TBroadcast<Tree&> onInit;

Libs/AST/Include/AST/Tree.h

@@ -13,10 +13,10 @@
 // NOTE: In expression graphs, the Link Id is the Input Pin Id
 namespace rift::ast
 {
-	bool CanConnectExpr(p::TAccessRef<CExprInputs, CExprOutputs, CExprTypeId> access,
+	bool CanConnectExpr(p::TIdScopeRef<CExprInputs, CExprOutputs, CExprTypeId> scope,
 	    ExprOutput output, ExprInput input);
 
-	bool TryConnectExpr(p::TAccessRef<p::TWrite<CExprInputs>, CExprOutputs, CExprTypeId> access,
+	bool TryConnectExpr(p::TIdScopeRef<p::Writes<CExprInputs>, CExprOutputs, CExprTypeId> scope,
 	    ExprOutput output, ExprInput input);
 	// Disconnects a particular link. (Note: link ids are the same as input nodes)
 	bool DisconnectExpr(Tree& ast, ExprInput input);
@@ -29,10 +29,10 @@ namespace rift::ast
 	 */
 	void DisconnectAllExprDeep(Tree& ast, p::TView<const Id> ids, bool ignoreRoot = false);
 
-	bool RemoveExprInputPin(p::TAccessRef<CExprInputs, p::TWrite<CInvalid>> access, ExprInput id);
+	bool RemoveExprInputPin(p::TIdScopeRef<p::Writes<CInvalid>, CExprInputs> scope, ExprInput id);
 	bool RemoveExprOutputPin(
-	    p::TAccessRef<CExprOutputs, p::TWrite<CInvalid>> access, ExprOutput id);
+	    p::TIdScopeRef<p::Writes<CInvalid>, CExprOutputs> scope, ExprOutput id);
 
-	ExprInput GetExprInputFromPin(p::TAccessRef<CExprInputs, CChild> access, Id pinId);
-	ExprOutput GetExprOutputFromPin(p::TAccessRef<CExprOutputs, CChild> access, Id pinId);
+	ExprInput GetExprInputFromPin(p::TIdScopeRef<CExprInputs, CChild> scope, Id pinId);
+	ExprOutput GetExprOutputFromPin(p::TIdScopeRef<CExprOutputs, CChild> scope, Id pinId);
 }    // namespace rift::ast

Libs/AST/Include/AST/Utils/Expressions.h

@@ -45,19 +45,19 @@ namespace rift::ast
 
 	Id CreateModule(Tree& ast, p::StringView path);
 
-	Id GetProjectId(p::TAccessRef<CProject> access);
+	Id GetProjectId(p::TIdScopeRef<CProject> scope);
 
-	p::Tag GetProjectName(p::TAccessRef<CProject, CNamespace, CFileRef> access);
-	p::StringView GetProjectPath(p::TAccessRef<CFileRef, CProject> access);
-	CModule* GetProjectModule(p::TAccessRef<CProject, p::TWrite<CModule>> access);
+	p::Tag GetProjectName(p::TIdScopeRef<CProject, CNamespace, CFileRef> scope);
+	p::StringView GetProjectPath(p::TIdScopeRef<CFileRef, CProject> scope);
+	CModule* GetProjectModule(p::TIdScopeRef<p::Writes<CModule>, CProject> scope);
 
 	bool HasProject(Tree& ast);
 
 	// Resolve a module's name
-	p::Tag GetModuleName(p::TAccessRef<CNamespace, CFileRef> access, Id moduleId);
+	p::Tag GetModuleName(p::TIdScopeRef<CNamespace, CFileRef> scope, Id moduleId);
 
 	// Resolve a module's name
-	p::StringView GetModulePath(p::TAccessRef<CFileRef> access, Id moduleId);
+	p::StringView GetModulePath(p::TIdScopeRef<CFileRef> scope, Id moduleId);
 
 	void SerializeModule(ast::Tree& ast, ast::Id id, p::String& data);
 	void DeserializeModule(ast::Tree& ast, ast::Id id, const p::String& data);

Libs/AST/Include/AST/Utils/ModuleUtils.h

@@ -12,22 +12,22 @@
 
 namespace rift::ast
 {
-	Namespace GetNamespace(p::TAccessRef<CNamespace, CChild, CModule> access, Id id);
-	Namespace GetParentNamespace(p::TAccessRef<CNamespace, CChild, CModule> access, Id id);
+	Namespace GetNamespace(p::TIdScopeRef<CNamespace, CChild, CModule> scope, Id id);
+	Namespace GetParentNamespace(p::TIdScopeRef<CNamespace, CChild, CModule> scope, Id id);
 
 	/**
 	 * Find an id from a given namespace
-	 * @param access access to the needed components
+	 * @param scope scope to the needed components
 	 * @param ns namespace to find the id to
 	 * @param rootIds entity ids. If nullptr, roots are resolved from ecs context.
 	 * @return Id found or NoId
 	 */
-	Id FindIdFromNamespace(p::TAccessRef<CNamespace, CChild, CParent> access, const Namespace& ns,
+	Id FindIdFromNamespace(p::TIdScopeRef<CNamespace, CChild, CParent> scope, const Namespace& ns,
 	    const p::TArray<Id>* rootIds = nullptr);
 
-	p::Tag GetName(p::TAccessRef<CNamespace> access, Id id);
-	p::Tag GetNameUnsafe(p::TAccessRef<CNamespace> access, Id id);
-	p::String GetFullName(p::TAccessRef<CNamespace, CChild, CModule> access, Id id,
+	p::Tag GetName(p::TIdScopeRef<CNamespace> scope, Id id);
+	p::Tag GetNameUnsafe(p::TIdScopeRef<CNamespace> scope, Id id);
+	p::String GetFullName(p::TIdScopeRef<CNamespace, CChild, CModule> scope, Id id,
 	    bool localNamespace = false, char separator = '.');
 }    // namespace rift::ast