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

проход переименования заголовков. v++

Browse Source
This commit is contained in:
02090095
2024-06-05 15:06:16 +03:00
parent 2983d5c579
commit ba6257cd36
7 changed files with 80 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
.idea/workspace.xml generated
View File

@@ -7,11 +7,13 @@
</component>
<component name="ChangeListManager">
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_RenameIncludes.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/icons/Transformations/SPF_InsertImplicitNone.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/icons/Transformations/SPF_RenameIncludes.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Utils/Utils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Utils/Utils.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Repository/Component/Sapfor/Sapfor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/Sapfor/Sapfor.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Repository/Component/Visualiser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/Visualiser.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/Json/SapforVersion_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/Json/SapforVersion_json.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/ComparisonForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/ComparisonForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode_2021.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode_2021.java" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -90,7 +92,7 @@
<property name="UI_DESIGNER_EDITOR_MODE.UIDesignerToolWindowManager.SHOW" value="true" />
<property name="UI_DESIGNER_EDITOR_MODE.UIDesignerToolWindowManager.WIDTH" value="509" />
<property name="extract.method.default.visibility" value="public" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/src/icons/versions" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/src/icons/Transformations" />
<property name="project.structure.last.edited" value="Modules" />
<property name="project.structure.proportion" value="0.15" />
<property name="project.structure.side.proportion" value="0.2" />
@@ -103,9 +105,9 @@
<recent name="controls.Trees" />
</key>
<key name="CopyFile.RECENT_KEYS">
<recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\icons\Transformations" />
<recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\icons\versions" />
<recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\icons" />
<recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\icons\Transformations" />
<recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\files" />
<recent name="C:\Users\misha\Documents\visual_sapfor_2023\libs" />
</key>

58
src/Repository/Component/Sapfor/Sapfor.java
View File

@@ -111,6 +111,7 @@ public abstract class Sapfor extends OSDComponent {
}
public static PassCode_2021[] getPreparationTransformationsCodes() {
return new PassCode_2021[]{
PassCode_2021.SPF_RenameIncludes,
PassCode_2021.SPF_InsertIncludesPass,
PassCode_2021.SPF_CorrectCodeStylePass,
PassCode_2021.SPF_ConvertStructures,
@@ -366,42 +367,41 @@ public abstract class Sapfor extends OSDComponent {
//----------
public static Vector<PassCode_2021> getScenariosCodes() {
Vector<PassCode_2021> res = new Vector<>();
res.add(PassCode_2021.SPF_InitDeclsWithZero);
res.add(PassCode_2021.SPF_ConvertStructures);
res.add(PassCode_2021.SPF_ExpressionSubstitution);
res.add(PassCode_2021.SPF_InitDeclsWithZero);//+
res.add(PassCode_2021.SPF_ConvertStructures);//+
res.add(PassCode_2021.SPF_ExpressionSubstitution);//+
//--
res.add(PassCode_2021.SPF_CreateCheckpoints);
res.add(PassCode_2021.SPF_CreateIntervalsTree);
res.add(PassCode_2021.SPF_RemoveDvmIntervals);
res.add(PassCode_2021.SPF_CreateCheckpoints); //+
res.add(PassCode_2021.SPF_CreateIntervalsTree);//+
res.add(PassCode_2021.SPF_RemoveDvmIntervals);//+
//--
res.add(PassCode_2021.SPF_RemoveDvmDirectives);
res.add(PassCode_2021.SPF_RemoveDvmDirectivesToComments);
res.add(PassCode_2021.SPF_RemoveOmpDirectives);
res.add(PassCode_2021.SPF_RemoveComments);
res.add(PassCode_2021.SPF_RemoveDeadCode);
res.add(PassCode_2021.SPF_InsertIncludesPass);
res.add(PassCode_2021.SPF_RemoveDvmDirectives); //+
res.add(PassCode_2021.SPF_RemoveDvmDirectivesToComments); //+
res.add(PassCode_2021.SPF_RemoveOmpDirectives);//+
res.add(PassCode_2021.SPF_RemoveComments);//+
res.add(PassCode_2021.SPF_RemoveDeadCode);//+
res.add(PassCode_2021.SPF_InsertIncludesPass);//+
//--
res.add(PassCode_2021.SPF_LoopEndDoConverterPass);
res.add(PassCode_2021.SPF_LoopUnion);
res.add(PassCode_2021.SPF_LoopFission);
res.add(PassCode_2021.SPF_LoopEndDoConverterPass); //+
res.add(PassCode_2021.SPF_LoopUnion);//+
res.add(PassCode_2021.SPF_LoopFission);//+
//--
res.add(PassCode_2021.SPF_PrivateShrinking);
res.add(PassCode_2021.SPF_PrivateExpansion);
res.add(PassCode_2021.SPF_PrivateRemoving);
res.add(PassCode_2021.SPF_PrivateShrinking);//+
res.add(PassCode_2021.SPF_PrivateExpansion);//+
res.add(PassCode_2021.SPF_PrivateRemoving);//+
//--
res.add(PassCode_2021.SPF_RemoveUnusedFunctions);
res.add(PassCode_2021.SPF_DuplicateFunctionChains);
res.add(PassCode_2021.SPF_RemoveUnusedFunctions);//+
res.add(PassCode_2021.SPF_DuplicateFunctionChains);//+
//--
res.add(PassCode_2021.SPF_ResolveParallelRegionConflicts);
res.add(PassCode_2021.SPF_ResolveCommonBlockConflicts);
res.add(PassCode_2021.SPF_ResolveParallelRegionConflicts);//+
res.add(PassCode_2021.SPF_ResolveCommonBlockConflicts);//+
//-
res.add(PassCode_2021.SPF_InsertDvmhRegions);
res.add(PassCode_2021.SPF_SharedMemoryParallelization);
res.add(PassCode_2021.SPF_InsertImplicitNone);
res.add(PassCode_2021.CreateParallelVariants);
// res.add(PassCode_2021.SPF_InlineProceduresH);
// res.add(PassCode_2021.SPF_InlineProcedures);
// res.add(PassCode_2021.SPF_InsertIncludesPass);
res.add(PassCode_2021.SPF_InsertDvmhRegions);//+
res.add(PassCode_2021.SPF_SharedMemoryParallelization);//+
res.add(PassCode_2021.SPF_InsertImplicitNone);//+
res.add(PassCode_2021.CreateParallelVariants); //?
return res;
}
//------------------------------------------------------------------------------------------------------------------

2
src/Repository/Component/Visualiser.java
View File

@@ -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 = 1103;
version = 1104;
String pattern = "MMM dd yyyy HH:mm:ss";
DateFormat df = new SimpleDateFormat(pattern, Locale.ENGLISH);
date_text = df.format(getClassBuildTime());

4
src/Visual_DVM_2021/Passes/All/SPF_RenameIncludes.java Normal file
View File

@@ -0,0 +1,4 @@
package Visual_DVM_2021.Passes.All;
import Visual_DVM_2021.Passes.SapforTransformation;
public class SPF_RenameIncludes extends SapforTransformation {
}

62
src/Visual_DVM_2021/Passes/PassCode_2021.java
View File

@@ -107,6 +107,8 @@ public enum PassCode_2021 {
SPF_ResolveCommonBlockConflicts,
SPF_SharedMemoryParallelization,
SPF_RemoveOmpDirectives,
SPF_RenameIncludes,
//
RestoreSavedArrays,
MassSelectArrays,
DropSavedArrays,
@@ -344,6 +346,8 @@ public enum PassCode_2021 {
switch (this) {
case Undefined:
return "?";
case SPF_RenameIncludes:
return "Переименование заголовочных файлов";
case ShowSapforCompilationOut:
return "Отобразить поток вывода сборки SAPFOR";
case ShowSapforCompilationErr:
@@ -919,80 +923,92 @@ public enum PassCode_2021 {
String p = "-passN";
String name = "?";
switch (this) {
case SPF_CorrectCodeStylePass:
case SPF_CorrectCodeStylePass: //+
name = "CORRECT_CODE_STYLE";
break;
//--
case SPF_RemoveDvmDirectives:
case SPF_RemoveDvmDirectives: //+
name = "REMOVE_DVM_DIRS";
break;
case SPF_RemoveDvmDirectivesToComments:
case SPF_RemoveDvmDirectivesToComments: //+
name = "REMOVE_DVM_DIRS_TO_COMMENTS";
break;
case SPF_CreateCheckpoints:
case SPF_CreateCheckpoints: //+
name = "CREATE_CHEKPOINTS";
break;
case SPF_CreateIntervalsTree:
case SPF_CreateIntervalsTree: //+
name = "INSERT_INTER_TREE";
break;
case SPF_RemoveDvmIntervals:
case SPF_RemoveDvmIntervals: //+
name = "REMOVE_DVM_INTERVALS";
break;
case SPF_LoopEndDoConverterPass:
case SPF_LoopEndDoConverterPass: //+
name = "CONVERT_TO_ENDDO";
break;
case SPF_LoopUnion:
case SPF_LoopUnion: //+
name = "LOOPS_COMBINER";
break;
case SPF_LoopFission:
case SPF_LoopFission: //+
name = "LOOPS_SPLITTER";
break;
//--
case SPF_PrivateShrinking:
case SPF_PrivateShrinking: //+
name = "PRIVATE_ARRAYS_SHRINKING";
break;
case SPF_PrivateExpansion:
case SPF_PrivateExpansion://+
name = "PRIVATE_ARRAYS_EXPANSION";
break;
case SPF_PrivateRemoving:
case SPF_PrivateRemoving://+
name = "PRIVATE_REMOVING";
break;
//-
case SPF_ResolveParallelRegionConflicts:
case SPF_ResolveParallelRegionConflicts://+
name = "RESOLVE_PAR_REGIONS";
break;
case SPF_RemoveUnusedFunctions:
case SPF_RemoveUnusedFunctions://+
name = "REMOVE_UNUSED_FUNCTIONS";
break;
case SPF_DuplicateFunctionChains:
case SPF_DuplicateFunctionChains://+
name = "DUPLICATE_FUNCTIONS";
break;
//--
case SPF_InitDeclsWithZero:
case SPF_InitDeclsWithZero://+
name = "SET_TO_ALL_DECL_INIT_ZERO";
break;
case SPF_ConvertStructures:
case SPF_ConvertStructures://+
name = "CONVERT_STRUCTURES_TO_SIMPLE";
break;
//--
case SPF_SharedMemoryParallelization:
case SPF_SharedMemoryParallelization://+
name = "INSERT_PARALLEL_DIRS_NODIST";
break;
case SPF_InsertDvmhRegions:
case SPF_InsertDvmhRegions://+
name = "INSERT_REGIONS";
break;
case SPF_ExpressionSubstitution:
case SPF_ExpressionSubstitution://+
name = "SUBST_EXPR_RD_AND_UNPARSE";
break;
case SPF_ResolveCommonBlockConflicts:
case SPF_ResolveCommonBlockConflicts://+
name = "FIX_COMMON_BLOCKS";
break;
case SPF_GetMaxMinBlockDistribution:
case SPF_GetMaxMinBlockDistribution: //?
name = "GET_MIN_MAX_BLOCK_DIST";
break;
case SPF_InsertIncludesPass:
case SPF_InsertIncludesPass://+
name = "INSERT_INCLUDES -includeAll";
break;
case SPF_InsertImplicitNone://+
name = "SET_IMPLICIT_NONE";
break;
case SPF_RemoveOmpDirectives:
name= "REMOVE_OMP_DIRS_TRANSFORM";
break;
case SPF_RemoveComments:
name="REMOVE_COMMENTS";
break;
case SPF_RemoveDeadCode:
name= "REMOVE_DEAD_CODE_AND_UNPARSE";
break;
}
return p + " " + name;
}

BIN
src/icons/Transformations/SPF_InsertImplicitNone.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.0 KiB

BIN
src/icons/Transformations/SPF_RenameIncludes.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.7 KiB