AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 04:27:42 +00:00
Code Issues Projects Releases Wiki Activity

Massive fmtlib refactor

Browse Source
This commit is contained in:
Jack Andersen
2019-07-19 18:22:58 -10:00
parent b483acb8d3
commit 6988f86672
37 changed files with 656 additions and 842 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
hecl/driver/ToolSpec.hpp
View File

@@ -13,7 +13,7 @@ public:
return;
if (!info.project)
LogModule.report(logvisor::Fatal, "hecl spec must be ran within a project directory");
LogModule.report(logvisor::Fatal, fmt("hecl spec must be ran within a project directory"));
const auto& specs = info.project->getDataSpecs();
hecl::SystemString firstArg = info.args.front();
@@ -27,7 +27,7 @@ public:
return;
if (info.args.size() < 2)
LogModule.report(logvisor::Fatal, "Speclist argument required");
LogModule.report(logvisor::Fatal, fmt("Speclist argument required"));
auto it = info.args.begin();
++it;
@@ -41,7 +41,7 @@ public:
}
}
if (!found)
LogModule.report(logvisor::Fatal, _SYS_STR("'%s' is not found in the dataspec registry"), it->c_str());
LogModule.report(logvisor::Fatal, fmt(_SYS_STR("'{}' is not found in the dataspec registry")), *it);
}
}
@@ -77,10 +77,10 @@ public:
if (!m_info.project) {
for (const hecl::Database::DataSpecEntry* spec : hecl::Database::DATA_SPEC_REGISTRY) {
if (XTERM_COLOR)
hecl::Printf(_SYS_STR("" BOLD CYAN "%s" NORMAL "\n"), spec->m_name.data());
fmt::print(fmt(_SYS_STR("" BOLD CYAN "{}" NORMAL "\n")), spec->m_name);
else
hecl::Printf(_SYS_STR("%s\n"), spec->m_name.data());
hecl::Printf(_SYS_STR(" %s\n"), spec->m_desc.data());
fmt::print(fmt(_SYS_STR("{}\n")), spec->m_name);
fmt::print(fmt(_SYS_STR(" {}\n")), spec->m_desc);
}
return 0;
}
@@ -89,16 +89,16 @@ public:
if (mode == MLIST) {
for (auto& spec : specs) {
if (XTERM_COLOR)
hecl::Printf(_SYS_STR("" BOLD CYAN "%s" NORMAL ""), spec.spec.m_name.data());
fmt::print(fmt(_SYS_STR("" BOLD CYAN "{}" NORMAL "")), spec.spec.m_name);
else
hecl::Printf(_SYS_STR("%s"), spec.spec.m_name.data());
fmt::print(fmt(_SYS_STR("{}")), spec.spec.m_name);
if (spec.active) {
if (XTERM_COLOR)
hecl::Printf(_SYS_STR(" " BOLD GREEN "[ENABLED]" NORMAL ""));
fmt::print(fmt(_SYS_STR(" " BOLD GREEN "[ENABLED]" NORMAL "")));
else
hecl::Printf(_SYS_STR(" [ENABLED]"));
fmt::print(fmt(_SYS_STR(" [ENABLED]")));
}
hecl::Printf(_SYS_STR("\n %s\n"), spec.spec.m_desc.data());
fmt::print(fmt(_SYS_STR("\n {}\n")), spec.spec.m_desc);
}
return 0;
}