From 14b13eae97400276660f80932ed4ca38817d8b4a Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Wed, 22 Nov 2023 18:36:28 +0300
Subject: [PATCH] =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D0=B4=D0=B0=D1=87?=
 =?UTF-8?q?=D0=B0=20=D1=81=D0=BC=D0=B5=D1=88=D0=B5=D0=BD=D0=B8=D1=8F=20?=
 =?UTF-8?q?=D0=BF=D1=80=D0=B8=20=D1=82=D0=BE=D1=87=D0=B5=D1=87=D0=BD=D0=BE?=
 =?UTF-8?q?=D0=B9=20=D0=BF=D0=BE=D0=B4=D1=81=D1=82=D0=B0=D0=BD=D0=BE=D0=B2?=
 =?UTF-8?q?=D0=BA=D0=B5=20=D0=BF=D1=80=D0=BE=D1=86=D0=B5=D0=B4=D1=83=D1=80?=
 =?UTF-8?q?.v++?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                                      | 9 ++++++++-
 src/ProjectData/SapforData/Functions/FuncCall.java       | 4 ++++
 src/Repository/Component/Visualiser.java                 | 2 +-
 .../Passes/All/SPF_GetGraphFunctions.java                | 1 +
 src/Visual_DVM_2021/Passes/All/SPF_InlineProcedure.java  | 2 +-
 src/Visual_DVM_2021/Passes/All/SPF_InlineProcedures.java | 2 +-
 6 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 561b435f..93e969c0 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,7 +6,14 @@
     </artifacts-to-build>
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="" />
+    <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ProjectData/SapforData/Functions/FuncCall.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/SapforData/Functions/FuncCall.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_GetGraphFunctions.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_GetGraphFunctions.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_InlineProcedure.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_InlineProcedure.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_InlineProcedures.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_InlineProcedures.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SapforPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SapforPass.java" afterDir="false" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
diff --git a/src/ProjectData/SapforData/Functions/FuncCall.java b/src/ProjectData/SapforData/Functions/FuncCall.java
index 80ac91fc..559c6b3e 100644
--- a/src/ProjectData/SapforData/Functions/FuncCall.java
+++ b/src/ProjectData/SapforData/Functions/FuncCall.java
@@ -8,6 +8,7 @@ import Visual_DVM_2021.Passes.Pass_2021;
 public class FuncCall extends FileObjectWithMessages {
     public String funcName = "";  //не нужны дополнительные поля.имя функции это уже ключ.
     public boolean canBeInlined = false;
+    public FuncInfo parent = null;
     public FuncCall(DBProjectFile father_in, String funcName_in, int line_in) {
         super(father_in, line_in);
         funcName = funcName_in;
@@ -34,4 +35,7 @@ public class FuncCall extends FileObjectWithMessages {
             UI.Info("Для подстановки функций требуется выполнить проход " + Utils.DQuotes(PassCode_2021.SPF_GetGraphFunctions.getDescription()));
         }
     }
+    public int getInlineOffset(){
+        return parent.line-line;
+    }
 }
diff --git a/src/Repository/Component/Visualiser.java b/src/Repository/Component/Visualiser.java
index 09220b61..7a069028 100644
--- a/src/Repository/Component/Visualiser.java
+++ b/src/Repository/Component/Visualiser.java
@@ -62,7 +62,7 @@ public class Visualiser extends Component {
     //http://www.seostella.com/ru/article/2012/02/05/formatirovanie-daty-v-java.html
     @Override
     public void GetVersionInfo() {
-        version = 1033;
+        version = 1034;
         String pattern = "MMM dd yyyy HH:mm:ss";
         DateFormat df = new SimpleDateFormat(pattern, Locale.ENGLISH);
         date_text = df.format(getClassBuildTime());
diff --git a/src/Visual_DVM_2021/Passes/All/SPF_GetGraphFunctions.java b/src/Visual_DVM_2021/Passes/All/SPF_GetGraphFunctions.java
index bac565ea..11f2f9e5 100644
--- a/src/Visual_DVM_2021/Passes/All/SPF_GetGraphFunctions.java
+++ b/src/Visual_DVM_2021/Passes/All/SPF_GetGraphFunctions.java
@@ -85,6 +85,7 @@ public class SPF_GetGraphFunctions extends SapforAnalysis {
                         int c_line = Integer.parseInt(splited[idx.Inc()]);
                         //-
                         FuncCall fc = new FuncCall(file, call_name, c_line);
+                        fc.parent = nf;
                         nf.calls.add(fc);
                     }
                 }
diff --git a/src/Visual_DVM_2021/Passes/All/SPF_InlineProcedure.java b/src/Visual_DVM_2021/Passes/All/SPF_InlineProcedure.java
index 273c27ba..f8a50d6e 100644
--- a/src/Visual_DVM_2021/Passes/All/SPF_InlineProcedure.java
+++ b/src/Visual_DVM_2021/Passes/All/SPF_InlineProcedure.java
@@ -16,7 +16,7 @@ public class SPF_InlineProcedure extends SapforFilesModification {
     protected boolean canStart(Object... args) throws Exception {
         if (super.canStart(args) && (call = (args.length > 0) ? (FuncCall) args[0] : null) != null) {
             addOpt1 = call.funcName + "|" + Current.getFile().name;
-            addOpt2 = String.valueOf(call.line);
+            addOpt2 = String.valueOf(call.getInlineOffset());
             Global.changeSetting(SettingName.PARSE_FOR_INLINE, "1");
            // Pass_2021.passes.get(PassCode_2021.UpdateSetting).Do(SettingName.PARSE_FOR_INLINE, "1");
             SPF_ParseFilesWithOrder.silent = true;
diff --git a/src/Visual_DVM_2021/Passes/All/SPF_InlineProcedures.java b/src/Visual_DVM_2021/Passes/All/SPF_InlineProcedures.java
index e5be887f..1342b9b5 100644
--- a/src/Visual_DVM_2021/Passes/All/SPF_InlineProcedures.java
+++ b/src/Visual_DVM_2021/Passes/All/SPF_InlineProcedures.java
@@ -31,7 +31,7 @@ public class SPF_InlineProcedures extends SapforTransformation {
                     Result.add(String.valueOf(selected_children.size()));
                     for (FuncCall fc : selected_children) {
                         Result.add(fc.file);
-                        Result.add(String.valueOf(fc.line));
+                        Result.add(String.valueOf(fc.getInlineOffset()));
                     }
                 }
             }