change parsing order of long and int, also allows them to be intercha…

…ngeable

include/rfl/Generic.hpp

@@ -19,10 +19,10 @@ class Generic {
 
   using Array = std::vector<Generic>;
   using Object = rfl::Object<Generic>;
-  using VariantType = std::variant<bool, int, long, double, std::string, Object,
+  using VariantType = std::variant<bool, long, int, double, std::string, Object,
                                    Array, std::nullopt_t>;
   using ReflectionType = std::optional<
-      std::variant<bool, int, long, double, std::string, Object, Array>>;
+      std::variant<bool, long, int, double, std::string, Object, Array>>;
 
   Generic();
 

src/rfl/Generic.cpp

@@ -105,6 +105,8 @@ Result<double> Generic::to_double() const noexcept {
 Result<int> Generic::to_int() const noexcept {
   if (const int* ptr = std::get_if<int>(&value_)) {
     return *ptr;
+  } else if (const long* ptr = std::get_if<long>(&value_)) {
+    return static_cast<int>(*ptr);
   } else {
     return Error(
         "rfl::Generic: Could not cast the underlying value to an integer.");
@@ -114,6 +116,8 @@ Result<int> Generic::to_int() const noexcept {
 Result<long> Generic::to_long() const noexcept {
   if (const long* ptr = std::get_if<long>(&value_)) {
     return *ptr;
+  } else if (const int* ptr = std::get_if<int>(&value_)) {
+    return static_cast<long>(*ptr);
   } else {
     return Error(
         "rfl::Generic: Could not cast the underlying value to a long.");