Removed std.core

projs/shadow-file-format-test/test.cpp

@@ -1,5 +1,7 @@
 #include "pch.h"
 
+import Shadow.FileFormat;
+
 TEST(TestCaseName, TestName) {
   EXPECT_EQ(1, 1);
   EXPECT_TRUE(true);

projs/shadow-file-format/shadow-file-format.cpp

@@ -1,3 +0,0 @@
-
-// TODO: write your library functions here
-

projs/shadow-file-format/shadow-file-format.vcxproj

@@ -18,10 +18,22 @@
   <ImportGroup Label="Shared">
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <CompileAs>CompileAsCppModule</CompileAs>
+    </ClCompile>
+  </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="src/**/*.cpp" />
+    <ClCompile Include="src/SFFElement.cpp" />
-    <ClInclude Include="src/**/*.h" />
+    <ClCompile Include="src/SFFParser.cpp" />
+
+    <ClCompile Include="src/SFFElement.ixx" />
+    <ClCompile Include="src/Shadow.FileFormat.ixx" />
+    <ClCompile Include="src/SFFParser.ixx" />
+    <ClCompile Include="src/SFFVersion.ixx" />
+
   </ItemGroup>
+  
   <ItemGroup>
     <ProjectReference Include="..\shadow-utility\shadow-utility.vcxproj">
       <Project>{7b9e6056-e4fb-411b-9612-a2fd679c2b69}</Project>

projs/shadow-file-format/shadow-file-format.vcxproj.filters

@@ -15,7 +15,7 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="src/**/*.cpp">
+    <ClCompile Include="src\SFFParser.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="src/**/*.cpp">
@@ -24,9 +24,20 @@
     <ClCompile Include="src/**/*.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src/SFFElement.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src/SFFParser.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="SFFElement.ixx" />
+    <ClCompile Include="Shadow.FileFormat.ixx" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="src/**/*.h">
+    <ClInclude Include="src\SFFParser.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\SFFVersion.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="src/**/*.h">
@@ -41,5 +52,14 @@
     <ClInclude Include="src/**/*.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src/**/*.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src/SFFParser.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src/SFFVersion.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>

projs/shadow-file-format/src/SFFElement.cpp

@@ -1,15 +1,24 @@
-//#include "pch.h"
+module;
-#include "SFFElement.h"
+
+import <string>;
+
+import shadow_utils;
+
+module Shadow.FileFormat:SFFElement;
+
+
+namespace Shadow::SFF {
+
 
     SFFElement* SFFElement::GetFirstChild()
     {
-    return children.size() > 0 ? children[0]: nullptr;
+        return children.size() > 0 ? children.begin()->second : nullptr;
     }
 
-SFFElement* SFFElement::GetChildByIndex(int i)
+    SFFElement* SFFElement::GetChildByIndex(int index)
     {
         ChildrenMap::iterator it = children.begin();
-    for (size_t i = 0; i < i; i++)
+        for (size_t i = 0; i < index; i++)
         {
             it++;
         }
@@ -24,3 +33,5 @@ SFFElement* SFFElement::GetChildByName(std::string name)
         }
         return nullptr;
     }
+
+}

projs/shadow-file-format/src/SFFElement.h

@@ -1,31 +0,0 @@
-#pragma once
-
-#include <map>
-#include <list>
-#include <string>
-
-class SFFElement
-{
-public:
-	SFFElement* parent;
-
-	std::string name;
-
-	bool isBlock;
-
-	std::string value;
-	typedef std::map<std::string, SFFElement*> ChildrenMap;
-
-	std::list<SFFElement*> properties_old;
-	std::map<std::string, SFFElement*> children;
-
-	std::string GetStringProperty(std::string name);
-
-	SFFElement* GetFirstChild();
-
-	SFFElement* GetChildByIndex(int i);
-	SFFElement* GetChildByName(std::string name);
-
-	~SFFElement();
-	
-};

projs/shadow-file-format/src/SFFElement.ixx

@@ -0,0 +1,40 @@
+module;
+
+import <string>;
+import <map>;
+import <list>;
+
+export module Shadow.FileFormat:SFFElement;
+
+
+export namespace Shadow::SFF {
+
+	class SFFElement
+	{
+	public:
+		SFFElement* parent;
+
+		std::string name;
+
+		bool isBlock;
+
+		std::string value;
+		typedef std::map<std::string, SFFElement*> ChildrenMap;
+
+		std::list<SFFElement*> properties_old;
+		std::map<std::string, SFFElement*> children;
+
+		std::string GetStringProperty(std::string name);
+
+
+        SFFElement* GetFirstChild();
+
+		SFFElement* GetChildByIndex(int index);
+
+		SFFElement* GetChildByName(std::string name);
+
+		~SFFElement();
+
+	};
+
+}

projs/shadow-file-format/src/SFFParser.cpp

@@ -1,12 +1,17 @@
-#include "SFFParser.h"
+module;
-
+import <string>;
-#include <fstream>
+import <iostream>;
-#include <iostream>
+import <string>;
 
 import shadow_utils;
 
+module Shadow.FileFormat:SFFParser;
 
-namespace ShadowEngine::SFF {
+import :SFFElement;
+import :SFFVersion;
+
+
+namespace Shadow::SFF {
 
 	SFFElement* SFFParser::ReadFromStream(std::istream& stream)
 	{
@@ -27,8 +32,6 @@ namespace ShadowEngine::SFF {
 		auto* current = new SFFElement;
 
 
-
-
 		std::string buffer;
 
 		char c;

projs/shadow-file-format/src/SFFParser.ixx

@@ -1,12 +1,19 @@
-#pragma once
+module;
-#include "SFFElement.h"
-#include "SFFVersion.h"
 
-namespace ShadowEngine::SFF {
+import <string>;
+import <iostream>;
+
+export module Shadow.FileFormat:SFFParser;
+
+import :SFFElement;
+import :SFFVersion;
+
+export namespace Shadow::SFF {
 
 	class SFFParser
 	{
 	public:
+
 		static SFFElement* ReadFromStream(std::istream& stream);
 
 		static SFFVersion ReadVersionFromHeader(std::istream& stream);

projs/shadow-file-format/src/SFFVersion.h

@@ -1,25 +0,0 @@
-#pragma once
-
-struct SFFVersion {
-public:
-	int mayor;
-	int minor;
-	int patch;
-
-	bool invalid;
-
-	SFFVersion(int ma, int mi, int pa)
-	{
-		this->mayor = ma;
-		this->minor = mi;
-		this->patch = pa;
-
-		if (ma >= 0 && mi >= 0 && pa >= 0) {
-			this->invalid = false;
-		}
-		else
-		{
-			invalid = true;
-		}
-	}
-};

projs/shadow-file-format/src/SFFVersion.ixx

@@ -0,0 +1,28 @@
+export module Shadow.FileFormat:SFFVersion;
+
+export namespace Shadow::SFF {
+
+	struct SFFVersion {
+	public:
+		int mayor;
+		int minor;
+		int patch;
+
+		bool invalid;
+
+		SFFVersion(int ma, int mi, int pa)
+		{
+			this->mayor = ma;
+			this->minor = mi;
+			this->patch = pa;
+
+			if (ma >= 0 && mi >= 0 && pa >= 0) {
+				this->invalid = false;
+			}
+			else
+			{
+				invalid = true;
+			}
+		}
+	};
+}

projs/shadow-file-format/src/Shadow.FileFormat.ixx

@@ -0,0 +1,5 @@
+export module Shadow.FileFormat;
+
+export import :SFFElement;
+export import :SFFParser;
+export import :SFFVersion;

projs/shadow-utility/shadow-utils.ixx

@@ -1,5 +1,9 @@
+module;
+
+#include <string>
+#include <vector>
+
 export module shadow_utils;
 
-import std.core;
 
 export std::vector<std::string> explode(const std::string& s, const char& c);

projs/shadow-utility/string-helpers.cpp

@@ -1,8 +1,10 @@
+module;
+
+import <string>;
+import <vector>;
+
 module shadow_utils;
 
-import std.core;
-
-
 inline std::vector<std::string> explode(const std::string& s, const char& c)
 {
     std::string buff;