From 1b4a1b8ae4b68f2d06d88de7ab446c96bd29bd3c Mon Sep 17 00:00:00 2001
From: mkoch <mkoch@XNPSTER-HP>
Date: Wed, 11 Oct 2023 12:42:03 +0300
Subject: [PATCH] fixes for added message

---
 .../experts/Sapfor_2017/_src/GraphCall/select_array_conf.cpp  | 2 +-
 sapfor/experts/Sapfor_2017/_src/Sapfor.cpp                    | 4 +---
 sapfor/experts/Sapfor_2017/_src/Utils/russian_errors_text.txt | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/sapfor/experts/Sapfor_2017/_src/GraphCall/select_array_conf.cpp b/sapfor/experts/Sapfor_2017/_src/GraphCall/select_array_conf.cpp
index ef2b8b8..8302950 100644
--- a/sapfor/experts/Sapfor_2017/_src/GraphCall/select_array_conf.cpp
+++ b/sapfor/experts/Sapfor_2017/_src/GraphCall/select_array_conf.cpp
@@ -110,7 +110,7 @@ static void preventLoopsFromParallelizations(LoopGraph* loop, const set<DIST::Ar
                     array_bounds += bounds_pair.second >= 0 ? to_string(bounds_pair.second) : "*";
                 }
                 
-                string array_ref = conflict_array->GetName() + "(" + array_bounds + ")";
+                string array_ref = conflict_array->GetShortName() + "(" + array_bounds + ")";
 
                 // add conflict message
                 std::wstring bufE, bufR;
diff --git a/sapfor/experts/Sapfor_2017/_src/Sapfor.cpp b/sapfor/experts/Sapfor_2017/_src/Sapfor.cpp
index 980bf30..d02e199 100644
--- a/sapfor/experts/Sapfor_2017/_src/Sapfor.cpp
+++ b/sapfor/experts/Sapfor_2017/_src/Sapfor.cpp
@@ -2176,9 +2176,7 @@ static bool runAnalysis(SgProject &project, const int curr_regime, const bool ne
     else if (curr_regime == FIX_COMMON_BLOCKS)
         fixCommonBlocks(allFuncInfo, commonBlocks, &project);
     else if (curr_regime == SELECT_ARRAY_DIM_CONF) {
-        map<string, vector<Messages>> localMessages;
-
-        SelectArrayConfForParallelization(&project, allFuncInfo, loopGraph, createdDirectives, localMessages, arrayLinksByFuncCalls, parallelRegions);
+        SelectArrayConfForParallelization(&project, allFuncInfo, loopGraph, createdDirectives, SPF_messages, arrayLinksByFuncCalls, parallelRegions);
         removeRegionsWithoutDirs(createdDirectives, parallelRegions, allFuncInfo, SPF_messages);
     }
 
diff --git a/sapfor/experts/Sapfor_2017/_src/Utils/russian_errors_text.txt b/sapfor/experts/Sapfor_2017/_src/Utils/russian_errors_text.txt
index 34f4b74..dae2791 100644
--- a/sapfor/experts/Sapfor_2017/_src/Utils/russian_errors_text.txt
+++ b/sapfor/experts/Sapfor_2017/_src/Utils/russian_errors_text.txt
@@ -311,7 +311,7 @@ R151 = "Пустые области распараллеливания недо
 //3022
 R171 = "Невозможно определить правила выравнивания для массива '%s'."
 //3023
-R202 = "Ссылка '%s' имеет размер отличный от оригинального массива размер"
+R202 = "Ссылка '%s' имеет отличный от оригинального массива размер"
 
 //4001
 //---TODO ошибки из SAGE