games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-06-15 00:05:02 +02:00
Code Issues Releases Activity

Unify formatting

Browse Source
This commit is contained in:
Ivan Savenko
2024-02-13 19:16:35 +02:00
parent 2632ab04f5
commit 18bbccd167
7 changed files with 315 additions and 261 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
lib/json/JsonWriter.cpp
View File

@ -16,28 +16,28 @@ VCMI_LIB_NAMESPACE_BEGIN
template<typename Iterator>
void JsonWriter::writeContainer(Iterator begin, Iterator end)
{
if (begin == end)
if(begin == end)
return;
prefix += '\t';
writeEntry(begin++);
while (begin != end)
while(begin != end)
{
out << (compactMode ? ", " : ",\n");
writeEntry(begin++);
}
out << (compactMode ? "" : "\n");
prefix.resize(prefix.size()-1);
prefix.resize(prefix.size() - 1);
}
void JsonWriter::writeEntry(JsonMap::const_iterator entry)
{
if(!compactMode)
{
if (!entry->second.getModScope().empty())
if(!entry->second.getModScope().empty())
out << prefix << " // " << entry->second.getModScope() << "\n";
out << prefix;
}
@ -50,27 +50,25 @@ void JsonWriter::writeEntry(JsonVector::const_iterator entry)
{
if(!compactMode)
{
if (!entry->getModScope().empty())
if(!entry->getModScope().empty())
out << prefix << " // " << entry->getModScope() << "\n";
out << prefix;
}
writeNode(*entry);
}
void JsonWriter::writeString(const std::string &string)
void JsonWriter::writeString(const std::string & string)
{
static const std::string escaped = "\"\\\b\f\n\r\t";
static const std::array escaped_code = {'\"', '\\', 'b', 'f', 'n', 'r', 't'};
out <<'\"';
out << '\"';
size_t pos = 0;
size_t start = 0;
for (; pos<string.size(); pos++)
for(; pos < string.size(); pos++)
{
//we need to check if special character was been already escaped
if((string[pos] == '\\')
&& (pos+1 < string.size())
&& (std::find(escaped_code.begin(), escaped_code.end(), string[pos+1]) != escaped_code.end()) )
if((string[pos] == '\\') && (pos + 1 < string.size()) && (std::find(escaped_code.begin(), escaped_code.end(), string[pos + 1]) != escaped_code.end()))
{
pos++; //write unchanged, next simbol also checked
}
@ -78,20 +76,19 @@ void JsonWriter::writeString(const std::string &string)
{
size_t escapedPos = escaped.find(string[pos]);
if (escapedPos != std::string::npos)
if(escapedPos != std::string::npos)
{
out.write(string.data()+start, pos - start);
out.write(string.data() + start, pos - start);
out << '\\' << escaped_code[escapedPos];
start = pos+1;
start = pos + 1;
}
}
}
out.write(string.data()+start, pos - start);
out <<'\"';
out.write(string.data() + start, pos - start);
out << '\"';
}
void JsonWriter::writeNode(const JsonNode &node)
void JsonWriter::writeNode(const JsonNode & node)
{
bool originalMode = compactMode;
if(compact && !compactMode && node.isCompact())
@ -99,40 +96,48 @@ void JsonWriter::writeNode(const JsonNode &node)
switch(node.getType())
{
break; case JsonNode::JsonType::DATA_NULL:
case JsonNode::JsonType::DATA_NULL:
out << "null";
break;
break; case JsonNode::JsonType::DATA_BOOL:
if (node.Bool())
case JsonNode::JsonType::DATA_BOOL:
if(node.Bool())
out << "true";
else
out << "false";
break;
break; case JsonNode::JsonType::DATA_FLOAT:
case JsonNode::JsonType::DATA_FLOAT:
out << node.Float();
break;
break; case JsonNode::JsonType::DATA_STRING:
case JsonNode::JsonType::DATA_STRING:
writeString(node.String());
break;
break; case JsonNode::JsonType::DATA_VECTOR:
case JsonNode::JsonType::DATA_VECTOR:
out << "[" << (compactMode ? " " : "\n");
writeContainer(node.Vector().begin(), node.Vector().end());
out << (compactMode ? " " : prefix) << "]";
break;
break; case JsonNode::JsonType::DATA_STRUCT:
case JsonNode::JsonType::DATA_STRUCT:
out << "{" << (compactMode ? " " : "\n");
writeContainer(node.Struct().begin(), node.Struct().end());
out << (compactMode ? " " : prefix) << "}";
break;
break; case JsonNode::JsonType::DATA_INTEGER:
case JsonNode::JsonType::DATA_INTEGER:
out << node.Integer();
break;
}
compactMode = originalMode;
}
JsonWriter::JsonWriter(std::ostream & output, bool compact)
: out(output), compact(compact)
: out(output)
, compact(compact)
{
}