Skip to content

Commit

Permalink
Fix json encode (#2353)
Browse files Browse the repository at this point in the history
* moving to std::sstream instead of std::string

---------

Signed-off-by: Saif Kandil <74428638+k0T0z@users.noreply.github.com>
  • Loading branch information
k0T0z committed Aug 14, 2023
1 parent 3a2330f commit ad33bbc
Showing 1 changed file with 9 additions and 8 deletions.
17 changes: 9 additions & 8 deletions ENIGMAsystem/SHELL/Universal_System/Extensions/Json/json.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
#include "json.h"
#include <cstdio>
#include <iostream>
#include <sstream>
#include "../DataStructures/include.h"
#include "libjson.h"

Expand Down Expand Up @@ -219,34 +220,34 @@ namespace enigma_user
return string("{}");
}

string encoding_accumulator{""};
std::stringstream encoding_accumulator;

encoding_accumulator += '{';
encoding_accumulator << '{';

variant key{enigma_user::ds_map_find_first(ds_map)};

for (int i = 0; i < enigma_user::ds_map_size(ds_map); i++) {
encoding_accumulator += '\"' + string(key) + '\"' + ':';
encoding_accumulator << '\"' << string(key) << '\"' << ':';

variant value {enigma_user::ds_map_find_value(ds_map, key)};

if (enigma_user::is_string(value))
encoding_accumulator += '\"' + enigma_user::toString(value) + '\"';
encoding_accumulator << '\"' << enigma_user::toString(value) << '\"';
else
encoding_accumulator += enigma_user::toString(value);
encoding_accumulator << enigma_user::toString(value);

key = enigma_user::ds_map_find_next(ds_map, key);

// Add comma if not last element
if (i != enigma_user::ds_map_size(ds_map) - 1) encoding_accumulator += ',';
if (i != enigma_user::ds_map_size(ds_map) - 1) encoding_accumulator << ',';

// DEBUG_MESSAGE(value, MESSAGE_TYPE::M_INFO);
}

encoding_accumulator += '}';
encoding_accumulator << '}';

// DEBUG_MESSAGE(encoding_accumulator, MESSAGE_TYPE::M_INFO);

return encoding_accumulator;
return encoding_accumulator.str();
}
}

0 comments on commit ad33bbc

Please sign in to comment.