Alexander_KS/SAPFOR
4
2
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added json to global results

Browse Source
This commit is contained in:
ALEXks
2025-09-18 21:09:43 +03:00
committed by Egor Mayorov
parent e9166d8c99
commit 593c6e928c
4 changed files with 275 additions and 385 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/Utils/utils.cpp
View File

@@ -390,32 +390,15 @@ void clearGlobalBuffer() { globalOutputBuffer = ""; }
const string& getGlobalBuffer() { return globalOutputBuffer; }
set<short*> allocated;
set<int*> allocatedInt;
static void convertGlobalBuffer(short *&result, int *&resultSize)
{
const unsigned len = (unsigned)globalOutputBuffer.size();
result = new short[len + 1];
allocated.insert(result);
result[len] = '\0';
for (unsigned i = 0; i < len; ++i)
result[i] = globalOutputBuffer[i];
resultSize = new int[1];
resultSize[0] = (int)len;
}
extern map<string, vector<Messages>> SPF_messages; //file ->messages
void clearGlobalMessagesBuffer()
{
//clear allocated memory
for (auto& elem : allocated)
delete[]elem;
for (auto& elem : allocatedInt)
delete[]elem;
delete []elem;
allocated.clear();
allocatedInt.clear();
SPF_messages.clear();
}
@@ -451,7 +434,7 @@ static map<string, vector<Messages>> removeCopies(map<string, vector<Messages>>
return out;
}
static void convertGlobalMessagesBuffer(short *&result, int *&resultSize)
static string convertGlobalMessagesBuffer()
{
auto copySPF_messages = removeCopies(SPF_messages);
for (auto &byFile : copySPF_messages)
@@ -489,21 +472,13 @@ static void convertGlobalMessagesBuffer(short *&result, int *&resultSize)
json all;
all["allMessages"] = allMessages;
const string str = all.dump();
const unsigned len = (unsigned)str.size();
copyStringToShort(result, str);
allocated.insert(result);
resultSize = new int[1];
resultSize[0] = (int)len;
return all.dump();
}
void convertBuffers(short*& resultM, int*& resultSizeM, short*& result, int*& resultSize)
void convertBuffers(string &resultM, string &result)
{
convertGlobalMessagesBuffer(resultM, resultSizeM);
convertGlobalBuffer(result, resultSize);
resultM = convertGlobalMessagesBuffer();
result = getGlobalBuffer();
}
bool isSPF_comment(const string &bufStr)