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

++

Browse Source 
добавление учета пробелов в сравнение
This commit is contained in:
02090095
2025-07-13 19:33:57 +03:00
parent 6263934cbb
commit c5cd8113c0
29 changed files with 158 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,5 @@
package _VisualDVM.Passes.All;
import Common.Utils.Utils_;
import Common.Visual.UI;
import Common.Visual.Windows.Dialog.Text.ComboTextDialog;
import _VisualDVM.ComponentsServer.Component.Sapfor.Sapfor;
import _VisualDVM.ComponentsServer.Component.Sapfor.TransformationPermission;
@@ -55,9 +54,8 @@ public class CombineFiles extends Transformation {
Vector<String> result_lines = new Vector<>();
Vector<String> all_includes = new Vector<>();
//-----------------------------
result_lines.add("!-Found " + target.allIncludes.size() + " headers");
System.out.println("found "+target.allIncludes.size()+" headers");
System.out.println("found " + target.allIncludes.size() + " headers");
for (String name : target.allIncludes) {
all_includes.add(" include " + Utils_.Quotes(Utils_.toU(name))); //---
result_lines.add("! include " + Utils_.Quotes(Utils_.toU(name)));
@@ -88,7 +86,6 @@ public class CombineFiles extends Transformation {
result_lines.addAll(FileUtils.readLines(target.db.files.Data.get(name).file));
}
}
FileUtils.writeLines(result, result_lines, false);
//-------------------------------
//теперь скопировать остальные файлы

9
src/_VisualDVM/Passes/All/SPF_GetAllDeclaratedArrays.java
View File

@@ -1,16 +1,11 @@
package _VisualDVM.Passes.All;
import Common.Utils.Index;
import Common.Utils.Utils_;
import Common.Visual.UI;
import _VisualDVM.Global;
import _VisualDVM.Passes.Sapfor.SapforAnalysis;
import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.ProjectData.SapforData.Arrays.ArrayDecl;
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
public String phase() {
@@ -32,11 +27,11 @@ public class SPF_GetAllDeclaratedArrays extends SapforAnalysis {
@Override
public void unpack(String packed) throws Exception {
ArraysJson arraysJson = Utils_.gson.fromJson(packed, ArraysJson.class);
for (ProjectArray array: arraysJson.allArrays){
for (ProjectArray array : arraysJson.allArrays) {
array.Init();
target.declaratedArrays.put(array.id, array);
//--
for (ArrayDecl decl: array.declPlaces){
for (ArrayDecl decl : array.declPlaces) {
DBProjectFile projectFile = target.db.files.get(decl.file);
projectFile.array_decls.add(decl);
}

4
src/_VisualDVM/Passes/All/SPF_GetArrayDistributionOnlyAnalysis.java
View File

@@ -1,9 +1,7 @@
package _VisualDVM.Passes.All;
import Common.Utils.Index;
import Common.Utils.Utils_;
import Common.Utils.Vector_;
import Common.Visual.Controls.PassControl;
import Common.Visual.UI;
import _VisualDVM.Global;
import _VisualDVM.Passes.Sapfor.SapforAnalysis;
import _VisualDVM.ProjectData.SapforData.Regions.ParallelRegion;
@@ -27,7 +25,7 @@ public class SPF_GetArrayDistributionOnlyAnalysis extends SapforAnalysis {
@Override
protected void unpack(String packed) throws Exception {
RegionsJson regionsJson = Utils_.gson.fromJson(packed, RegionsJson.class);
for (ParallelRegion parallelRegion: regionsJson.allRegions){
for (ParallelRegion parallelRegion : regionsJson.allRegions) {
parallelRegion.Init();
target.parallelRegions.put(parallelRegion.regionId, parallelRegion);
}

3
src/_VisualDVM/Passes/All/SPF_GetArrayDistributionOnlyRegions.java
View File

@@ -1,5 +1,4 @@
package _VisualDVM.Passes.All;
import Common.Utils.Index;
import Common.Utils.Utils_;
import _VisualDVM.Global;
import _VisualDVM.Passes.Sapfor.SapforAnalysis;
@@ -13,7 +12,7 @@ public class SPF_GetArrayDistributionOnlyRegions extends SapforAnalysis {
@Override
protected void unpack(String packed) throws Exception {
RegionsJson regionsJson = Utils_.gson.fromJson(packed, RegionsJson.class);
for (ParallelRegion parallelRegion: regionsJson.allRegions){
for (ParallelRegion parallelRegion : regionsJson.allRegions) {
parallelRegion.Init();
target.parallelRegions.put(parallelRegion.regionId, parallelRegion);
}

6
src/_VisualDVM/Passes/All/SPF_GetArrayLinks.java
View File

@@ -22,13 +22,13 @@ public class SPF_GetArrayLinks extends SilentSapforPass {
id_2|number_2|link_id1|link_id2|link_id3
*/
//эту инфу суем в список объявленных массивов, чтобы не плодить лишних таблиц.
System.out.println("packed="+ Utils_.Brackets(packed));
System.out.println("packed=" + Utils_.Brackets(packed));
ProjectArray current_array = null;
ArrayLinksJson links = Utils_.gson.fromJson(packed, ArrayLinksJson.class);
for (ArrayLinkJson link: links.allLinks){
for (ArrayLinkJson link : links.allLinks) {
current_array = target.declaratedArrays.get(link.id);
current_array.links.clear();
for (long link_id: link.links){
for (long link_id : link.links) {
current_array.links.put(link_id, target.declaratedArrays.get(link_id));
}
}

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

@@ -55,17 +55,16 @@ public class SPF_GetGCovInfo extends SilentSapforPass {
}
protected void unpack(String packed) throws Exception {
GCOVJson allJson = Utils_.gson.fromJson(packed, GCOVJson.class);
for (FileGCOVJson fileJson: allJson.allGCov){
for (FileGCOVJson fileJson : allJson.allGCov) {
fileJson.file = Utils_.toW(fileJson.file);
//--
DBProjectFile projectFile = target.db.files.get(fileJson.file);
for (LineGCOVJson lineJson: fileJson.lines){
for (LineGCOVJson lineJson : fileJson.lines) {
if (lineJson.line > 0) {
int v_line = lineJson.line - 1;
long v_execution = (lineJson.execution >= 0) ? lineJson.execution : 0;
if (!projectFile.gcov_info.line_info.containsKey(v_line)) {
projectFile.gcov_info.add_line(v_line, v_execution);
}
}
}

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

@@ -44,9 +44,9 @@ public class SPF_GetIncludeDependencies extends SapforAnalysis {
FileInfo fileInfo = new FileInfo(fileIncludesJson.file);
//---
DBProjectFile file = target.db.files.get(fileIncludesJson.file);
System.out.println("addicted file = "+Utils_.Brackets(fileIncludesJson.file));
System.out.println("found dependencies :"+fileIncludesJson.includes.size());
/// UI.Info("+");
System.out.println("addicted file = " + Utils_.Brackets(fileIncludesJson.file));
System.out.println("found dependencies :" + fileIncludesJson.includes.size());
/// UI.Info("+");
for (Include include : fileIncludesJson.includes) {
//--
System.out.println(include.dependencyFileName);
@@ -56,7 +56,7 @@ public class SPF_GetIncludeDependencies extends SapforAnalysis {
fileInfo.dependencies.add(include);
if (!target.allIncludes.contains(include.dependencyFileName))
target.allIncludes.add(include.dependencyFileName);
if (target.db.files.containsKey(include.dependencyFileName)){
if (target.db.files.containsKey(include.dependencyFileName)) {
//- определение типов языков инклудов по файлу куда они цепляютс.
if (!file.dependencies.contains(include.dependencyFileName)) {
file.dependencies.add(include.dependencyFileName);
@@ -70,9 +70,8 @@ public class SPF_GetIncludeDependencies extends SapforAnalysis {
if (Global.mainModule.HasFile() && Global.mainModule.getFile().name.equals(include_file.name))
update_current = true;
}
}else {
System.out.println(Utils_.Brackets(include.dependencyFileName)+" не существует!");
} else {
System.out.println(Utils_.Brackets(include.dependencyFileName) + " не существует!");
}
}
//----
@@ -90,7 +89,7 @@ public class SPF_GetIncludeDependencies extends SapforAnalysis {
}
target.numAddicted += target.addictedFiles.size();
target.UpdateAddictedCount();
// UI.Info("unpack includes done");
// UI.Info("unpack includes done");
}
@Override
protected void showDone() throws Exception {

43
src/_VisualDVM/Passes/All/SPF_InsertIncludesPass.java
View File

@@ -42,30 +42,29 @@ public class SPF_InsertIncludesPass extends SapforTransformation {
}
return false;
}
/*
if (super.canStart(args)) {
if (target.numAddicted <= 0) {
Log.Writeln_("Не найдено файлов, имеющих зависимости по включению.");
return false;
}
IncludesToInsertJson includes = new IncludesToInsertJson();
for (FileInfo fileInfo : target.addictedFiles.values()) {
Vector<Include> selected_children = fileInfo.dependencies.stream().filter(Selectable::isSelected).collect(Collectors.toCollection(Vector::new));
if (!selected_children.isEmpty())
for (Include di : selected_children)
includes.allIncludes.add(new IncludeToInsertJson(di.dependencyFileName,fileInfo.file, di.line));
}
if (includes.allIncludes.isEmpty()) {
Log.Writeln_("Не отмечено ни одного заголовка для подстановки");
return false;
}
Options = Utils_.gson.toJson(includes);
return true;
/*
if (super.canStart(args)) {
if (target.numAddicted <= 0) {
Log.Writeln_("Не найдено файлов, имеющих зависимости по включению.");
return false;
}
return false;
IncludesToInsertJson includes = new IncludesToInsertJson();
for (FileInfo fileInfo : target.addictedFiles.values()) {
Vector<Include> selected_children = fileInfo.dependencies.stream().filter(Selectable::isSelected).collect(Collectors.toCollection(Vector::new));
if (!selected_children.isEmpty())
for (Include di : selected_children)
includes.allIncludes.add(new IncludeToInsertJson(di.dependencyFileName,fileInfo.file, di.line));
}
if (includes.allIncludes.isEmpty()) {
Log.Writeln_("Не отмечено ни одного заголовка для подстановки");
return false;
}
Options = Utils_.gson.toJson(includes);
return true;
}
return false;
*/
*/
@Override
protected void FocusBeforeStart() {
Global.mainModule.getUI().getMainWindow().getProjectWindow().FocusDependencies();

6
src/_VisualDVM/Passes/All/SPF_ParseFilesWithOrder.java
View File

@@ -58,7 +58,7 @@ public class SPF_ParseFilesWithOrder extends SapforAnalysis {
}
@Override
protected void unpackMessages() throws Exception {
System.out.println("packed="+sapfor.getOutputMessage());
System.out.println("packed=" + sapfor.getOutputMessage());
for (DBProjectFile f : target.db.files.Data.values())
if (f.isActive()) f.state = FileState.OK;
super.unpackMessages();
@@ -67,7 +67,7 @@ public class SPF_ParseFilesWithOrder extends SapforAnalysis {
badCount = 0;
for (DBProjectFile f : target.db.files.Data.values()) {
if (f.isActive()) {
System.out.println("file="+f.name+":"+f.state);
System.out.println("file=" + f.name + ":" + f.state);
switch (f.state) {
case OK:
case HasNotes:
@@ -105,7 +105,7 @@ public class SPF_ParseFilesWithOrder extends SapforAnalysis {
@Override
protected void unpack(String packed) throws Exception {
FilesOrderJson filesOrderJson = Utils_.gson.fromJson(packed, FilesOrderJson.class);
for (String fileName_ :filesOrderJson.allFiles)
for (String fileName_ : filesOrderJson.allFiles)
target.files_order.add(Utils_.toW(fileName_));
}
@Override