AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Editor/ProjectManager: Remove use of goto 

We can wrap the behavior into a lambda function and then call it where
necessary, removing the need for goto (and allowing non-trivial types in
the codepath).
This commit is contained in:
Lioncash 2019-08-10 05:32:29 -04:00
parent 9d5b21fd63
commit df663359c7
1 changed files with 31 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
Editor/ProjectManager.cpp
View File

@ -85,38 +85,16 @@ bool ProjectManager::openProject(hecl::SystemStringView path) {
return false; return false;
} }
hecl::ProjectPath urdeSpacesPath(*m_proj, _SYS_STR(".hecl/urde_spaces.yaml"));
athena::io::FileReader reader(urdeSpacesPath.getAbsolutePath());
bool needsSave = false;
athena::io::YAMLDocReader r; athena::io::YAMLDocReader r;
if (!reader.isOpen()) { const auto makeProj = [this, &r, &subPath](bool needsSave) {
needsSave = true;
goto makeProj;
}
yaml_parser_set_input(r.getParser(), (yaml_read_handler_t*)athena::io::YAMLAthenaReader, &reader);
if (!r.ValidateClassType("UrdeSpacesState")) {
needsSave = true;
goto makeProj;
}
r.reset();
reader.seek(0, athena::Begin);
if (!r.parse(&reader)) {
needsSave = true;
goto makeProj;
}
makeProj:
m_vm.ProjectChanged(*m_proj); m_vm.ProjectChanged(*m_proj);
if (!needsSave) if (needsSave)
m_vm.SetupEditorView(r);
else
m_vm.SetupEditorView(); m_vm.SetupEditorView();
else
m_vm.SetupEditorView(r);
bool doRun = hecl::StringUtils::BeginsWith(subPath, _SYS_STR("out")); const bool doRun = hecl::StringUtils::BeginsWith(subPath, _SYS_STR("out"));
if (doRun) { if (doRun) {
m_mainMP1.emplace(nullptr, nullptr, m_vm.m_mainBooFactory, m_vm.m_mainCommandQueue, m_vm.m_renderTex); m_mainMP1.emplace(nullptr, nullptr, m_vm.m_mainBooFactory, m_vm.m_mainCommandQueue, m_vm.m_renderTex);
m_vm.InitMP1(*m_mainMP1); m_vm.InitMP1(*m_mainMP1);
@ -131,6 +109,27 @@ makeProj:
m_vm.FadeInEditors(); m_vm.FadeInEditors();
m_vm.pushRecentProject(m_proj->getProjectRootPath().getAbsolutePath()); m_vm.pushRecentProject(m_proj->getProjectRootPath().getAbsolutePath());
return true; return true;
};
const hecl::ProjectPath urdeSpacesPath(*m_proj, _SYS_STR(".hecl/urde_spaces.yaml"));
athena::io::FileReader reader(urdeSpacesPath.getAbsolutePath());
if (!reader.isOpen()) {
return makeProj(true);
}
yaml_parser_set_input(r.getParser(), (yaml_read_handler_t*)athena::io::YAMLAthenaReader, &reader);
if (!r.ValidateClassType("UrdeSpacesState")) {
return makeProj(true);
}
r.reset();
reader.seek(0, athena::Begin);
if (!r.parse(&reader)) {
return makeProj(true);
}
return makeProj(false);
} }
bool ProjectManager::extractGame(hecl::SystemStringView path) { return false; } bool ProjectManager::extractGame(hecl::SystemStringView path) { return false; }