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

no message

Browse Source
This commit is contained in:
02090095
2025-05-06 17:28:46 +03:00
parent 6e0956e3e5
commit 62a45fd8be
3 changed files with 10 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
.idea/workspace.xml generated
View File

@@ -7,16 +7,9 @@
</component> </component>
<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 afterPath="$PROJECT_DIR$/src/Common/Utils/IntegerPairJson.java" afterDir="false" />
<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/ProjectData/SapforData/Arrays/ArrayDecl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/ArrayDecl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/MassSelectArrays.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/MassSelectArrays.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_GetGCovInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_GetGCovInfo.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/DBArray/DBArray.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/DBArray/DBArray.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/UI/Editor/SPFEditor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/UI/Editor/SPFEditor.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/Distribution/DataDirective.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/Distribution/DataDirective.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/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/Arrays/UI/ProjectArraysForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/UI/ProjectArraysForm.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" />

7
src/_VisualDVM/ProjectData/SapforData/Arrays/ArrayDecl.java
View File

@@ -8,14 +8,15 @@ public class ArrayDecl extends FileObjectWithMessages {
@Expose @Expose
public String array_name; public String array_name;
@Expose @Expose
public ArrayLocation array_loc; public int array_loc;
public ArrayDecl(String array_name_in, ArrayLocation array_loc_in, DBProjectFile father_in, int lineNum_in) { //--
public ArrayDecl(String array_name_in, int array_loc_in, DBProjectFile father_in, int lineNum_in) {
super(father_in, lineNum_in); super(father_in, lineNum_in);
array_name = array_name_in; array_name = array_name_in;
array_loc = array_loc_in; array_loc = array_loc_in;
} }
@Override @Override
public String Description() { public String Description() {
return array_loc.getDescription() + " массив " + Utils_.Brackets(array_name); return ArrayLocation.fromInt(array_loc).getDescription() + " массив " + Utils_.Brackets(array_name);
} }
} }

13
src/_VisualDVM/ProjectData/SapforData/Arrays/ProjectArray.java
View File

@@ -22,9 +22,6 @@ import java.util.List;
import java.util.Vector; import java.util.Vector;
import java.util.stream.Collectors; import java.util.stream.Collectors;
public class ProjectArray extends DBObject { public class ProjectArray extends DBObject {
//----------------------------------------------------------------------
public static final String[] alignNames = {"i", "j", "k", "l", "m", "n", "q", "r", "s", "t", "u", "w", "x", "y", "z"};
//json-------------------
@Expose @Expose
public long id; public long id;
@Expose @Expose
@@ -47,7 +44,6 @@ public class ProjectArray extends DBObject {
public int isLoopArrayFlag; public int isLoopArrayFlag;
@Expose @Expose
Vector<ArrayDecl> declPlaces = new Vector<>(); Vector<ArrayDecl> declPlaces = new Vector<>();
//--шаблон---
@Expose @Expose
List<Integer> deprecateToDist = new Vector<>(); List<Integer> deprecateToDist = new Vector<>();
@Expose @Expose
@@ -56,9 +52,10 @@ public class ProjectArray extends DBObject {
Vector<IntegerPairJson> sizes = new Vector<>(); Vector<IntegerPairJson> sizes = new Vector<>();
@Expose @Expose
Vector<String> regions = new Vector<>(); Vector<String> regions = new Vector<>();
//--
// LinkedHashMap<BigInteger, TemplateLink> templateInfo = new LinkedHashMap<>(); //----------------------------------------------------------------------
//--- public static final String[] alignNames = {"i", "j", "k", "l", "m", "n", "q", "r", "s", "t", "u", "w", "x", "y", "z"};
//json-------------------
public String UniqKey; public String UniqKey;
public BigInteger address; public BigInteger address;
@@ -135,7 +132,7 @@ public class ProjectArray extends DBObject {
DBProjectFile file = Global.mainModule.getProject().db.files.Data.get(declFile); DBProjectFile file = Global.mainModule.getProject().db.files.Data.get(declFile);
int declLine = Integer.parseInt(localSplited[idxPl + 1]); int declLine = Integer.parseInt(localSplited[idxPl + 1]);
//declPlaces.add(new Pair<>(declFile, declLine)); //declPlaces.add(new Pair<>(declFile, declLine));
ArrayDecl decl = new ArrayDecl(shortName, getLocation(), file, declLine); ArrayDecl decl = new ArrayDecl(shortName, location, file, declLine);
declPlaces.add(decl); declPlaces.add(decl);
file.array_decls.add(decl); //++ file.array_decls.add(decl); //++
} }