Use arc for result stuff

Author: XorTroll

.gitignore

@@ -9,6 +9,7 @@ SdOut/
 *.nacp
 *.nro
 *.lst
+*.gen.hpp
 .vs/
 bin/
 obj/

.gitmodules

@@ -4,3 +4,6 @@
 [submodule "Atmosphere-libs"]
 	path = libs/Atmosphere-libs
 	url = https://github.com/Atmosphere-NX/Atmosphere-libs
+[submodule "arc"]
+	path = arc
+	url = https://github.com/XorTroll/arc

Makefile

@@ -5,15 +5,19 @@ VERSION			:=	$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_MICRO)
 
 export UL_DEFS	:=	-DUL_VERSION=\"$(VERSION)\"
 
-.PHONY: all fresh clean pu usystem uloader umenu umanager uscreen
+.PHONY: all fresh clean pu arc usystem uloader umenu umanager uscreen
 
-all: usystem uloader umenu umanager uscreen
+all: arc usystem uloader umenu umanager uscreen
 
 fresh: clean all
 
 pu:
 	@$(MAKE) -C libs/Plutonium/
 
+arc:
+	@python arc/arc.py gen_db default+./libs/uCommon/include/ul/ul_Results.rc.hpp
+	@python arc/arc.py gen_cpp rc UL ./libs/uCommon/include/ul/ul_Results.gen.hpp
+
 clean:
 	@$(MAKE) clean -C projects/uSystem
 	@$(MAKE) clean -C projects/uLoader

arc

@@ -18,13 +18,17 @@
 #ifndef INCLUDE_NLOHMANN_JSON_HPP_
 #define INCLUDE_NLOHMANN_JSON_HPP_
 
+//////////////////////////////////////////////////////////////////////////////////
 // Custom config for this project
+
 #include <ul/ul_Result.hpp>
-#define JSON_THROW_USER(exception) ::ul::OnAssertionFailed(::ul::res::ResultAssertionFailed, "JSON libraries threw " #exception "...\n")
+#define JSON_THROW_USER(exception) ::ul::OnAssertionFailed(::rc::ulaunch::ResultAssertionFailed, "JSON libraries threw " #exception "...\n")
 #define JSON_TRY_USER if(true)
 #define JSON_CATCH_USER(exception) if(false)
 #define JSON_INTERNAL_CATCH_USER(exception) if(false)
 
+//////////////////////////////////////////////////////////////////////////////////
+
 #include <algorithm> // all_of, find, for_each
 #include <cstddef> // nullptr_t, ptrdiff_t, size_t
 #include <functional> // hash, less

assets/default/Cursor.xcf

@@ -1,7 +1,7 @@
 
 #pragma once
 #include <ul/loader/loader_TargetTypes.hpp>
-#include <ul/smi/smi_Results.hpp>
+#include <ul/ul_Result.hpp>
 #include <functional>
 
 namespace ul::smi {

assets/uManager.xcf

@@ -6,46 +6,23 @@
 #include <stratosphere.hpp>
 #endif
 
-namespace ul {
-
-    // All 2380-**** results are from us
-
-    constexpr u32 Module = 380;
-    constexpr u32 SubmoduleOffset = 100;
-
-    #define UL_RC_DEFINE_SUBMODULE(val) constexpr u32 Submodule = val
-    #define UL_RC_DEFINE(name, val) constexpr Result Result ## name = MAKERESULT(Module, Submodule * SubmoduleOffset + val)
+#include <ul/ul_Results.gen.hpp>
 
-    constexpr Result ResultSuccess = 0;
+namespace ul {
 
-    /*
-    
-    Result submodules:
-    0 -> misc
-    1 -> smi
-    2 -> sf (ipc)
-    3 -> loader
-    4 -> smi
-    5 -> util
-    6 -> menu
-    
-    */
+    using namespace rc;
+    using namespace rc::ulaunch;
 
     namespace res {
 
-        UL_RC_DEFINE_SUBMODULE(0);
-
-        UL_RC_DEFINE(AssertionFailed, 1);
-        UL_RC_DEFINE(InvalidTransform, 2);
-
         template<typename T>
         inline ::Result TransformIntoResult(const T t) {
             return static_cast<::Result>(t);
         }
 
         #ifdef ATMOSPHERE
         template<>
-        inline ::Result TransformIntoResult<ams::Result>(const ams::Result ams_rc) {
+        inline ::Result TransformIntoResult<::ams::Result>(const ::ams::Result ams_rc) {
             return ams_rc.GetValue();
         }
         #endif
@@ -90,7 +67,7 @@ namespace ul {
     #define UL_ASSERT_TRUE(expr) ({ \
         const auto _tmp_expr = (expr); \
         if(!_tmp_expr) { \
-            ::ul::OnAssertionFailed(::ul::res::ResultAssertionFailed, #expr " asserted to be false...\n"); \
+            ::ul::OnAssertionFailed(::rc::ulaunch::ResultAssertionFailed, #expr " asserted to be false...\n"); \
         } \
     })