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
2024-10-07 14:22:52 +03:00
parent 6b1576461d
commit 61fc37b574
173 changed files with 960 additions and 1526 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/ProjectData/Files/DBProjectFile.java
View File

@@ -1,4 +1,5 @@
package ProjectData.Files;
import Common.Utils.CommonUtils;
import Common_old.Constants;
import Common_old.Current;
import _VisualDVM.Global;
@@ -85,7 +86,7 @@ public class DBProjectFile extends ProjectFile {
if (data.length > 1) {
String[] data1 = data[1].split(":");
if (data1.length > 0) {
file = Utils.toW(data1[0]);//.substring(1));
file = CommonUtils.toW(data1[0]);//.substring(1));
//первый символ тут всегда пробел. слеши всегда виндовые.
}
}
@@ -156,7 +157,7 @@ public class DBProjectFile extends ProjectFile {
String default_options = "";
switch (languageName) {
case fortran:
default_options += " -spf -noProject -o " + Utils.DQuotes(getDepFile().getAbsolutePath());
default_options += " -spf -noProject -o " + CommonUtils.DQuotes(getDepFile().getAbsolutePath());
switch (style) {
case free:
default_options += " -f90";
@@ -390,10 +391,10 @@ public class DBProjectFile extends ProjectFile {
father.db.Update(this);
}
public String getUnixName() {
return Utils.toU(name);
return CommonUtils.toU(name);
}
public String getQObjectName() {
return Utils.DQuotes(getUnixName() + ".o");
return CommonUtils.DQuotes(getUnixName() + ".o");
}
@Override
@@ -401,7 +402,7 @@ public class DBProjectFile extends ProjectFile {
return name;
}
public String getProjectNameWithoutExtension() {
String extension = Utils.getExtension(file);
String extension = CommonUtils.getExtension(file);
return name.substring(0, name.length() - (extension.length() + 1));
}
public void importSettings(DBProjectFile parent, boolean sapforStyle) throws Exception {

10
src/ProjectData/Files/ProjectFile.java
View File

@@ -1,7 +1,7 @@
package ProjectData.Files;
import Common.Utils.CommonUtils;
import Common_old.Constants;
import Common.Database.Objects.DBObject;
import Common_old.Utils.Utils;
import ProjectData.LanguageName;
import javax.swing.*;
@@ -48,7 +48,7 @@ public class ProjectFile extends DBObject {
}
}
//-
switch (Utils.getExtensionByName(name_in)) {
switch (CommonUtils.getExtensionFromName(name_in)) {
case "f":
case "fdv":
case "for":
@@ -87,7 +87,7 @@ public class ProjectFile extends DBObject {
fileType = FileType.forbidden;
break;
case "":
if (Utils.isDigit(name_in)) {
if (CommonUtils.isDigit(name_in)) {
fileType = FileType.forbidden;
} else {
state = FileState.Excluded;
@@ -130,14 +130,14 @@ public class ProjectFile extends DBObject {
return new ImageIcon(imageUrl);
}
public String getUnixName() {
return Utils.toU(file.getName());
return CommonUtils.toU(file.getName());
}
@Override
public String toString() {
return file.getName();
}
public String getQSourceName() {
return Utils.DQuotes(getUnixName());
return CommonUtils.DQuotes(getUnixName());
}
public String getStyleOptions() {
if (languageName == LanguageName.fortran) {

4
src/ProjectData/Files/UI/Editor/AutoComplete/SAPFOR/Directives/BaseDirective.java
View File

@@ -1,6 +1,6 @@
package ProjectData.Files.UI.Editor.AutoComplete.SAPFOR.Directives;
import Common.Utils.CommonUtils;
import Common_old.UI.Editor.CaretInfo;
import Common_old.Utils.Utils;
import ProjectData.Files.UI.Editor.AutoComplete.SAPFOR.Providers.BaseProvider;
import ProjectData.Files.UI.Editor.AutoComplete.SAPFOR.SapforAutoComplete;
import org.fife.ui.autocomplete.BasicCompletion;
@@ -18,7 +18,7 @@ public class BaseDirective extends BasicCompletion {
getCaretInfo().suffix_word.isEmpty() &&
name.getText().startsWith(getCaretInfo().prefix_word)
&& (!name.getText().equals(getCaretInfo().prefix_word))
&& !Utils.isBracketsBalanced(getCaretInfo().before);
&& !CommonUtils.isRBracketsBalanced(getCaretInfo().before);
}
//итоговая функция, определяющая наличие директивы в автозаполнении
public boolean Check() {

3
src/ProjectData/Messages/Message.java
View File

@@ -1,4 +1,5 @@
package ProjectData.Messages;
import Common.Utils.CommonUtils;
import Common_old.Constants;
import Common_old.Current;
import _VisualDVM.Global;
@@ -396,7 +397,7 @@ public class Message extends FileObject {
if (sum != splited.length && !message.equals("")) {
Utils.CopyToClipboard(message);
throw new PassException("Ошибка при декодировании сообщений на русском языке\n" +
"message=" + Utils.Brackets(message));
"message=" + CommonUtils.Brackets(message));
}
idx = 0;
String result = "";

10
src/ProjectData/Messages/Recommendations/MessageRecommendation.java
View File

@@ -1,6 +1,6 @@
package ProjectData.Messages.Recommendations;
import Common.Database.Objects.iDBObject;
import Common_old.Utils.Utils;
import Common.Utils.CommonUtils;
import GlobalData.Settings.SettingName;
import Visual_DVM_2021.Passes.PassCode_2021;
import com.sun.org.glassfish.gmbal.Description;
@@ -19,18 +19,18 @@ public class MessageRecommendation extends iDBObject {
public MessageRecommendation(PassCode_2021 passCode_in) {
type = RecommendationType.Transformation;
argName = passCode_in.toString();
text = "Выполните преобразование " + Utils.Quotes(passCode_in.getDescription());
text = "Выполните преобразование " + CommonUtils.Quotes(passCode_in.getDescription());
}
public MessageRecommendation(SettingName settingName_in, String settingValue_in) {
type = RecommendationType.Setting;
argName = settingName_in.toString();
argValue = settingValue_in;
if (argValue.equals("1"))
text = "Включите настройку SAPFOR " + Utils.Quotes(settingName_in.getDescription());
text = "Включите настройку SAPFOR " + CommonUtils.Quotes(settingName_in.getDescription());
else if (argValue.equals("0"))
text = "Отключите настройку SAPFOR " + Utils.Quotes(settingName_in.getDescription());
text = "Отключите настройку SAPFOR " + CommonUtils.Quotes(settingName_in.getDescription());
else
text = "Задайте значение " + Utils.DQuotes(argValue) + " для настройки SAPFOR " + Utils.Quotes(settingName_in.getDescription());
text = "Задайте значение " + CommonUtils.DQuotes(argValue) + " для настройки SAPFOR " + CommonUtils.Quotes(settingName_in.getDescription());
}
public MessageRecommendation(String text_in) {
type = RecommendationType.Text;

52
src/ProjectData/Project/db_project_info.java
View File

@@ -1,4 +1,6 @@
package ProjectData.Project;
import Common.CommonConstants;
import Common.Utils.CommonUtils;
import Common_old.Constants;
import Common_old.Current;
import Common.Database.Objects.DBObject;
@@ -65,7 +67,7 @@ public class db_project_info extends DBObject {
public String Log = "";//текст выдаваемый сапфором
//-----------------------------------------------
@Description("DEFAULT -1")
public long creationDate = Constants.Nan; //--------------------------------------------------NEW.
public long creationDate = CommonConstants.Nan; //--------------------------------------------------NEW.
@Description("DEFAULT ''")
public String compilation_output = "";
@Description("DEFAULT ''")
@@ -88,19 +90,19 @@ public class db_project_info extends DBObject {
public int maxdim = 0;
//<editor-fold desc="Метрика">
@Description("DEFAULT -1")
public int numLines = Constants.Nan;
public int numLines = CommonConstants.Nan;
@Description("DEFAULT -1")
public int numSPF = Constants.Nan;
public int numSPF = CommonConstants.Nan;
@Description("DEFAULT -1")
public int numDVM = Constants.Nan;
public int numDVM = CommonConstants.Nan;
@Description("DEFAULT -1")
public int numArrays = Constants.Nan;
public int numArrays = CommonConstants.Nan;
@Description("DEFAULT -1")
public int numLoops = Constants.Nan;
public int numLoops = CommonConstants.Nan;
@Description("DEFAULT -1")
public int numFunctions = Constants.Nan;
public int numFunctions = CommonConstants.Nan;
@Description("DEFAULT -1")
public int numAddicted = Constants.Nan;
public int numAddicted = CommonConstants.Nan;
//-------------------------------------
//параметры графа функций. храним для каждого проекта.
@Description("DEFAULT 500")
@@ -309,10 +311,10 @@ public class db_project_info extends DBObject {
}
public boolean IsMCopy() {
String lname = name.toLowerCase();
return (lname.startsWith("m") && Utils.isDigit(lname.substring(1)));
return (lname.startsWith("m") && CommonUtils.isDigit(lname.substring(1)));
}
public String getTitle() {
return name + " " + Utils.DQuotes(description);
return name + " " + CommonUtils.DQuotes(description);
}
public File getProjFile() {
return Paths.get(Home.getAbsolutePath(), Constants.data, Constants.spf).toFile();
@@ -398,13 +400,13 @@ public class db_project_info extends DBObject {
allIncludes.clear();
files_order.clear();
functionsGraph.Clear();
numLines = Constants.Nan;
numSPF = Constants.Nan;
numDVM = Constants.Nan;
numArrays = Constants.Nan;
numFunctions = Constants.Nan;
numAddicted = Constants.Nan;
numLoops = Constants.Nan;
numLines = CommonConstants.Nan;
numSPF = CommonConstants.Nan;
numDVM = CommonConstants.Nan;
numArrays = CommonConstants.Nan;
numFunctions = CommonConstants.Nan;
numAddicted = CommonConstants.Nan;
numLoops = CommonConstants.Nan;
Log = "";
Scenario = "";
declaratedArrays.clear();
@@ -528,10 +530,10 @@ public class db_project_info extends DBObject {
return numLoops == ParallelVariant.statNaN ? recommendAnalysis(PassCode_2021.SPF_GetGraphLoops) : String.valueOf(numLoops);
}
public String FunctionsCount() {
return numFunctions == Constants.Nan ? recommendAnalysis(PassCode_2021.SPF_GetGraphFunctions) : String.valueOf(numFunctions);
return numFunctions == CommonConstants.Nan ? recommendAnalysis(PassCode_2021.SPF_GetGraphFunctions) : String.valueOf(numFunctions);
}
public String AddictedCount() {
return numAddicted == Constants.Nan ? recommendAnalysis(PassCode_2021.SPF_GetIncludeDependencies) : String.valueOf(numAddicted);
return numAddicted == CommonConstants.Nan ? recommendAnalysis(PassCode_2021.SPF_GetIncludeDependencies) : String.valueOf(numAddicted);
}
public boolean UpdateLinesCount() {
try {
@@ -673,8 +675,8 @@ public class db_project_info extends DBObject {
public boolean FolderNotExists(File new_directory, File subdir, TextLog passLog) {
for (File pf : getSubdirectoriesSimple(subdir)) {
if (pf.getName().equals(new_directory.getName())) {
passLog.Writeln("В папке " + Utils.Brackets(subdir.getAbsolutePath()) + "\n" +
"уже существует папка с именем " + Utils.Brackets(new_directory.getName()));
passLog.Writeln("В папке " + CommonUtils.Brackets(subdir.getAbsolutePath()) + "\n" +
"уже существует папка с именем " + CommonUtils.Brackets(new_directory.getName()));
return false;
}
}
@@ -713,8 +715,8 @@ public class db_project_info extends DBObject {
}
public boolean CheckAttachmentFile(File f, TextLog Log) {
Utils.validateFileShortNewName(f.getName(), Log);
if (Utils.getFileSizeMegaBytes(f) > 2)
Log.Writeln_("Размер вложения " + Utils.Brackets(f.getName()) + " превышает 2 Мb");
if (CommonUtils.getFileSizeMegaBytes(f) > 2)
Log.Writeln_("Размер вложения " + CommonUtils.Brackets(f.getName()) + " превышает 2 Мb");
return Log.isEmpty();
}
public boolean CheckAllAttachments(TextLog Log) {
@@ -843,7 +845,7 @@ public class db_project_info extends DBObject {
for (String key_ : versions.keySet()) {
String[] data_ = key_.split(letter);
String last = data_[data_.length - 1];
if (Utils.isDigit(last)) {
if (CommonUtils.isDigit(last)) {
int vn = Integer.parseInt(last);
if (vn > max_vn)
max_vn = vn;
@@ -1123,7 +1125,7 @@ public class db_project_info extends DBObject {
String[] splited = packed_messages.split("\\|");
int numberOfFiles = Integer.parseInt(splited[idx++]);
for (int i = 0; i < numberOfFiles; ++i) {
String message_file = Utils.toW(splited[idx++]); //для ключа.
String message_file = CommonUtils.toW(splited[idx++]); //для ключа.
int numberOfMessages = Integer.parseInt(splited[idx++]);
if (!db.files.Data.containsKey(message_file)) {
throw new PassException("Ошибка при распаковке сообщений: файл: [" +

4
src/ProjectData/SapforData/Arrays/ArrayDecl.java
View File

@@ -1,5 +1,5 @@
package ProjectData.SapforData.Arrays;
import Common_old.Utils.Utils;
import Common.Utils.CommonUtils;
import ProjectData.Files.DBProjectFile;
import ProjectData.SapforData.FileObjectWithMessages;
// это то что отображается в боковом графе файла. не путать с сапфоровским ProjectArray
@@ -13,6 +13,6 @@ public class ArrayDecl extends FileObjectWithMessages {
}
@Override
public String Description() {
return array_loc.getDescription() + " массив " + Utils.Brackets(array_name);
return array_loc.getDescription() + " массив " + CommonUtils.Brackets(array_name);
}
}

5
src/ProjectData/SapforData/Arrays/ProjectArray.java
View File

@@ -1,4 +1,5 @@
package ProjectData.SapforData.Arrays;
import Common.Utils.CommonUtils;
import Common_old.Current;
import Common.Database.Objects.DBObject;
import Common.Utils.Index;
@@ -103,7 +104,7 @@ public class ProjectArray extends DBObject {
int numDeclPlaces = Integer.parseInt(localSplited[2]);
int idxPl = 3;
for (int i = 0; i < numDeclPlaces; ++i, idxPl += 2) {
String declFile = Utils.toW(localSplited[idxPl]);
String declFile = CommonUtils.toW(localSplited[idxPl]);
DBProjectFile file = Current.getProject().db.files.Data.get(declFile);
int declLine = Integer.parseInt(localSplited[idxPl + 1]);
//declPlaces.add(new Pair<>(declFile, declLine));
@@ -318,7 +319,7 @@ public class ProjectArray extends DBObject {
default:
break;
}
res += Utils.ending(i == binary.length() - 1);
res += CommonUtils.ending(i == binary.length() - 1);
}
}
return res;

4
src/ProjectData/SapforData/FileObject.java
View File

@@ -1,8 +1,8 @@
package ProjectData.SapforData;
import Common.Utils.CommonUtils;
import Common_old.Current;
import Common.Database.Objects.iDBObject;
import Common_old.UI.UI;
import Common_old.Utils.Utils;
import ProjectData.Files.DBProjectFile;
import com.sun.org.glassfish.gmbal.Description;
//объект принадлежащий файлу и относящийся к его строке.
@@ -18,7 +18,7 @@ public abstract class FileObject extends iDBObject {
}
@Override
public String getSelectionText() {
return "файл " + Utils.Brackets(file) + " строка: " + line;
return "файл " + CommonUtils.Brackets(file) + " строка: " + line;
}
public DBProjectFile getFather() {
return Current.getProject().db.files.Data.get(file);

6
src/ProjectData/SapforData/Functions/FuncCall.java
View File

@@ -1,6 +1,6 @@
package ProjectData.SapforData.Functions;
import Common.Utils.CommonUtils;
import Common_old.UI.UI;
import Common_old.Utils.Utils;
import ProjectData.Files.DBProjectFile;
import ProjectData.SapforData.FileObjectWithMessages;
import Visual_DVM_2021.Passes.PassCode_2021;
@@ -25,14 +25,14 @@ public class FuncCall extends FileObjectWithMessages {
}
@Override
public String Description() {
return "вызов " + Utils.Brackets(funcName);
return "вызов " + CommonUtils.Brackets(funcName);
}
@Override
public void Select(boolean flag) {
if (Pass_2021.passes.get(PassCode_2021.SPF_GetGraphFunctions).isDone()) {
super.Select(flag);
} else {
UI.Info("Для подстановки функций требуется выполнить проход " + Utils.DQuotes(PassCode_2021.SPF_GetGraphFunctions.getDescription()));
UI.Info("Для подстановки функций требуется выполнить проход " + CommonUtils.DQuotes(PassCode_2021.SPF_GetGraphFunctions.getDescription()));
}
}
}

6
src/ProjectData/SapforData/Functions/FuncCallH.java
View File

@@ -1,6 +1,6 @@
package ProjectData.SapforData.Functions;
import Common.Utils.CommonUtils;
import Common_old.UI.UI;
import Common_old.Utils.Utils;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
@@ -29,7 +29,7 @@ public class FuncCallH extends FuncCall {
}
@Override
public String getSelectionText() {
return "вызов " + Utils.Brackets(funcName) + " в строке " + line;
return "вызов " + CommonUtils.Brackets(funcName) + " в строке " + line;
}
@Override
public void SelectAllChildren(boolean select) {
@@ -41,7 +41,7 @@ public class FuncCallH extends FuncCall {
if (Pass_2021.passes.get(PassCode_2021.SPF_GetGraphFunctions).isDone()) {
super.Select(flag);
} else {
UI.Info("Для подстановки функций требуется выполнить проход " + Utils.DQuotes(PassCode_2021.SPF_GetGraphFunctions.getDescription()));
UI.Info("Для подстановки функций требуется выполнить проход " + CommonUtils.DQuotes(PassCode_2021.SPF_GetGraphFunctions.getDescription()));
}
}
}

5
src/ProjectData/SapforData/Functions/FuncInfo.java
View File

@@ -1,4 +1,5 @@
package ProjectData.SapforData.Functions;
import Common.Utils.CommonUtils;
import Common.Utils.Index;
import Common_old.Utils.Utils;
import ProjectData.Files.DBProjectFile;
@@ -52,7 +53,7 @@ public class FuncInfo extends FileObjectWithMessages {
//--
@Override
public String getSelectionText() {
return type.getDescription() + " " + Utils.Brackets(funcName);
return type.getDescription() + " " + CommonUtils.Brackets(funcName);
}
public boolean isMain() {
return type.equals(FunctionType.Main);
@@ -77,6 +78,6 @@ public class FuncInfo extends FileObjectWithMessages {
}
@Override
public String Description() {
return type.getDescription() + " " + Utils.Brackets(funcName);
return type.getDescription() + " " + CommonUtils.Brackets(funcName);
}
}

4
src/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphMenu.java
View File

@@ -1,9 +1,9 @@
package ProjectData.SapforData.Functions.UI.Graph;
import Common.Utils.CommonUtils;
import Common_old.Current;
import Common_old.UI.Menus.VisualiserMenuItem;
import Common_old.UI.Menus.StyledPopupMenu;
import Common_old.UI.UI;
import Common_old.Utils.Utils;
import Visual_DVM_2021.Passes.All.SPF_GetGraphFunctionPositions;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
@@ -32,7 +32,7 @@ public class FunctionsGraphMenu extends StyledPopupMenu {
@Override
public void CheckElementsVisibility() {
if (Current.HasSelectedFunction()) {
changeCurrent.setText("Назначить процедуру " + Utils.DQuotes(Current.getSelectionFunction().funcName) + " текущей.");
changeCurrent.setText("Назначить процедуру " + CommonUtils.DQuotes(Current.getSelectionFunction().funcName) + " текущей.");
changeCurrent.setEnabled(true);
} else {
changeCurrent.setText("Невозможно назначить текущую процедуру: узел графа не выбран");

4
src/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphUI.java
View File

@@ -1,7 +1,7 @@
package ProjectData.SapforData.Functions.UI.Graph;
import Common.Utils.CommonUtils;
import Common_old.Current;
import Common_old.UI.UI;
import Common_old.Utils.Utils;
import ProjectData.SapforData.Functions.FuncCoordinates;
import ProjectData.SapforData.Functions.FuncInfo;
import ProjectData.SapforData.Functions.FunctionType;
@@ -243,7 +243,7 @@ public class FunctionsGraphUI extends mxGraph {
break;
case Standard:
case NotFound:
UI.Info("процедура " + Utils.Brackets(func_name) + " " + fi.type.getDescription());
UI.Info("процедура " + CommonUtils.Brackets(func_name) + " " + fi.type.getDescription());
break;
}
break;

4
src/ProjectData/SapforData/Functions/UI/Graph/GraphInfo.java
View File

@@ -1,5 +1,5 @@
package ProjectData.SapforData.Functions.UI.Graph;
import Common_old.Utils.Utils;
import Common.Utils.CommonUtils;
import com.mxgraph.swing.mxGraphComponent;
import javafx.util.Pair;
@@ -44,7 +44,7 @@ public class GraphInfo {
Vector<String> edges = new Vector<>();
for (String name : vertexMap.keySet()) {
for (String neighbor : vertexMap.get(name)) {
edges.add(Utils.Brackets(name + "," + neighbor));
edges.add(CommonUtils.Brackets(name + "," + neighbor));
}
}
}

4
src/ProjectData/SapforData/Includes/DependencyInfo.java
View File

@@ -1,5 +1,5 @@
package ProjectData.SapforData.Includes;
import Common_old.Utils.Utils;
import Common.Utils.CommonUtils;
import ProjectData.SapforData.FileObject;
public class DependencyInfo extends FileObject {
public DependencyInfo(String file_in) {
@@ -7,7 +7,7 @@ public class DependencyInfo extends FileObject {
}
@Override
public String getSelectionText() {
return "включение: " + Utils.Brackets(file);
return "включение: " + CommonUtils.Brackets(file);
}
//мб на будущее расширить, в какой строке находится команда икнлудить файл.
// но это уже к Сапфору

4
src/ProjectData/SapforData/Regions/ParallelRegion.java
View File

@@ -1,8 +1,8 @@
package ProjectData.SapforData.Regions;
import Common.Utils.CommonUtils;
import Common_old.Current;
import Common.Database.Objects.DBObject;
import Common.Utils.Index;
import Common_old.Utils.Utils;
import ProjectData.Files.DBProjectFile;
import ProjectData.SapforData.Arrays.Distribution.AlignRule;
import ProjectData.SapforData.Arrays.Distribution.DataDirective;
@@ -39,7 +39,7 @@ public class ParallelRegion extends DBObject {
//распаковка Lines -----------------------------------------------
//---------------------------------------------------------------
for (int i = 0; i < lines_size; ++i) {
String line_file = Utils.toW(localSplited[1]);
String line_file = CommonUtils.toW(localSplited[1]);
int line_list_size = Integer.parseInt(localSplited[2]);
Vector<Pair<Integer, Integer>> current_lines = new Vector<>(line_list_size);
for (int k = 0; k < line_list_size; ++k) {