Renamed Types.hpp to Utilities.hpp and moved TypeTraits and ForwardDe…

…clarations into their own file.

Reflection/Any.hpp

@@ -1,6 +1,7 @@
 #pragma once
 
-#include "Types.hpp"
+#include "ForwardDeclarations.hpp"
+#include "Utilities.hpp"
 #include "Type.hpp"
 
 

Reflection/Field.hpp

@@ -1,6 +1,7 @@
 #pragma once
 
 #include "Property.hpp"
+#include "TypeTraits.hpp"
 
 class Field : public Property
 {

Reflection/ForwardDeclarations.hpp

@@ -0,0 +1,7 @@
+#pragma once
+
+class DocumentedObject;
+class Field;
+class Function;
+class Property;
+class Type;

Reflection/Property.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Types.hpp"
+#include "Utilities.hpp"
 #include "Function.hpp"
 
 // TODO: Have some requirements on the types of setters and getters.

Reflection/Reflection.vcxproj

@@ -129,13 +129,15 @@
  <ClInclude Include="CacheOrderedMultiMap.hpp" />
  <ClInclude Include="ConstexprString.hpp" />
  <ClInclude Include="Field.hpp" />
+ <ClInclude Include="ForwardDeclarations.hpp" />
  <ClInclude Include="Function.hpp" />
  <ClInclude Include="Iterator.hpp" />
  <ClInclude Include="Property.hpp" />
  <ClInclude Include="Range.hpp" />
  <ClInclude Include="Reflection.hpp" />
  <ClInclude Include="Type.hpp" />
- <ClInclude Include="Types.hpp" />
+ <ClInclude Include="Utilities.hpp" />
+ <ClInclude Include="TypeTraits.hpp" />
  </ItemGroup>
  <ItemGroup>
  <ClCompile Include="Attribute.cpp" />

Reflection/Reflection.vcxproj.filters

@@ -18,9 +18,6 @@
  <ClInclude Include="Reflection.hpp">
  <Filter>Header Files</Filter>
  </ClInclude>
- <ClInclude Include="Types.hpp">
- <Filter>Header Files</Filter>
- </ClInclude>
  <ClInclude Include="Any.hpp">
  <Filter>Header Files</Filter>
  </ClInclude>
@@ -54,6 +51,15 @@
  <ClInclude Include="CacheOrderedMultiMap.hpp">
  <Filter>Header Files</Filter>
  </ClInclude>
+ <ClInclude Include="TypeTraits.hpp">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="Utilities.hpp">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="ForwardDeclarations.hpp">
+ <Filter>Header Files</Filter>
+ </ClInclude>
  </ItemGroup>
  <ItemGroup>
  <ClCompile Include="main.cpp">

Reflection/Type.hpp

@@ -3,7 +3,8 @@
 #include <vector>
 
 #include "CacheOrderedMultiMap.hpp"
-#include "Types.hpp"
+#include "ForwardDeclarations.hpp"
+#include "Utilities.hpp"
 #include "Reflection.hpp"
 
 class Type;

Reflection/Types.hpp → Reflection/TypeTraits.hpp

@@ -1,52 +1,6 @@
-//////////////////////////////////////////////
-// Author: Joshua T. Fisher
-//////////////////////////////////////////////
 #pragma once
 
-#ifndef Types_hpp
-#define Types_hpp
-
-#include <cstdint>
-
-#include <memory>
-#include <string>
-#include <unordered_map>
-
-using byte = std::uint8_t;
-
-using s8 = signed char;
-using s16 = signed short;
-using s32 = signed int;
-using s64 = signed long long;
-
-using i8 = char;
-using i16 = std::int16_t;
-using i32 = std::int32_t;
-using i64 = std::int64_t;
-
-using u8 = std::uint8_t;
-using u16 = std::uint16_t;
-using u32 = std::uint32_t;
-using u64 = std::uint64_t;
-
-class Function;
-class Property;
-class Field;
-
-inline void runtime_assert(bool aValue, const char *aMessage = "")
-{
- if (false == aValue)
- {
- printf("ASSERT: %s\n", aMessage);
-
- // Intentionally crashing the program.
- int *base = nullptr;
- *base = 1;
- }
-}
-
-// We want to be able to use the string literals, this is the only way.
-using namespace std::string_literals;
+#include "Utilities.hpp"
 
 template<typename T>
 inline size_t SizeOf()
@@ -152,9 +106,9 @@ struct Identity
 
 
 template<typename T>
-struct remove_all_pointers : std::conditional_t<std::is_pointer_v<T>, 
-  remove_all_pointers<std::remove_pointer_t<T>>,
-  Identity<T>>
+struct remove_all_pointers : std::conditional_t<std::is_pointer_v<T>,
+ remove_all_pointers<std::remove_pointer_t<T>>,
+ Identity<T>>
 {
 };
 
@@ -197,44 +151,3 @@ inline void GenericDoNothing(byte *aMemory)
 {
 }
 
-
-enum class StringComparison
-{
- String1Null, // (We check this first)
- LesserInString1, // The first character that does not match has a lower value in ptr1 than in ptr2
- Equal,
- GreaterInString1,// The first character that does not match has a greater value in ptr1 than in ptr2
- String2Null, // (We check this Second)
-};
-
-inline StringComparison StringCompare(const char *aLeft, const char *aRight)
-{
- if (nullptr == aLeft)
- {
- return StringComparison::String1Null;
- }
-
- if (nullptr == aRight)
- {
- return StringComparison::String2Null;
- }
-
- auto comparison = std::strcmp(aLeft, aRight);
-
- if (0 == comparison)
- {
- return StringComparison::Equal;
- }
-
- if (comparison < 0)
- {
- return StringComparison::LesserInString1;
- }
-
- // else if (comparison < 0) This is by definition of the domain, no need to check
- {
- return StringComparison::GreaterInString1;
- }
-}
-
-#endif

Reflection/Utilities.hpp

@@ -0,0 +1,86 @@
+//////////////////////////////////////////////
+// Author: Joshua T. Fisher
+//////////////////////////////////////////////
+#pragma once
+
+#ifndef Utilities_hpp
+#define Utilities_hpp
+
+#include <cstdint>
+
+#include <memory>
+#include <string>
+#include <unordered_map>
+
+using byte = std::uint8_t;
+
+using s8 = signed char;
+using s16 = signed short;
+using s32 = signed int;
+using s64 = signed long long;
+
+using i8 = char;
+using i16 = std::int16_t;
+using i32 = std::int32_t;
+using i64 = std::int64_t;
+
+using u8 = std::uint8_t;
+using u16 = std::uint16_t;
+using u32 = std::uint32_t;
+using u64 = std::uint64_t;
+
+inline void runtime_assert(bool aValue, const char *aMessage = "")
+{
+ if (false == aValue)
+ {
+ printf("ASSERT: %s\n", aMessage);
+
+ // Intentionally crashing the program.
+ int *base = nullptr;
+ *base = 1;
+ }
+}
+
+// We want to be able to use the string literals, this is the only way.
+using namespace std::string_literals;
+
+enum class StringComparison
+{
+ String1Null, // (We check this first)
+ LesserInString1, // The first character that does not match has a lower value in ptr1 than in ptr2
+ Equal,
+ GreaterInString1,// The first character that does not match has a greater value in ptr1 than in ptr2
+ String2Null, // (We check this Second)
+};
+
+inline StringComparison StringCompare(const char *aLeft, const char *aRight)
+{
+ if (nullptr == aLeft)
+ {
+ return StringComparison::String1Null;
+ }
+
+ if (nullptr == aRight)
+ {
+ return StringComparison::String2Null;
+ }
+
+ auto comparison = std::strcmp(aLeft, aRight);
+
+ if (0 == comparison)
+ {
+ return StringComparison::Equal;
+ }
+
+ if (comparison < 0)
+ {
+ return StringComparison::LesserInString1;
+ }
+
+ // else if (comparison < 0) This is by definition of the domain, no need to check
+ {
+ return StringComparison::GreaterInString1;
+ }
+}
+
+#endif