ShitCore 최신 버전으로 업데이트

ShitVM · Aug 17, 2023 · 29211b8 · 29211b8
1 parent 9884487
commit 29211b8
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/ShitCore b/ShitCore
diff --git a/include/sgn/ExternModule.hpp b/include/sgn/ExternModule.hpp
@@ -31,6 +31,8 @@ namespace sgn::detail {
 		using svm::core::Loader<VirtualFunctionInfo>::Create;
 
 	private:
+		using svm::core::Loader<VirtualFunctionInfo>::AddLibraryDirectory;
+
 		using svm::core::Loader<VirtualFunctionInfo>::Load;
 		using svm::core::Loader<VirtualFunctionInfo>::Build;
 

diff --git a/src/ByteFile.cpp b/src/ByteFile.cpp
@@ -101,7 +101,7 @@ namespace sgn {
 	GeneralArrayIndex ByteFile::MakeArray(GeneralTypeIndex type) const {
 		if (std::holds_alternative<TypeIndex>(type)) {
 			return MakeArray(std::get<TypeIndex>(type));
-		} else if (std::holds_alternative<MappedTypeIndex>(type)) {
+		} else {
 			return MakeArray(std::get<MappedTypeIndex>(type));
 		}
 	}
@@ -129,7 +129,7 @@ namespace sgn {
 	}
 
 	ExternModuleIndex ByteFile::AddExternModule(const std::string& path) {
-		GetDependencies().push_back(path);
+		GetDependencies().push_back({ path });
 		return m_ExternModuleManager.CreateModule(path);
 	}
 	ExternModuleIndex ByteFile::GetExternModule(const std::string& path) const noexcept {
@@ -213,14 +213,14 @@ namespace sgn {
 	const StructureInfo* ByteFile::GetStructureInfo(GeneralTypeIndex index) const noexcept {
 		if (std::holds_alternative<TypeIndex>(index)) {
 			return GetStructureInfo(std::get<TypeIndex>(index));
-		} else if (std::holds_alternative<MappedTypeIndex>(index)) {
+		} else {
 			return GetStructureInfo(std::get<MappedTypeIndex>(index));
 		}
 	}
 	StructureInfo* ByteFile::GetStructureInfo(GeneralTypeIndex index) noexcept {
 		if (std::holds_alternative<TypeIndex>(index)) {
 			return GetStructureInfo(std::get<TypeIndex>(index));
-		} else if (std::holds_alternative<MappedTypeIndex>(index)) {
+		} else {
 			return GetStructureInfo(std::get<MappedTypeIndex>(index));
 		}
 	}

diff --git a/src/Generator.cpp b/src/Generator.cpp
@@ -21,8 +21,8 @@ namespace sgn {
 		Write(static_cast<std::uint32_t>(dependencies.size()));
 		for (std::uint32_t i = 0; i < dependencies.size(); ++i) {
 			const auto& depen = dependencies[i];
-			Write(static_cast<std::uint32_t>(depen.size()));
-			m_Stream.write(depen.c_str(), depen.size());
+			Write(static_cast<std::uint32_t>(depen.Path.size()));
+			m_Stream.write(depen.Path.c_str(), depen.Path.size());
 		}
 
 		Generate(m_ByteFile.GetMappings());
@@ -86,7 +86,7 @@ namespace sgn {
 				const auto typeIndex = m_ByteFile.GetTypeIndex(fields[j].Type);
 				if (std::holds_alternative<TypeIndex>(typeIndex)) {
 					typeCode = static_cast<std::uint32_t>(fields[j].Type->Code);
-				} else if (std::holds_alternative<MappedTypeIndex>(typeIndex)) {
+				} else {
 					typeCode = m_ByteFile.TransformMappedIndex(std::get<MappedTypeIndex>(typeIndex));
 				}