Updated Pipe

Apps/CLI/Src/main.cpp

@@ -1,5 +1,8 @@
 // Copyright 2015-2023 Piperift - All rights reserved
 
+// #include <Pipe/Memory/NewDelete.h>
+//  Override as first include
+
 #include <AST/Utils/ModuleUtils.h>
 #include <Compiler/Compiler.h>
 #include <Compiler/Utils/BackendUtils.h>

Apps/Editor/Src/main.cpp

@@ -1,5 +1,8 @@
 // Copyright 2015-2023 Piperift - All rights reserved
 
+// #include <Pipe/Memory/NewDelete.h>
+//  Override as first include
+
 #include <Editor.h>
 #include <FrameworkModule.h>
 #include <GraphViewModule.h>

Libs/Backends/LLVM/Compiler/Include/LLVMBackend/LLVMHelpers.h

@@ -12,17 +12,17 @@ namespace rift::LLVM
 {
 	using namespace p::core;
 
-	inline llvm::StringRef ToLLVM(StringView string)
+	inline llvm::StringRef ToLLVM(p::StringView string)
 	{
 		return {string.data(), string.size()};
 	}
-	inline llvm::StringRef ToLLVM(const String& string)
+	inline llvm::StringRef ToLLVM(const p::String& string)
 	{
-		return ToLLVM(StringView{string});
+		return ToLLVM(p::StringView{string});
 	}
 	inline llvm::StringRef ToLLVM(p::Tag name)
 	{
-		return ToLLVM(StringView{name.AsString()});
+		return ToLLVM(p::StringView{name.AsString()});
 	}
 
 	template<typename T>

Libs/Backends/LLVM/Compiler/Src/LLVMBackendModule.cpp

@@ -16,7 +16,6 @@
 #include <NativeBindingModule.h>
 #include <Pipe/Core/Log.h>
 #include <Pipe/Files/Files.h>
-#include <Pipe/Memory/NewDelete.h>
 
 #if LLVM_VERSION_MAJOR >= 14
 #	include <llvm/MC/TargetRegistry.h>

Libs/Bindings/Native/Compiler/Src/NativeBindingModule.cpp

@@ -14,7 +14,6 @@
 #include <AST/Utils/ModuleUtils.h>
 #include <AST/Utils/TypeUtils.h>
 #include <clang-c/Index.h>
-#include <Pipe/Memory/NewDelete.h>
 #include <Pipe/PipeArrays.h>
 #include <Pipe/PipeECS.h>
 

Libs/Editor/Src/Tools/ASTDebugger.cpp

@@ -19,10 +19,10 @@ namespace rift::Editor
 
 	void DrawEntityInspector(AST::Tree& ast, AST::Id entityId, bool* open = nullptr)
 	{
-		String name = "Entity Inspector";
+		p::String name = "Entity Inspector";
 		if (!IsNone(entityId))
-			Strings::FormatTo(name, " (id:{})", entityId);
-		Strings::FormatTo(name, "###Entity Inspector");
+			p::Strings::FormatTo(name, " (id:{})", entityId);
+		p::Strings::FormatTo(name, "###Entity Inspector");
 		UI::Begin(name.c_str(), open);
 		if (IsNone(entityId))
 		{
@@ -40,7 +40,7 @@ namespace rift::Editor
 			}
 
 			void* data = poolInstance.GetPool()->TryGetVoid(entityId);
-			static String typeName;
+			static p::String typeName;
 			typeName = type->GetName();
 
 			ImGuiTreeNodeFlags flags = ImGuiTreeNodeFlags_DefaultOpen;
@@ -92,9 +92,9 @@ namespace rift::Editor
 
 					UI::TableNextColumn();    // Id
 
-					static String idText;
+					static p::String idText;
 					idText.clear();
-					Strings::FormatTo(idText, "{}", it.second);
+					p::Strings::FormatTo(idText, "{}", it.second);
 					UI::Text(idText);
 				}
 
@@ -188,36 +188,36 @@ namespace rift::Editor
 
 	void ASTDebugger::DrawNode(DrawNodeAccess access, AST::Id nodeId, bool showChildren)
 	{
-		static String idText;
+		static p::String idText;
 		idText.clear();
 		if (nodeId == AST::NoId)
 		{
 			idText = "No Id";
 		}
 		else if (auto version = p::GetIdVersion(nodeId); version > 0)
 		{
-			Strings::FormatTo(idText, "{} (v{})", p::GetIdIndex(nodeId), version);
+			p::Strings::FormatTo(idText, "{} (v{})", p::GetIdIndex(nodeId), version);
 		}
 		else
 		{
-			Strings::FormatTo(idText, "{}", p::GetIdIndex(nodeId));
+			p::Strings::FormatTo(idText, "{}", p::GetIdIndex(nodeId));
 		}
 
-		static String name;
+		static p::String name;
 		name.clear();
 		if (const auto* id = access.TryGet<const AST::CNamespace>(nodeId))
 		{
 			name = id->name.AsString();
 		}
 
-		static String path;
+		static p::String path;
 		path.clear();
 		if (const auto* file = access.TryGet<const AST::CFileRef>(nodeId))
 		{
 			path = p::ToString(file->path);
 
-			StringView filename = p::GetFilename(path);
-			Strings::FormatTo(name, name.empty() ? "file: {}" : " (file: {})", filename);
+			p::StringView filename = p::GetFilename(path);
+			p::Strings::FormatTo(name, name.empty() ? "file: {}" : " (file: {})", filename);
 		}
 
 		if (!filter.PassFilter(idText.c_str(), idText.c_str() + idText.size())
@@ -228,9 +228,9 @@ namespace rift::Editor
 
 		ImGui::TableNextRow();
 		ImGui::TableNextColumn();
-		static String inspectLabel;
+		static p::String inspectLabel;
 		inspectLabel.clear();
-		Strings::FormatTo(inspectLabel, ICON_FA_SEARCH "##{}", nodeId);
+		p::Strings::FormatTo(inspectLabel, ICON_FA_SEARCH "##{}", nodeId);
 		UI::PushButtonColor(UI::GetNeutralColor(1));
 		UI::PushTextColor(
 		    selectedNode == nodeId ? UI::whiteTextColor : UI::whiteTextColor.Translucency(0.3f));

Libs/Editor/Src/Tools/MemoryDebugger.cpp

@@ -37,7 +37,7 @@ namespace rift::Editor
 
 			if (UI::BeginChild("Allocations"))
 			{
-				const sizet shown = math::Min<sizet>(10000, stats->allocations.size());
+				const sizet shown = math::Min<sizet>(10000, stats->allocations.Size());
 				for (i32 i = 0; i < shown; ++i)
 				{
 					const auto& allocation = stats->allocations[i];

Libs/Editor/Src/Utils/Widgets.cpp

@@ -7,9 +7,6 @@
 
 namespace rift::Editor
 {
-	using namespace p::core;
-
-
 	void ListTypesFromFilter(p::TAccessRef<AST::CNamespace> access, p::TArray<AST::Id> typeIds,
 	    AST::Id& selectedId, ImGuiTextFilter& searchFilter)
 	{
@@ -23,7 +20,7 @@ namespace rift::Editor
 				continue;
 			}
 
-			UI::PushID(u32(id));
+			UI::PushID(p::u32(id));
 			if (UI::Selectable(name.data(), id == selectedId))
 			{
 				selectedId = id;
@@ -101,7 +98,7 @@ namespace rift::Editor
 		return selectedId != lastId;
 	}
 
-	bool InputLiteralValue(AST::Tree& ast, StringView label, AST::Id literalId)
+	bool InputLiteralValue(AST::Tree& ast, p::StringView label, AST::Id literalId)
 	{
 		return false;
 	}

Libs/Framework/Src/AST/Utils/ModuleUtils.cpp

@@ -19,9 +19,9 @@
 
 namespace rift::AST
 {
-	static p::TArray<ModuleBinding> moduleBindings;
-	TBroadcast<EntityReader&> onReadModulePools;
-	TBroadcast<EntityWriter&> onWriteModulePools;
+	static p::TArray<ModuleBinding> gModuleBindings;
+	TBroadcast<EntityReader&> gOnReadModulePools;
+	TBroadcast<EntityWriter&> gOnWriteModulePools;
 
 
 	bool ValidateModulePath(p::String& path, p::String& error)
@@ -204,7 +204,7 @@ namespace rift::AST
 		JsonFormatWriter writer{};
 		p::EntityWriter w{writer.GetWriter(), ast};
 		w.BeginObject();
-		w.SerializeSingleEntity(id, onWriteModulePools);
+		w.SerializeSingleEntity(id, gOnWriteModulePools);
 
 		data = writer.ToString();
 	}
@@ -217,26 +217,26 @@ namespace rift::AST
 		{
 			p::EntityReader r{formatReader, ast};
 			r.BeginObject();
-			r.SerializeSingleEntity(id, onReadModulePools);
+			r.SerializeSingleEntity(id, gOnReadModulePools);
 		}
 	}
 	const TBroadcast<EntityReader&>& OnReadModulePools()
 	{
-		return onReadModulePools;
+		return gOnReadModulePools;
 	}
 	const TBroadcast<EntityWriter&>& OnWriteModulePools()
 	{
-		return onWriteModulePools;
+		return gOnWriteModulePools;
 	}
 
 
 	void RegisterModuleBinding(ModuleBinding binding)
 	{
-		moduleBindings.AddUniqueSorted(Move(binding));
+		gModuleBindings.AddUniqueSorted(Move(binding));
 	}
 	void UnregisterModuleBinding(p::Tag bindingId)
 	{
-		moduleBindings.RemoveSorted(bindingId);
+		gModuleBindings.RemoveSorted(bindingId);
 	}
 	void AddBindingToModule(AST::Tree& ast, AST::Id id, p::Tag bindingId)
 	{
@@ -255,12 +255,12 @@ namespace rift::AST
 
 	const ModuleBinding* FindModuleBinding(p::Tag id)
 	{
-		const i32 index = moduleBindings.FindSortedEqual(id);
-		return index != NO_INDEX ? moduleBindings.Data() + index : nullptr;
+		const i32 index = gModuleBindings.FindSortedEqual(id);
+		return index != NO_INDEX ? gModuleBindings.Data() + index : nullptr;
 	}
 
 	p::TView<const ModuleBinding> GetModuleBindings()
 	{
-		return moduleBindings;
+		return gModuleBindings;
 	}
 }    // namespace rift::AST

Libs/Framework/Src/AST/Utils/TypeUtils.cpp

@@ -39,9 +39,9 @@
 
 namespace rift::AST
 {
-	static p::TArray<RiftType> fileTypes;
+	static p::TArray<RiftType> gFileTypes;
 
-	auto typeComponents = [](auto& rw) {
+	auto gTypeComponents = [](auto& rw) {
 		rw.template SerializePools<CChild, CDeclVariable, CDeclFunction, CExprBinaryOperator,
 		    CExprCall, CExprDeclRefId, CExprOutputs, CExprInputs, CStmtReturn, CExprType,
 		    CExprUnaryOperator, CNodePosition, CNamespace, CParent, CLiteralBool, CLiteralFloating,
@@ -111,7 +111,7 @@ namespace rift::AST
 		w.BeginObject();
 
 		w.Next("type", ast.Get<CDeclType>(id).typeId);
-		w.SerializeEntity(id, typeComponents);
+		w.SerializeEntity(id, gTypeComponents);
 
 		data = writer.ToString();
 	}
@@ -133,7 +133,7 @@ namespace rift::AST
 		r.Next("type", typeId);
 		InitTypeFromFileType(ast, id, typeId);
 
-		r.SerializeEntity(id, typeComponents);
+		r.SerializeEntity(id, gTypeComponents);
 	}
 
 
@@ -490,22 +490,22 @@ namespace rift::AST
 
 	void RegisterFileType(RiftType&& type)
 	{
-		fileTypes.AddUniqueSorted(Move(type));
+		gFileTypes.AddUniqueSorted(Move(type));
 	}
 	void UnregisterFileType(p::Tag typeId)
 	{
-		fileTypes.RemoveSorted(typeId);
+		gFileTypes.RemoveSorted(typeId);
 	}
 
 	p::TView<const RiftType> GetFileTypes()
 	{
-		return fileTypes;
+		return gFileTypes;
 	}
 
 	const RiftType* FindFileType(p::Tag typeId)
 	{
-		const i32 index = fileTypes.FindSortedEqual(typeId);
-		return index != NO_INDEX ? fileTypes.Data() + index : nullptr;
+		const i32 index = gFileTypes.FindSortedEqual(typeId);
+		return index != NO_INDEX ? gFileTypes.Data() + index : nullptr;
 	}
 
 	const RiftType* FindFileType(p::TAccessRef<AST::CDeclType> access, AST::Id typeId)

Libs/Framework/Src/FrameworkModule.cpp

@@ -10,10 +10,6 @@
 #include "AST/Utils/ModuleUtils.h"
 #include "AST/Utils/TypeUtils.h"
 
-#include <Pipe/Memory/NewDelete.h>
-
-
-P_OVERRIDE_NEW_DELETE
 
 namespace rift
 {

Libs/Framework/Src/Rift.cpp

@@ -7,30 +7,30 @@
 
 namespace rift
 {
-	static p::TMap<p::ClassType*, p::TOwnPtr<class Module>> modules{};
-	static p::TArray<View> views{};
+	static p::TMap<p::ClassType*, p::TOwnPtr<class Module>> gModules{};
+	static p::TArray<View> gViews{};
 
 
 	void EnableModule(p::ClassType* type)
 	{
 		Check(Module::GetStaticType()->IsParentOf(type));
 
-		if (!modules.Contains(type))
+		if (!gModules.Contains(type))
 		{
 			auto module = MakeOwned<Module>(type);
 			module->DoLoad();
-			modules.Insert(type, Move(module));
+			gModules.Insert(type, Move(module));
 		}
 	}
 
 	void DisableModule(p::ClassType* type)
 	{
-		modules.Remove(type);
+		gModules.Remove(type);
 	}
 
 	p::TPtr<Module> GetModule(p::ClassType* type)
 	{
-		if (auto* module = modules.Find(type))
+		if (auto* module = gModules.Find(type))
 		{
 			return *module;
 		}
@@ -39,6 +39,6 @@ namespace rift
 
 	void RegisterView(View view)
 	{
-		views.Add(Move(view));
+		gViews.Add(Move(view));
 	}
 };    // namespace rift