mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-12 14:40:00 -06:00
Code Issues Packages Projects Releases Wiki Activity

Address clang tidy complaints

Browse Source 
Update Ghoul repository
Update SGCT repository
This commit is contained in:
Alexander Bock
2018-11-30 15:34:09 -05:00
parent 752750bee8
commit c7a96a6b59
121 changed files with 626 additions and 670 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/scripting/scriptengine.cpp
View File

@@ -551,20 +551,23 @@ std::string ScriptEngine::generateJson() const {
bool first = true;
for (const LuaLibrary& l : _registeredLibraries) {
constexpr const char* replStr = R"("{}": "{}", )";
constexpr const char* replStr2 = R"("{}": "{}")";
if (!first) {
json << ",";
}
first = false;
json << "{";
json << "\"library\": \"" << l.name << "\",";
json << fmt::format(replStr, "library", l.name);
json << "\"functions\": [";
for (const LuaLibrary::Function& f : l.functions) {
json << "{";
json << "\"name\": \"" << f.name << "\", ";
json << "\"arguments\": \"" << escapedJson(f.argumentText) << "\", ";
json << "\"help\": \"" << escapedJson(f.helpText) << "\"";
json << fmt::format(replStr, "library", f.name);
json << fmt::format(replStr, "arguments", escapedJson(f.argumentText));
json << fmt::format(replStr2, "help", escapedJson(f.helpText));
json << "}";
if (&f != &l.functions.back() || !l.documentations.empty()) {
json << ",";
@@ -573,9 +576,9 @@ std::string ScriptEngine::generateJson() const {
for (const LuaLibrary::Documentation& doc : l.documentations) {
json << "{";
json << "\"name\": \"" << doc.name << "\", ";
json << "\"arguments\": \"" << escapedJson(doc.parameter) << "\", ";
json << "\"help\": \"" << escapedJson(doc.description) << "\"";
json << fmt::format(replStr, "name", doc.name);
json << fmt::format(replStr, "arguments", escapedJson(doc.parameter));
json << fmt::format(replStr2, "help", escapedJson(doc.description));
json << "}";
if (&doc != &l.documentations.back()) {
json << ",";