TheCurle/umbra
1
0
Fork 0
Code Issues 5 Pull Requests Actions Packages Projects 2 Releases Wiki Activity

Removed std.core

Browse Source
This commit is contained in:
dpeter99 2022-05-26 23:52:01 +02:00
parent 080f6177d2
commit defbb33ce8
15 changed files with 172 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
msbuild.binlog Normal file
View File

Binary file not shown.

2
projs/shadow-file-format-test/test.cpp
View File

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

3
projs/shadow-file-format/shadow-file-format.cpp
View File

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

16
projs/shadow-file-format/shadow-file-format.vcxproj
View File

@ -18,10 +18,22 @@
<ImportGroup Label="Shared">
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<ItemDefinitionGroup>
<ClCompile>
<CompileAs>CompileAsCppModule</CompileAs>
</ClCompile>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="src/**/*.cpp" />
<ClInclude Include="src/**/*.h" />
<ClCompile Include="src/SFFElement.cpp" />
<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>

24
projs/shadow-file-format/shadow-file-format.vcxproj.filters
View File

@ -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>

49
projs/shadow-file-format/src/SFFElement.cpp
View File

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

31
projs/shadow-file-format/src/SFFElement.h
View File

@ -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();
};

40
projs/shadow-file-format/src/SFFElement.ixx Normal file
View File

@ -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();
};
}

17
projs/shadow-file-format/src/SFFParser.cpp
View File

@ -1,12 +1,17 @@
#include "SFFParser.h"
#include <fstream>
#include <iostream>
module;
import <string>;
import <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;

15
projs/shadow-file-format/src/SFFParser.h → projs/shadow-file-format/src/SFFParser.ixx
View File

@ -1,12 +1,19 @@
#pragma once
#include "SFFElement.h"
#include "SFFVersion.h"
module;
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);

25
projs/shadow-file-format/src/SFFVersion.h
View File

@ -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;
}
}
};

28
projs/shadow-file-format/src/SFFVersion.ixx Normal file
View File

@ -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;
}
}
};
}

5
projs/shadow-file-format/src/Shadow.FileFormat.ixx Normal file
View File

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

6
projs/shadow-utility/shadow-utils.ixx
View File

@ -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);

8
projs/shadow-utility/string-helpers.cpp
View File

@ -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;