From 7ab4e7555a24f27b26278e740611a3979bade99f Mon Sep 17 00:00:00 2001 From: ALEXks Date: Sun, 18 May 2025 20:15:50 +0300 Subject: [PATCH] added json to SPF_GetArrayLinks --- src/Utils/version.h | 2 +- src/VisualizerCalls/get_information.cpp | 19 ++++++++++++------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/src/Utils/version.h b/src/Utils/version.h index e5e1b0e..495b081 100644 --- a/src/Utils/version.h +++ b/src/Utils/version.h @@ -1,3 +1,3 @@ #pragma once -#define VERSION_SPF "2420" +#define VERSION_SPF "2421" diff --git a/src/VisualizerCalls/get_information.cpp b/src/VisualizerCalls/get_information.cpp index 9d73c1b..8ee66dc 100644 --- a/src/VisualizerCalls/get_information.cpp +++ b/src/VisualizerCalls/get_information.cpp @@ -1158,8 +1158,6 @@ int SPF_GetArrayLinks(void*& context, int winHandler, short *options, short *pro { runPassesForVisualizer(projName, { CALL_GRAPH2 } ); - string resVal = ""; - map> linkedArrays; for (auto& inMap : arrayLinksByFuncCalls) { @@ -1173,17 +1171,24 @@ int SPF_GetArrayLinks(void*& context, int winHandler, short *options, short *pro linkedArrays[ref].insert(toAdd); } + json links; + json allLinks = json::array(); for (auto& array : linkedArrays) { - resVal += to_string(array.first->GetId()) + "|" + to_string(array.second.size()) + "|"; + json currLink; + currLink["id"] = array.first->GetId(); + + json links = json::array(); for (auto& link : array.second) - resVal += to_string(link->GetId()) + "|"; + links.push_back(link->GetId()); + currLink["links"] = links; + + allLinks.push_back(currLink); } + links["allLinks"] = allLinks; - if (resVal[resVal.size() - 1] == '|') - resVal.erase(resVal.size() - 1); - + string resVal = allLinks.dump(); copyStringToShort(result, resVal); retSize = (int)resVal.size() + 1; }