From 571e2d2544d94c96becd56bc7a25f67c132e9ec9 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Wed, 7 May 2025 20:29:58 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=B2=D0=BE=D0=B4=20?=
 =?UTF-8?q?=D0=BE=D0=B1=D1=8A=D1=8F=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B9=20?=
 =?UTF-8?q?=D0=BC=D0=B0=D1=81=D1=81=D0=B8=D0=B2=D0=BE=D0=B2=20=D0=B2=20jso?=
 =?UTF-8?q?n?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                             |  5 ++++-
 properties                                      |  2 +-
 .../Passes/All/SPF_GetAllDeclaratedArrays.java  | 16 ++++++++++++++++
 .../SapforData/Arrays/ArrayDecl.java            |  2 ++
 .../SapforData/Arrays/ArraysJson.java           |  9 +++++++++
 .../SapforData/Arrays/ProjectArray.java         | 17 +++++++++++++++++
 6 files changed, 49 insertions(+), 2 deletions(-)
 create mode 100644 src/_VisualDVM/ProjectData/SapforData/Arrays/ArraysJson.java

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index e0cebb97..5a111975 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,9 +7,12 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/ArraysJson.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/ArrayDecl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/ArrayDecl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_GetAllDeclaratedArrays.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_GetAllDeclaratedArrays.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/ProjectArray.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/ProjectArray.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/FileObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/FileObject.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/properties b/properties
index a419edbf..5c3567d5 100644
--- a/properties
+++ b/properties
@@ -41,7 +41,7 @@
   "FortranWrapsOn": false,
   "ExtensionsOn": false,
   "ComparsionDiffMergeOn": true,
-  "ShowFullArraysDeclarations": false,
+  "ShowFullArraysDeclarations": true,
   "ShowFullTabsNames": true,
   "SmallScreen": false,
   "BugReportsAgeLimit": 1,
diff --git a/src/_VisualDVM/Passes/All/SPF_GetAllDeclaratedArrays.java b/src/_VisualDVM/Passes/All/SPF_GetAllDeclaratedArrays.java
index d74c851b..98fc3536 100644
--- a/src/_VisualDVM/Passes/All/SPF_GetAllDeclaratedArrays.java
+++ b/src/_VisualDVM/Passes/All/SPF_GetAllDeclaratedArrays.java
@@ -1,10 +1,13 @@
 package _VisualDVM.Passes.All;
 import Common.Utils.Index;
+import Common.Utils.Utils_;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.Sapfor.SapforAnalysis;
 import _VisualDVM.ProjectData.Files.DBProjectFile;
+import _VisualDVM.ProjectData.SapforData.Arrays.ArraysJson;
 import _VisualDVM.ProjectData.SapforData.Arrays.ProjectArray;
 
+import javax.rmi.CORBA.Util;
 import java.math.BigInteger;
 public class SPF_GetAllDeclaratedArrays extends SapforAnalysis {
     @Override
@@ -26,6 +29,18 @@ public class SPF_GetAllDeclaratedArrays extends SapforAnalysis {
     }
     @Override
     public void unpack(String packed) throws Exception {
+        System.out.println("packed="+ Utils_.Brackets(packed));
+        ArraysJson arraysJson = Utils_.gson.fromJson(packed, ArraysJson.class);
+        System.out.println("size="+arraysJson.allArrays.size());
+        for (ProjectArray array: arraysJson.allArrays){
+            array.Init();
+            target.declaratedArrays.put(array.id, array);
+            array.print();
+        }
+        for (DBProjectFile file : target.db.files.Data.values())
+            file.ArrayGraphTitle = "Объявлений: " + file.array_decls.size();
+        target.UpdateArraysCount();
+        /*
         if (packed.toCharArray()[packed.length() - 1] == '\0')
             packed = packed.substring(packed.length() - 1);
         if (packed.length() == 0)
@@ -42,6 +57,7 @@ public class SPF_GetAllDeclaratedArrays extends SapforAnalysis {
         for (DBProjectFile file : target.db.files.Data.values())
             file.ArrayGraphTitle = "Объявлений: " + file.array_decls.size();
         target.UpdateArraysCount();
+         */
     }
     @Override
     protected boolean alwaysCheck() {
diff --git a/src/_VisualDVM/ProjectData/SapforData/Arrays/ArrayDecl.java b/src/_VisualDVM/ProjectData/SapforData/Arrays/ArrayDecl.java
index 2b85d6dc..2b85fa05 100644
--- a/src/_VisualDVM/ProjectData/SapforData/Arrays/ArrayDecl.java
+++ b/src/_VisualDVM/ProjectData/SapforData/Arrays/ArrayDecl.java
@@ -5,6 +5,8 @@ import _VisualDVM.ProjectData.SapforData.FileObjectWithMessages;
 import com.google.gson.annotations.Expose;
 // это то что отображается в боковом графе файла. не путать с сапфоровским ProjectArray
 public class ArrayDecl extends FileObjectWithMessages {
+    @Expose
+    public String file = "";
     @Expose
     public String array_name;
     @Expose
diff --git a/src/_VisualDVM/ProjectData/SapforData/Arrays/ArraysJson.java b/src/_VisualDVM/ProjectData/SapforData/Arrays/ArraysJson.java
new file mode 100644
index 00000000..d35dd9c9
--- /dev/null
+++ b/src/_VisualDVM/ProjectData/SapforData/Arrays/ArraysJson.java
@@ -0,0 +1,9 @@
+package _VisualDVM.ProjectData.SapforData.Arrays;
+import com.google.gson.annotations.Expose;
+
+import java.util.List;
+import java.util.Vector;
+public class ArraysJson {
+    @Expose
+    public List<ProjectArray> allArrays=new Vector<>();
+}
diff --git a/src/_VisualDVM/ProjectData/SapforData/Arrays/ProjectArray.java b/src/_VisualDVM/ProjectData/SapforData/Arrays/ProjectArray.java
index 2740b53e..42a1fdcc 100644
--- a/src/_VisualDVM/ProjectData/SapforData/Arrays/ProjectArray.java
+++ b/src/_VisualDVM/ProjectData/SapforData/Arrays/ProjectArray.java
@@ -58,6 +58,22 @@ public class ProjectArray extends DBObject {
     //json-------------------
     public String UniqKey;
     public BigInteger address;
+    public void print(){
+        Vector<String> res = new Vector<>();
+        res.add(">");
+        res.add("id="+id);
+        res.add("name="+name);
+        res.add("shortName="+shortName);
+        res.add("dimSize="+dimSize);
+        res.add("typeSize="+typeSize);
+        res.add("state="+state);
+        res.add("location="+location);
+        res.add("locName="+locName);
+        res.add("isTempFlag="+isTemplFlag);
+        res.add("isLoopArrayFlag="+isLoopArrayFlag);
+        res.add("<");
+        System.out.println(String.join("\n",res));
+    }
 
     //--
     public ArrayState getState() {
@@ -144,6 +160,7 @@ public class ProjectArray extends DBObject {
     public void Init(){
         //короткое имя+ функция/модуль/комон+ размерность
         UniqKey = shortName + locName + dimSize;
+        address = BigInteger.ONE;
     }
     public static String fill_binary(int d, String binary) {
         int delta = Math.abs(binary.length() - d);