M/VisualSapfor
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

небольшие правки с инклудами

Browse Source
This commit is contained in:
02090095
2025-04-15 00:02:43 +03:00
parent 8d236c99b8
commit a0c45a2df0
7 changed files with 43 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
.idea/workspace.xml generated
View File

@@ -8,9 +8,12 @@
<component name="ChangeListManager"> <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$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CombineFiles.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CombineFiles.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_GetIncludeDependencies.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_GetIncludeDependencies.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_GetIncludeDependencies.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_GetIncludeDependencies.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_InsertIncludesPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_InsertIncludesPass.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/DBProjectFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/DBProjectFile.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Includes/Include.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Includes/Include.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Utils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Utils.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainEditorMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainEditorMenu.java" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />

2
properties
View File

@@ -4,7 +4,7 @@
"ServerUserPassword": "mprit_2011", "ServerUserPassword": "mprit_2011",
"OfferRegistrationOnStart": true, "OfferRegistrationOnStart": true,
"Workspace": "E:\\Tests", "Workspace": "E:\\Tests",
"ProjectsSearchDirectory": "E:\\SAPFOR\\Tests\\BT_inserted", "ProjectsSearchDirectory": "E:\\Tests\\Downloads\\bug_1643809587",
"DocumentsDirectory": "C:\\Users\\misha\\Documents\\_testing_system", "DocumentsDirectory": "C:\\Users\\misha\\Documents\\_testing_system",
"VisualiserPath": "C:\\Users\\misha\\Downloads", "VisualiserPath": "C:\\Users\\misha\\Downloads",
"Sapfor_FPath": "E:\\_sapfor_x64\\Components\\Sapfor_F", "Sapfor_FPath": "E:\\_sapfor_x64\\Components\\Sapfor_F",

5
src/_VisualDVM/Passes/All/CombineFiles.java
View File

@@ -75,10 +75,9 @@ public class CombineFiles extends Transformation {
for (String line : file_lines) { for (String line : file_lines) {
String header = Utils.extractHeaderName(line); String header = Utils.extractHeaderName(line);
if (header != null) { if (header != null) {
if (file.relativeHeaders.containsKey(header)) if (file.dependencies.contains(header))
result_lines.add(" include " + Utils_.Quotes( result_lines.add(" include " + Utils_.Quotes(
Utils_.toU( Utils_.toU(header)));
file.relativeHeaders.get(header).name)));
} else } else
result_lines.add(line); result_lines.add(line);
} }

30
src/_VisualDVM/Passes/All/SPF_GetIncludeDependencies.java
View File

@@ -9,7 +9,8 @@ import _VisualDVM.ProjectData.Files.LanguageStyle;
import _VisualDVM.ProjectData.LanguageName; import _VisualDVM.ProjectData.LanguageName;
import _VisualDVM.ProjectData.SapforData.Includes.FileInfo; import _VisualDVM.ProjectData.SapforData.Includes.FileInfo;
import _VisualDVM.ProjectData.SapforData.Includes.Include; import _VisualDVM.ProjectData.SapforData.Includes.Include;
import _VisualDVM.Utils; import _VisualDVM.ProjectData.SapforData.Includes.Json.FileIncludesJson;
import _VisualDVM.ProjectData.SapforData.Includes.Json.IncludesJson;
import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.DefaultMutableTreeNode;
public class SPF_GetIncludeDependencies extends SapforAnalysis { public class SPF_GetIncludeDependencies extends SapforAnalysis {
@@ -30,12 +31,21 @@ public class SPF_GetIncludeDependencies extends SapforAnalysis {
target.includes_root.removeAllChildren(); target.includes_root.removeAllChildren();
target.allIncludes.clear(); target.allIncludes.clear();
for (DBProjectFile file : target.db.files.Data.values()) for (DBProjectFile file : target.db.files.Data.values())
file.relativeHeaders.clear(); file.dependencies.clear();
} }
@Override @Override
public void unpack(String packed) throws Exception { public void unpack(String packed) throws Exception {
// IncludesJson includesJson = Utils_.gson.fromJson(packed, IncludesJson.class); /*
// System.out.println("packed="+packed); IncludesJson includesJson = Utils_.gson.fromJson(packed, IncludesJson.class);
System.out.println("packed="+packed);
for (FileIncludesJson fileIncludesJson : includesJson.allIncludes) {
String file_name = Utils_.toW(fileIncludesJson.file);
DBProjectFile dbProjectFile = target.db.files.get(file_name);
for (Include include : fileIncludesJson.includes)
dbProjectFile.dependencies.add(include.dependencyFileName);
}
*/
//--
update_current = false; update_current = false;
FileInfo fileInfo = null; FileInfo fileInfo = null;
String[] data_ = packed.split("@"); String[] data_ = packed.split("@");
@@ -56,16 +66,18 @@ public class SPF_GetIncludeDependencies extends SapforAnalysis {
if (!target.addictedFiles.containsKey(fileInfo.file)) if (!target.addictedFiles.containsKey(fileInfo.file))
target.addictedFiles.put(fileInfo.file, fileInfo); target.addictedFiles.put(fileInfo.file, fileInfo);
//------------------------------------- //-------------------------------------
String file_name = data__[j]; String include_name = data__[j];
if (target.db.files.containsKey(file_name)) { if (target.db.files.containsKey(include_name)) {
DBProjectFile d_file = target.db.files.Data.get(file_name); DBProjectFile d_file = target.db.files.Data.get(include_name);
//----------------->> //----------------->>
if (!target.allIncludes.containsKey(d_file.name)) if (!target.allIncludes.containsKey(d_file.name))
target.allIncludes.put(d_file.name, d_file); target.allIncludes.put(d_file.name, d_file);
//----------------->> //----------------->>
//--
DBProjectFile father = target.db.files.Data.get(fileInfo.file); DBProjectFile father = target.db.files.Data.get(fileInfo.file);
father.relativeHeaders.put(Utils.getRelativeName(father.file.getParentFile(), d_file.file), d_file); if (!father.dependencies.contains(include_name))
// if (d_file.fileType == FileType.none) father.dependencies.add(include_name);
//--
d_file.UpdateType(FileType.header); d_file.UpdateType(FileType.header);
if (d_file.languageName == LanguageName.n) if (d_file.languageName == LanguageName.n)
d_file.UpdateLanguage(father.languageName); d_file.UpdateLanguage(father.languageName);

5
src/_VisualDVM/ProjectData/Files/DBProjectFile.java
View File

@@ -14,6 +14,7 @@ import _VisualDVM.ProjectData.SapforData.FileObjectWithMessages;
import _VisualDVM.ProjectData.SapforData.Functions.FuncCall; import _VisualDVM.ProjectData.SapforData.Functions.FuncCall;
import _VisualDVM.ProjectData.SapforData.Functions.FuncInfo; import _VisualDVM.ProjectData.SapforData.Functions.FuncInfo;
import _VisualDVM.ProjectData.SapforData.Functions.FunctionType; import _VisualDVM.ProjectData.SapforData.Functions.FunctionType;
import _VisualDVM.ProjectData.SapforData.Includes.Include;
import _VisualDVM.ProjectData.SapforData.Loops.Loop; import _VisualDVM.ProjectData.SapforData.Loops.Loop;
import _VisualDVM.Utils; import _VisualDVM.Utils;
import _VisualDVM.Visual.Windows.FileForm; import _VisualDVM.Visual.Windows.FileForm;
@@ -63,7 +64,7 @@ public class DBProjectFile extends ProjectFile {
public LinkedHashMap<Integer, Loop> AllLoops = new LinkedHashMap<>(); public LinkedHashMap<Integer, Loop> AllLoops = new LinkedHashMap<>();
public LinkedHashMap<String, FuncInfo> function_decls = new LinkedHashMap<>(); //объявления public LinkedHashMap<String, FuncInfo> function_decls = new LinkedHashMap<>(); //объявления
public Vector<ArrayDecl> array_decls = new Vector<>(); public Vector<ArrayDecl> array_decls = new Vector<>();
public LinkedHashMap<String, DBProjectFile> relativeHeaders = new LinkedHashMap<>(); public Vector<String> dependencies = new Vector<>();
public GCOV_info gcov_info = new GCOV_info(); public GCOV_info gcov_info = new GCOV_info();
private PrintStream Sys; private PrintStream Sys;
public DBProjectFile() { public DBProjectFile() {
@@ -228,7 +229,7 @@ public class DBProjectFile extends ProjectFile {
AllLoops.clear(); AllLoops.clear();
CallGraphTitle = Constants.no_data; CallGraphTitle = Constants.no_data;
function_decls.clear(); function_decls.clear();
relativeHeaders.clear(); dependencies.clear();
ArrayGraphTitle = Constants.no_data; ArrayGraphTitle = Constants.no_data;
array_decls.clear(); array_decls.clear();
gcov_info.clear(); gcov_info.clear();

11
src/_VisualDVM/Utils.java
View File

@@ -286,12 +286,19 @@ public class Utils {
} }
//</editor-fold> //</editor-fold>
public static String extractHeaderName(String line) { public static String extractHeaderName(String line) {
String res =null;
String tline = line.trim().toLowerCase(); String tline = line.trim().toLowerCase();
if (tline.startsWith("include")) { if (tline.startsWith("include")) {
String[] data = tline.split("'"); String[] data = tline.split("'");
return data.length > 1 ? data[1] : null; res = data.length > 1 ? Utils_.toW(data[1]) : null;
if (res!=null){
if (res.startsWith("\\")){
res= res.substring(1);
} }
return null; }
}
System.out.println(res);
return res;
} }
public static String getRelativeName(File dir, File file) { public static String getRelativeName(File dir, File file) {
return return

4
src/_VisualDVM/Visual/Menus/MainEditorMenu.java
View File

@@ -280,11 +280,11 @@ public class MainEditorMenu extends TextEditorMenu {
m_gotoHeader.setText("Невозможно перейти к заголовочному файлу. Выполните проход \"Поиск зависимостей по включению\""); m_gotoHeader.setText("Невозможно перейти к заголовочному файлу. Выполните проход \"Поиск зависимостей по включению\"");
return; return;
} }
if (!Global.mainModule.getFile().relativeHeaders.containsKey(header_)) { if (!Global.mainModule.getFile().dependencies.contains(header_)) {
m_gotoHeader.setText("Невозможно перейти к заголовочному файлу " + Utils_.Brackets(header_) + " . Файл не найден среди включений текущего файла."); m_gotoHeader.setText("Невозможно перейти к заголовочному файлу " + Utils_.Brackets(header_) + " . Файл не найден среди включений текущего файла.");
return; return;
} }
header = Global.mainModule.getFile().relativeHeaders.get(header_); header = Global.mainModule.getProject().db.files.get(header_);
m_gotoHeader.setText("Переход к заголовочному файлу " + Utils_.Brackets(header_)); m_gotoHeader.setText("Переход к заголовочному файлу " + Utils_.Brackets(header_));
m_gotoHeader.setEnabled(true); m_gotoHeader.setEnabled(true);
} }