diff --git a/.gitignore b/.gitignore index 362b9526f..60906d9f0 100644 --- a/.gitignore +++ b/.gitignore @@ -98,6 +98,16 @@ /bin/WeifenLuo.WinFormsUI.DockingLinux.dll /bin/WeifenLuo.WinFormsUI.Docking.ThemeVS2005.dll /bin/WeifenLuo.WinFormsUI.Docking.ThemeVS2005Linux.dll +/bin/Microsoft.Bcl.HashCode.dll +/bin/System.Buffers.dll +/bin/System.Collections.Immutable.dll +/bin/System.Formats.Nrbf.dll +/bin/System.Memory.dll +/bin/System.Numerics.Vectors.dll +/bin/System.Reflection.Metadata.dll +/bin/System.Resources.Extensions.dll +/bin/System.Runtime.CompilerServices.Unsafe.dll +/bin/System.ValueTuple.dll #TODO копируется только при сборке pabcnetc.sln - это норм? # - в самом проекте написано что его надо удалить... /bin/YieldConversionSyntax.dll diff --git a/CodeCompletion/CodeCompletion.csproj b/CodeCompletion/CodeCompletion.csproj index 4953a91fb..e21ff2da4 100644 --- a/CodeCompletion/CodeCompletion.csproj +++ b/CodeCompletion/CodeCompletion.csproj @@ -1,140 +1,22 @@  - + - Debug - AnyCPU - 9.0.30729 - 2.0 - {1AB15F6E-C22E-499A-A7ED-54BA7DE5CFA6} - Library - Properties - CodeCompletion - CodeCompletion - - - 4.0 - - - v4.0 - - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - false - true - - - true - full - false + net40 + ..\bin\ - DEBUG;TRACE - prompt - 4 - AllRules.ruleset - true - - - pdbonly - true - ..\bin\ - TRACE - prompt - 4 - AllRules.ruleset + false + + false + - - - - + + + + + + + + - - - - - - - - - - - - - - - - - Code - - - - - {1E42361A-EDA3-4872-88AF-A3AAF600D36D} - Compiler - - - {44A01F9E-DCE7-470C-AAE5-C3DE0CCBEE3B} - Errors - - - {a48d9069-d569-4110-9252-a10f139b669b} - LanguageIntegrator - - - {AF2EFD7B-69DD-4B43-AF65-B59B29349C23} - ParserTools - - - {613E0DDA-AA8A-437C-AC45-507B47429FF9} - SemanticTree - - - {e8aefbf9-0113-4fa4-be45-6cda555498b7} - StringConstants - - - {C2CAC65A-B2AE-4CCC-B067-E6B8E75DF73A} - SyntaxTree - - - {1C9C945A-586D-42A2-A06B-65D84FA7FF78} - TreeConverter - - - - - False - Клиентский профиль .NET Framework 3.5 SP1 - false - - - False - .NET Framework 3.5 SP1 - true - - - False - Установщик Windows 3.1 - true - - - - \ No newline at end of file diff --git a/Compiler/Compiler.csproj b/Compiler/Compiler.csproj index 83f31d8ac..eb2ac80fa 100644 --- a/Compiler/Compiler.csproj +++ b/Compiler/Compiler.csproj @@ -1,100 +1,34 @@  - + - Local - 8.0.50727 - 2.0 - {1E42361A-EDA3-4872-88AF-A3AAF600D36D} - Debug - AnyCPU - - - - - Compiler - - - JScript - Grid - IE50 - false - Library - Compiler - OnBuildSuccess - - - - - - - 4.0 - v4.0 - - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - false - true - - + net40 + ..\bin\ - false - 285212672 - false - - - DEBUG;TRACE - - - true - 4096 - false - - - false - false - false - false - 4 - full - prompt - AllRules.ruleset - true - - - ..\bin\ - false - 285212672 - false - - - TRACE - - - false - 4096 - false - - - true - false - false - false - 4 - none - prompt - AllRules.ruleset + false + + false + + + + Config\GlobalAssemblyInfo.cs + + + + + + + + + + + + + + + + + ..\Libraries\ICSharpCode.NRefactory.dll @@ -104,107 +38,5 @@ False ..\Libraries\Microsoft.Scripting.dll - - System - - - System.Data - - - System.XML - - - {44A01F9E-DCE7-470C-AAE5-C3DE0CCBEE3B} - Errors - - - {a48d9069-d569-4110-9252-a10f139b669b} - LanguageIntegrator - - - {2DE2842F-0912-4251-BC0F-480854C44A13} - Localization - - - NETGenerator - {7FE7173B-22EB-46E5-897B-02F422662E51} - {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - - - {A25D26FB-3043-4BCF-833E-E3F4C3BE795E} - CompilerTools - - - {AF2EFD7B-69DD-4B43-AF65-B59B29349C23} - ParserTools - - - SemanticTree - {613E0DDA-AA8A-437C-AC45-507B47429FF9} - {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - - - {e8aefbf9-0113-4fa4-be45-6cda555498b7} - StringConstants - - - SyntaxTree - {C2CAC65A-B2AE-4CCC-B067-E6B8E75DF73A} - {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - - - {a9ab4282-83b4-41a7-86c3-e5bf6a45e7e2} - SyntaxVisitors - - - TreeConverter - {1C9C945A-586D-42A2-A06B-65D84FA7FF78} - {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - - - - - - - - - - - - - - - - - - - Config\GlobalAssemblyInfo.cs - - - - - - False - Клиентский профиль .NET Framework 3.5 SP1 - false - - - False - .NET Framework 3.5 SP1 - true - - - False - Установщик Windows 3.1 - true - - - - - - - - - \ No newline at end of file diff --git a/CompilerTools/CompilerTools.csproj b/CompilerTools/CompilerTools.csproj index 5af58fb88..8c8bba4ac 100644 --- a/CompilerTools/CompilerTools.csproj +++ b/CompilerTools/CompilerTools.csproj @@ -1,121 +1,27 @@  - + - Debug - AnyCPU - 8.0.50727 - 2.0 - {A25D26FB-3043-4BCF-833E-E3F4C3BE795E} - Library - Properties - PAscalABCCompiler - CompilerTools - - - 4.0 - - - v4.0 - - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - false - true - - - true - full - false + net40 + + PascalABCCompiler + ..\bin\ - DEBUG;TRACE - prompt - 4 - AllRules.ruleset - true - - - pdbonly - true - ..\bin\ - TRACE - prompt - 4 - AllRules.ruleset + false + + false + - - - - - - - - - - Conf\GlobalAssemblyInfo.cs + - - {44A01F9E-DCE7-470C-AAE5-C3DE0CCBEE3B} - Errors - - - {2DE2842F-0912-4251-BC0F-480854C44A13} - Localization - - - {AF2EFD7B-69DD-4B43-AF65-B59B29349C23} - ParserTools - - - {613E0DDA-AA8A-437C-AC45-507B47429FF9} - SemanticTree - - - {C2CAC65A-B2AE-4CCC-B067-E6B8E75DF73A} - SyntaxTree - + + + + + - - - - - - False - Клиентский профиль .NET Framework 3.5 SP1 - false - - - False - .NET Framework 3.5 SP1 - true - - - False - Установщик Windows 3.1 - true - - - - \ No newline at end of file diff --git a/CompilerTools/Properties/AssemblyInfo.cs b/CompilerTools/Properties/AssemblyInfo.cs deleted file mode 100644 index 977512630..000000000 --- a/CompilerTools/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,17 +0,0 @@ -// Copyright (c) Ivan Bondarev, Stanislav Mikhalkovich (for details please see \doc\copyright.txt) -// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -[assembly: AssemblyTitle("PascalABCCompiler.CompilerTools")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Localization")] -[assembly: AssemblyCopyright("Copyright © 2005-2021 by Ivan Bondarev, Stanislav Mikhalkovich")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -[assembly: ComVisible(false)] - diff --git a/Errors/Errors.csproj b/Errors/Errors.csproj index 346b3029d..e901cfde2 100644 --- a/Errors/Errors.csproj +++ b/Errors/Errors.csproj @@ -1,111 +1,23 @@  - + - Debug - AnyCPU - 8.0.50727 - 2.0 - {44A01F9E-DCE7-470C-AAE5-C3DE0CCBEE3B} - Library - Properties - Errors - Errors - - - 4.0 - - - v4.0 - - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - false - true - - - true - full - false + net40 + ..\bin\ - DEBUG;TRACE - prompt - 4 - AllRules.ruleset - true + false + + false - - pdbonly - true - ..\bin\ - TRACE - prompt - 4 - AllRules.ruleset - - - - - - + - Config\globalassemblyinfo.cs + Config\GlobalAssemblyInfo.cs - - - + - - {2DE2842F-0912-4251-BC0F-480854C44A13} - Localization - - - {613e0dda-aa8a-437c-ac45-507b47429ff9} - SemanticTree - - - {C2CAC65A-B2AE-4CCC-B067-E6B8E75DF73A} - SyntaxTree - + + + - - - - - - False - Клиентский профиль .NET Framework 3.5 SP1 - false - - - False - .NET Framework 3.5 SP1 - true - - - False - Установщик Windows 3.1 - true - - - - \ No newline at end of file diff --git a/ICSharpCode.TextEditorLinux/ICSharpCode.TextEditorLinux.csproj b/ICSharpCode.TextEditorLinux/ICSharpCode.TextEditorLinux.csproj index f1538a7a6..9215e067c 100644 --- a/ICSharpCode.TextEditorLinux/ICSharpCode.TextEditorLinux.csproj +++ b/ICSharpCode.TextEditorLinux/ICSharpCode.TextEditorLinux.csproj @@ -1,210 +1,27 @@  - + - Debug - AnyCPU - 9.0.30729 - 2.0 - {2D18BE89-D210-49EB-A9DD-2246FBB3DF6D} - ICSharpCode.TextEditorLinux - Library - 4 - False - False - OnSuccessfulBuild - Library - true - Resources\ICSharpCode.TextEditor.snk + net40 + + ..\bin\ + false + + true + ICSharpCode.TextEditor - False + + false + + + + + true + Resources/ICSharpCode.TextEditor.snk Auto 98041856 - AnyCPU - 4096 - v4.0 - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - false - true - - - - False - False - True - ..\bin\ - DEBUG - false - -Microsoft.Design#CA1012;-Microsoft.Design#CA2210;-Microsoft.Design#CA1040;-Microsoft.Design#CA1005;-Microsoft.Design#CA1020;-Microsoft.Design#CA1021;-Microsoft.Design#CA1010;-Microsoft.Design#CA1011;-Microsoft.Design#CA1009;-Microsoft.Design#CA1050;-Microsoft.Design#CA1026;-Microsoft.Design#CA1019;-Microsoft.Design#CA1031;-Microsoft.Design#CA1047;-Microsoft.Design#CA1000;-Microsoft.Design#CA1048;-Microsoft.Design#CA1051;-Microsoft.Design#CA1002;-Microsoft.Design#CA1061;-Microsoft.Design#CA1006;-Microsoft.Design#CA1046;-Microsoft.Design#CA1045;-Microsoft.Design#CA1038;-Microsoft.Design#CA1008;-Microsoft.Design#CA1028;-Microsoft.Design#CA1004;-Microsoft.Design#CA1035;-Microsoft.Design#CA1063;-Microsoft.Design#CA1032;-Microsoft.Design#CA1023;-Microsoft.Design#CA1033;-Microsoft.Design#CA1039;-Microsoft.Design#CA1016;-Microsoft.Design#CA1014;-Microsoft.Design#CA1017;-Microsoft.Design#CA1018;-Microsoft.Design#CA1027;-Microsoft.Design#CA1059;-Microsoft.Design#CA1060;-Microsoft.Design#CA1034;-Microsoft.Design#CA1013;-Microsoft.Design#CA1036;-Microsoft.Design#CA1044;-Microsoft.Design#CA1041;-Microsoft.Design#CA1025;-Microsoft.Design#CA1052;-Microsoft.Design#CA1053;-Microsoft.Design#CA1057;-Microsoft.Design#CA1058;-Microsoft.Design#CA1001;-Microsoft.Design#CA1049;-Microsoft.Design#CA1054;-Microsoft.Design#CA1056;-Microsoft.Design#CA1055;-Microsoft.Design#CA1030;-Microsoft.Design#CA1003;-Microsoft.Design#CA1007;-Microsoft.Design#CA1043;-Microsoft.Design#CA1024;-Microsoft.Design#CA1062;-Microsoft.Globalization#CA1301;-Microsoft.Globalization#CA1302;-Microsoft.Globalization#CA1303;-Microsoft.Globalization#CA1306;-Microsoft.Globalization#CA1304;-Microsoft.Globalization#CA1305;-Microsoft.Globalization#CA1300;-Microsoft.Mobility#CA1600;-Microsoft.Mobility#CA1601;-Microsoft.Naming#CA1718;-Microsoft.Naming#CA1720;-Microsoft.Naming#CA1700;-Microsoft.Naming#CA1712;-Microsoft.Naming#CA1713;-Microsoft.Naming#CA1709;-Microsoft.Naming#CA1708;-Microsoft.Naming#CA1715;-Microsoft.Naming#CA1710;-Microsoft.Naming#CA1707;-Microsoft.Naming#CA1722;-Microsoft.Naming#CA1711;-Microsoft.Naming#CA1716;-Microsoft.Naming#CA1705;-Microsoft.Naming#CA1725;-Microsoft.Naming#CA1719;-Microsoft.Naming#CA1721;-Microsoft.Naming#CA1706;-Microsoft.Naming#CA1724;-Microsoft.Naming#CA1726;-Microsoft.Performance#CA1809;-Microsoft.Performance#CA1811;-Microsoft.Performance#CA1812;-Microsoft.Performance#CA1807;-Microsoft.Performance#CA1813;-Microsoft.Performance#CA1823;-Microsoft.Performance#CA1816;-Microsoft.Performance#CA1817;-Microsoft.Performance#CA1800;-Microsoft.Performance#CA1818;-Microsoft.Performance#CA1805;-Microsoft.Performance#CA1810;-Microsoft.Performance#CA1822;-Microsoft.Performance#CA1815;-Microsoft.Performance#CA1814;-Microsoft.Performance#CA1819;-Microsoft.Performance#CA1804;-Microsoft.Performance#CA1820;-Microsoft.Performance#CA1802;-Microsoft.Security#CA2116;-Microsoft.Security#CA2117;-Microsoft.Security#CA2105;-Microsoft.Security#CA2115;-Microsoft.Security#CA2104;-Microsoft.Security#CA2122;-Microsoft.Security#CA2114;-Microsoft.Security#CA2123;-Microsoft.Security#CA2111;-Microsoft.Security#CA2108;-Microsoft.Security#CA2107;-Microsoft.Security#CA2103;-Microsoft.Security#CA2100;-Microsoft.Security#CA2118;-Microsoft.Security#CA2109;-Microsoft.Security#CA2119;-Microsoft.Security#CA2106;-Microsoft.Security#CA2112;-Microsoft.Security#CA2110;-Microsoft.Security#CA2120;-Microsoft.Security#CA2101;-Microsoft.Security#CA2121;-Microsoft.Security#CA2126;-Microsoft.Security#CA2124;-Microsoft.Usage#CA2209;-Microsoft.Usage#CA2236;-Microsoft.Usage#CA2227;-Microsoft.Usage#CA2213;-Microsoft.Usage#CA2216;-Microsoft.Usage#CA2215;-Microsoft.Usage#CA2214;-Microsoft.Usage#CA2222;-Microsoft.Usage#CA2202;-Microsoft.Usage#CA1806;-Microsoft.Usage#CA2217;-Microsoft.Usage#CA2212;-Microsoft.Usage#CA2219;-Microsoft.Usage#CA2201;-Microsoft.Usage#CA2228;-Microsoft.Usage#CA2221;-Microsoft.Usage#CA2220;-Microsoft.Usage#CA2240;-Microsoft.Usage#CA2229;-Microsoft.Usage#CA2238;-Microsoft.Usage#CA2207;-Microsoft.Usage#CA2208;-Microsoft.Usage#CA2235;-Microsoft.Usage#CA2237;-Microsoft.Usage#CA2232;-Microsoft.Usage#CA2223;-Microsoft.Usage#CA2211;-Microsoft.Usage#CA2233;-Microsoft.Usage#CA2225;-Microsoft.Usage#CA2226;-Microsoft.Usage#CA2231;-Microsoft.Usage#CA2224;-Microsoft.Usage#CA2218;-Microsoft.Usage#CA2234;-Microsoft.Usage#CA2241;-Microsoft.Usage#CA2239;-Microsoft.Usage#CA2200;-Microsoft.Usage#CA1801;-Microsoft.Usage#CA2205;-Microsoft.Usage#CA2230 - - - True - False - False - ..\bin\ - False - - - Full - true - - - None - False + - - - 3.5 - - - - - - 3.5 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Form - - - Form - - - - Form - - - - - - - - - - - - - - - Component - - - UserControl - - - UserControl - - - - - - - - - - Component - - - - - - - - - - - - - - - - - - - Form - - - UserControl - - - - Component - - - - @@ -215,7 +32,6 @@ - @@ -226,34 +42,9 @@ - - - - - + + - - - False - .NET Framework 2.0 %28x86%29 - true - - - False - .NET Framework 3.0 %28x86%29 - false - - - False - .NET Framework 3.5 - false - - - - - - - \ No newline at end of file diff --git a/LambdaAnySynToSemConverter/LambdaAnySynToSemConverter.csproj b/LambdaAnySynToSemConverter/LambdaAnySynToSemConverter.csproj index 06bddc028..1fd81dee2 100644 --- a/LambdaAnySynToSemConverter/LambdaAnySynToSemConverter.csproj +++ b/LambdaAnySynToSemConverter/LambdaAnySynToSemConverter.csproj @@ -1,66 +1,18 @@  - - + - Debug - AnyCPU - {27D9800E-2689-4AA1-A2D6-128E4A9BAE98} - Library - Properties - LambdaAnySynToSemConverter - LambdaAnySynToSemConverter - v4.0 - 512 - true - - - - true - full - false + net40 + ..\bin\ - DEBUG;TRACE - prompt - 1 - - - pdbonly - true - ..\bin\ - TRACE - prompt - 4 + false + + false + - - - - - - - + + + + - - - - - - - {613e0dda-aa8a-437c-ac45-507b47429ff9} - SemanticTree - - - {c2cac65a-b2ae-4ccc-b067-e6b8e75df73a} - SyntaxTree - - - {a9ab4282-83b4-41a7-86c3-e5bf6a45e7e2} - SyntaxVisitors - - - {1c9c945a-586d-42a2-a06b-65d84fa7ff78} - TreeConverter - - - \ No newline at end of file diff --git a/LanguageIntegrator/LanguageIntegrator.csproj b/LanguageIntegrator/LanguageIntegrator.csproj index e62de8cfa..fd17d60dc 100644 --- a/LanguageIntegrator/LanguageIntegrator.csproj +++ b/LanguageIntegrator/LanguageIntegrator.csproj @@ -1,76 +1,21 @@  - - + - Debug - AnyCPU - {A48D9069-D569-4110-9252-A10F139B669B} - Library - Properties + net40 Languages.Facade - LanguageIntegrator - v4.0 - 512 - true - - - true - full - false + ..\bin\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - ..\bin\ - TRACE - prompt - 4 + false + + false + - - - - - - - + + + + + + - - - - - - - - - - {44a01f9e-dce7-470c-aae5-c3de0ccbee3b} - Errors - - - {af2efd7b-69dd-4b43-af65-b59b29349c23} - ParserTools - - - {e8aefbf9-0113-4fa4-be45-6cda555498b7} - StringConstants - - - {c2cac65a-b2ae-4ccc-b067-e6b8e75df73a} - SyntaxTree - - - {a9ab4282-83b4-41a7-86c3-e5bf6a45e7e2} - SyntaxVisitors - - - {1c9c945a-586d-42a2-a06b-65d84fa7ff78} - TreeConverter - - - \ No newline at end of file diff --git a/Localization/Localization.csproj b/Localization/Localization.csproj index 5c64380e9..ceeafbaf3 100644 --- a/Localization/Localization.csproj +++ b/Localization/Localization.csproj @@ -1,95 +1,21 @@  - + - Debug - AnyCPU - 8.0.50727 - 2.0 - {2DE2842F-0912-4251-BC0F-480854C44A13} - Library - Properties + net40 + PascalABCCompiler - Localization - - - 4.0 - - - v4.0 - - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - false - true - - - true - full - false + ..\bin\ - DEBUG;TRACE - prompt - 4 - AllRules.ruleset - true + false + + false - - pdbonly - true - ..\bin\ - TRACE - prompt - 4 - AllRules.ruleset - - - - - - - - - - - - + + - - False - Клиентский профиль .NET Framework 3.5 SP1 - false - - - False - .NET Framework 3.5 SP1 - true - - - False - Установщик Windows 3.1 - true - + - - \ No newline at end of file diff --git a/NETGenerator/NETGenerator.csproj b/NETGenerator/NETGenerator.csproj index 0a3565a78..267d04b30 100644 --- a/NETGenerator/NETGenerator.csproj +++ b/NETGenerator/NETGenerator.csproj @@ -1,179 +1,27 @@  - + - Local - 8.0.50727 - 2.0 - {7FE7173B-22EB-46E5-897B-02F422662E51} - Debug - AnyCPU - - - - - NETGenerator - - - JScript - Grid - IE50 - false - Library - NETGenerator - OnBuildSuccess - - - - - - - 4.0 - v4.0 - - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - false - true - - + net40 + + PascalABCCompiler + ..\bin\ - false - 285212672 - false - - - true - 4096 - false - false - false - false - false - 4 - Full - prompt - AllRules.ruleset - DEBUG - true + false + + false - - ..\bin\ - false - 285212672 - false - - - - - - - false - 4096 - false - - - true - false - false - false - 4 - none - prompt - AllRules.ruleset - - - Auto - AnyCPU - - - - System - - - System.Data - - - System.Drawing - - - System.Windows.Forms - - - System.XML - - - {A25D26FB-3043-4BCF-833E-E3F4C3BE795E} - CompilerTools - - - {44A01F9E-DCE7-470C-AAE5-C3DE0CCBEE3B} - Errors - - - SemanticTree - {613E0DDA-AA8A-437C-AC45-507B47429FF9} - {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - - - {e8aefbf9-0113-4fa4-be45-6cda555498b7} - StringConstants - - - {1C9C945A-586D-42A2-A06B-65D84FA7FF78} - TreeConverter - - - + Config\GlobalAssemblyInfo.cs - - - - - Code - - - Code - - - Code - + - - False - Клиентский профиль .NET Framework 3.5 SP1 - false - - - False - .NET Framework 3.5 SP1 - true - - - False - Установщик Windows 3.1 - true - + + + + + - - - - - - - \ No newline at end of file diff --git a/Optimizer/Optimizer.csproj b/Optimizer/Optimizer.csproj index ef898db8f..7eef5febb 100644 --- a/Optimizer/Optimizer.csproj +++ b/Optimizer/Optimizer.csproj @@ -1,119 +1,21 @@  - + - Debug - AnyCPU - 8.0.50727 - 2.0 - {10679470-FE1B-4193-A203-D940CF0AEA54} - Library - Properties - Optimizer + net40 + + ..\bin\ + false OptimizerConversion - - - 4.0 - - - v4.0 - - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - false - true - - - true - full - false - ..\bin\ - DEBUG;TRACE - prompt - 4 - AllRules.ruleset - true - - - pdbonly - true - ..\bin\ - TRACE - prompt - 4 - AllRules.ruleset + + false + - - - + + + + + + - - - - - - - - - - {1E42361A-EDA3-4872-88AF-A3AAF600D36D} - Compiler - - - {44A01F9E-DCE7-470C-AAE5-C3DE0CCBEE3B} - Errors - - - {2DE2842F-0912-4251-BC0F-480854C44A13} - Localization - - - {613E0DDA-AA8A-437C-AC45-507B47429FF9} - SemanticTree - - - {e8aefbf9-0113-4fa4-be45-6cda555498b7} - StringConstants - - - {1C9C945A-586D-42A2-A06B-65D84FA7FF78} - TreeConverter - - - - - False - Клиентский профиль .NET Framework 3.5 SP1 - false - - - False - .NET Framework 3.5 SP1 - true - - - False - Установщик Windows 3.1 - true - - - - \ No newline at end of file diff --git a/ParserTools/ParserTools.csproj b/ParserTools/ParserTools.csproj index a930a452e..69fb09dce 100644 --- a/ParserTools/ParserTools.csproj +++ b/ParserTools/ParserTools.csproj @@ -1,130 +1,23 @@  - + - Debug - AnyCPU - 9.0.21022 - 2.0 - {AF2EFD7B-69DD-4B43-AF65-B59B29349C23} - Library - Properties - ParserTools - ParserTools - - - 4.0 - - - v4.0 - - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - false - true - - - true - full - false + net40 + ..\bin\ - DEBUG;TRACE - prompt - 4 - AllRules.ruleset - true + false + + false - - pdbonly - true - ..\bin\ - TRACE - prompt - 4 - AllRules.ruleset - - - - - - + - Config\globalassemblyinfo.cs - - - - - - - - - - - - - - - - - - - - - - - - Code + Config\GlobalAssemblyInfo.cs + - - {44A01F9E-DCE7-470C-AAE5-C3DE0CCBEE3B} - Errors - - - {2DE2842F-0912-4251-BC0F-480854C44A13} - Localization - - - {C2CAC65A-B2AE-4CCC-B067-E6B8E75DF73A} - SyntaxTree - + + + - - - - False - Клиентский профиль .NET Framework 3.5 SP1 - false - - - False - .NET Framework 3.5 SP1 - true - - - False - Установщик Windows 3.1 - true - - - - \ No newline at end of file diff --git a/Parsers/PascalABCParserNewSaushkin/PascalABCSaushkinParser.csproj b/Parsers/PascalABCParserNewSaushkin/PascalABCSaushkinParser.csproj index 96c8fbb6c..790232417 100644 --- a/Parsers/PascalABCParserNewSaushkin/PascalABCSaushkinParser.csproj +++ b/Parsers/PascalABCParserNewSaushkin/PascalABCSaushkinParser.csproj @@ -1,151 +1,25 @@  - + - Debug - AnyCPU - 9.0.30729 - 2.0 - {0ED020FF-D28E-4791-BBDD-B8B9BA714096} - Library - Properties + net40 + Languages.Pascal.Frontend + + ..\..\bin\ + false PascalABCParser - v4.0 - 512 - - - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - false - true - - - - - 3.5 - - - - - true - full - false - ..\..\bin\ - DEBUG;TRACE - prompt - 3 - AllRules.ruleset - AnyCPU - true - - - pdbonly - true - ..\..\bin\ - TRACE - prompt - 4 - AllRules.ruleset + + false + false + - - - 3.5 - - - - 3.5 - - - 3.5 - - - + + + + + + + - - - False - .NET Framework 2.0 %28x86%29 - false - - - False - .NET Framework 3.0 %28x86%29 - false - - - False - .NET Framework 3.5 - true - - - False - Windows Installer 3.1 - true - - - - - - - - - - - - - - - - - - - - {44A01F9E-DCE7-470C-AAE5-C3DE0CCBEE3B} - Errors - - - {a48d9069-d569-4110-9252-a10f139b669b} - LanguageIntegrator - - - {2DE2842F-0912-4251-BC0F-480854C44A13} - Localization - - - {AF2EFD7B-69DD-4B43-AF65-B59B29349C23} - ParserTools - - - {e8aefbf9-0113-4fa4-be45-6cda555498b7} - StringConstants - - - {C2CAC65A-B2AE-4CCC-B067-E6B8E75DF73A} - SyntaxTree - - - {a9ab4282-83b4-41a7-86c3-e5bf6a45e7e2} - SyntaxVisitors - - - - \ No newline at end of file diff --git a/Parsers/VBNETParser/VBNETParser.csproj b/Parsers/VBNETParser/VBNETParser.csproj index 5c814acb3..92713c227 100644 --- a/Parsers/VBNETParser/VBNETParser.csproj +++ b/Parsers/VBNETParser/VBNETParser.csproj @@ -1,118 +1,21 @@  - + - {1D51D03C-FB74-4AB2-84B4-09EB077BEAFE} - Debug - AnyCPU - Library - VBNETParser - VBNETParser - False - False - 4 - false - - - 4.0 - - - v4.0 - - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - false - true - - + net40 + ..\..\bin\ - true - Full - False - True - DEBUG;TRACE + false + + false + false - - bin\Release\ - False - None - True - False - TRACE - - - False - Auto - 4194304 - AnyCPU - 4096 - - - AllRules.ruleset - true - - - AllRules.ruleset - - + - - ..\..\Libraries\ICSharpCode.NRefactory.dll - False - - - - - - - - - - - - - - {44A01F9E-DCE7-470C-AAE5-C3DE0CCBEE3B} - Errors - - - {2DE2842F-0912-4251-BC0F-480854C44A13} - Localization - - - {AF2EFD7B-69DD-4B43-AF65-B59B29349C23} - ParserTools - - - {C2CAC65A-B2AE-4CCC-B067-E6B8E75DF73A} - SyntaxTree - - - - - False - Клиентский профиль .NET Framework 3.5 SP1 - false - - - False - .NET Framework 3.5 SP1 - true - - - False - Установщик Windows 3.1 - true - + + + + + + \ No newline at end of file diff --git a/PascalABCLanguageInfo/PascalABCLanguageInfo.csproj b/PascalABCLanguageInfo/PascalABCLanguageInfo.csproj index c90b7f2fe..0170c3535 100644 --- a/PascalABCLanguageInfo/PascalABCLanguageInfo.csproj +++ b/PascalABCLanguageInfo/PascalABCLanguageInfo.csproj @@ -1,85 +1,25 @@  - - + - Debug - AnyCPU - {BD902586-E0D5-407A-904A-32249B8B709E} - Library - Properties + net40 + Languages.Pascal - PascalABCLanguageInfo - v4.0 - 512 - true - - - true - full - false + ..\bin\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - ..\bin\ - TRACE - prompt - 4 + false + + false + - - - - - - - + + + + + + + + + - - - - - - - {27d9800e-2689-4aa1-a2d6-128e4a9bae98} - LambdaAnySynToSemConverter - - - {a48d9069-d569-4110-9252-a10f139b669b} - LanguageIntegrator - - - {0ed020ff-d28e-4791-bbdd-b8b9ba714096} - PascalABCSaushkinParser - - - {af2efd7b-69dd-4b43-af65-b59b29349c23} - ParserTools - - - {e8aefbf9-0113-4fa4-be45-6cda555498b7} - StringConstants - - - {f10a5330-dcf4-4533-877c-7b1b1be23884} - SyntaxTreeConverters - - - {c2cac65a-b2ae-4ccc-b067-e6b8e75df73a} - SyntaxTree - - - {A9AB4282-83B4-41A7-86C3-E5BF6A45E7E2} - SyntaxVisitors - - - {1c9c945a-586d-42a2-a06b-65d84fa7ff78} - TreeConverter - - - \ No newline at end of file diff --git a/PluginsSupport/PluginsSupport.csproj b/PluginsSupport/PluginsSupport.csproj index f471d78ba..39028e14a 100644 --- a/PluginsSupport/PluginsSupport.csproj +++ b/PluginsSupport/PluginsSupport.csproj @@ -1,122 +1,29 @@  - + - Debug - AnyCPU - 9.0.30729 - 2.0 - {CFC683F8-0165-4A9F-9C3F-BB8C5BAB507F} - Library - Properties + net40 + VisualPascalABCPlugins - PluginsSupport - - - 4.0 - - - v4.0 - - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - false - true - - - true - full - false + ..\bin\ - DEBUG;TRACE - prompt - 4 - AllRules.ruleset - true - - - pdbonly - true - ..\bin\ - TRACE - prompt - 4 - AllRules.ruleset + false + + false + + + + + + + + + + ..\Libraries\ICSharpCode.TextEditor.dll - - - - - - - - - - - - {A25D26FB-3043-4BCF-833E-E3F4C3BE795E} - CompilerTools - - - {1e42361a-eda3-4872-88af-a3aaf600d36d} - Compiler - - - {44A01F9E-DCE7-470C-AAE5-C3DE0CCBEE3B} - Errors - - - {af2efd7b-69dd-4b43-af65-b59b29349c23} - ParserTools - - - {c2cac65a-b2ae-4ccc-b067-e6b8e75df73a} - SyntaxTree - - - {1c9c945a-586d-42a2-a06b-65d84fa7ff78} - TreeConverter - - - - - False - Клиентский профиль .NET Framework 3.5 SP1 - false - - - False - .NET Framework 3.5 SP1 - true - - - False - Установщик Windows 3.1 - true - - - - \ No newline at end of file diff --git a/PluginsSupportLinux/PluginsSupportLinux.csproj b/PluginsSupportLinux/PluginsSupportLinux.csproj index de836d517..df57439d6 100644 --- a/PluginsSupportLinux/PluginsSupportLinux.csproj +++ b/PluginsSupportLinux/PluginsSupportLinux.csproj @@ -1,123 +1,27 @@  - + - Debug - AnyCPU - 9.0.30729 - 2.0 - {E009E776-9280-4061-B5CA-7F0C3E2D3C2A} - Library - Properties + net40 + VisualPascalABCPlugins - PluginsSupportLinux - - - 4.0 - - - v4.0 - - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - false - true - - - true - full - false + ..\bin\ - DEBUG;TRACE - prompt - 4 - AllRules.ruleset - true - - - pdbonly - true - ..\bin\ - TRACE - prompt - 4 - AllRules.ruleset + false + + false + + + + + + + + + + + - - - - - - - - - - - - {A25D26FB-3043-4BCF-833E-E3F4C3BE795E} - CompilerTools - - - {1e42361a-eda3-4872-88af-a3aaf600d36d} - Compiler - - - {44A01F9E-DCE7-470C-AAE5-C3DE0CCBEE3B} - Errors - - - {2d18be89-d210-49eb-a9dd-2246fbb3df6d} - ICSharpCode.TextEditorLinux - - - {af2efd7b-69dd-4b43-af65-b59b29349c23} - ParserTools - - - {c2cac65a-b2ae-4ccc-b067-e6b8e75df73a} - SyntaxTree - - - {1c9c945a-586d-42a2-a06b-65d84fa7ff78} - TreeConverter - - - - - False - Клиентский профиль .NET Framework 3.5 SP1 - false - - - False - .NET Framework 3.5 SP1 - true - - - False - Установщик Windows 3.1 - true - - - - \ No newline at end of file diff --git a/ReleaseGenerators/sect_Core.nsh b/ReleaseGenerators/sect_Core.nsh index bb0164778..975cfc167 100644 --- a/ReleaseGenerators/sect_Core.nsh +++ b/ReleaseGenerators/sect_Core.nsh @@ -30,6 +30,18 @@ File "..\bin\Mono.Cecil.dll" File "..\bin\TeacherControlPlugin.dll" File "..\bin\LambdaAnySynToSemConverter.dll" + + File "..\bin\Microsoft.Bcl.HashCode.dll" + File "..\bin\System.Buffers.dll" + File "..\bin\System.Collections.Immutable.dll" + File "..\bin\System.Formats.Nrbf.dll" + File "..\bin\System.Memory.dll" + File "..\bin\System.Numerics.Vectors.dll" + File "..\bin\System.Reflection.Metadata.dll" + File "..\bin\System.Resources.Extensions.dll" + File "..\bin\System.Runtime.CompilerServices.Unsafe.dll" + File "..\bin\System.ValueTuple.dll" + ;File "libs\System.Core.dll" File "gacutil.exe" File "gacutil.exe.config" diff --git a/SemanticTree/SemanticTree.csproj b/SemanticTree/SemanticTree.csproj index 7d0bbed02..5689876c3 100644 --- a/SemanticTree/SemanticTree.csproj +++ b/SemanticTree/SemanticTree.csproj @@ -1,149 +1,17 @@  - + - Local - 8.0.50727 - 2.0 - {613E0DDA-AA8A-437C-AC45-507B47429FF9} - Debug - AnyCPU - - - - - SemanticTree - - - JScript - Grid - IE50 - false - Library - SemanticTree - OnBuildSuccess - - - - - - - 4.0 - v4.0 - - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - false - true - - + net40 + ..\bin\ - false - 285212672 - false - - - DEBUG;TRACE - - - true - 4096 - false - - - false - false - false - false - 4 - full - prompt - AllRules.ruleset - true + false + + false - - ..\bin\ - false - 285212672 - false - - - TRACE - - - false - 4096 - false - - - true - false - false - false - 4 - none - prompt - AllRules.ruleset - - - - System - - - System.Data - - - - System.XML - - + - Config\globalassemblyinfo.cs - - - Code - - - - Code - - - Code + Config\GlobalAssemblyInfo.cs - - - False - Клиентский профиль .NET Framework 3.5 SP1 - false - - - False - .NET Framework 3.5 SP1 - true - - - False - Установщик Windows 3.1 - true - - - - - - - - - \ No newline at end of file diff --git a/StringConstants/StringConstants.csproj b/StringConstants/StringConstants.csproj index 236306dd9..f5d81dbc4 100644 --- a/StringConstants/StringConstants.csproj +++ b/StringConstants/StringConstants.csproj @@ -1,47 +1,11 @@  - - + - Debug - AnyCPU - {E8AEFBF9-0113-4FA4-BE45-6CDA555498B7} - Library - Properties - StringConstants - StringConstants - v4.0 - 512 - true - - - true - full - false + net40 + ..\bin\ - DEBUG;TRACE - prompt - 4 + false + + false - - pdbonly - true - ..\bin\ - TRACE - prompt - 4 - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Studio.bat b/Studio.bat deleted file mode 100644 index 10fc7e129..000000000 --- a/Studio.bat +++ /dev/null @@ -1,37 +0,0 @@ - - - -if exist "%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\msbuild.exe" ( -"%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\msbuild.exe" %1 %2 %3 %4 - -) else if exist "%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Professional\MSBuild\15.0\Bin\msbuild.exe" ( -"%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Professional\MSBuild\15.0\Bin\msbuild.exe" %1 %2 %3 %4 - -) else if exist "%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Enterprise\MSBuild\15.0\Bin\msbuild.exe" ( -"%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Enterprise\MSBuild\15.0\Bin\msbuild.exe" %1 %2 %3 %4 - - - -) else if exist "%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Community\MSBuild\Current\Bin\msbuild.exe" ( -"%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Community\MSBuild\Current\Bin\msbuild.exe" %1 %2 %3 %4 - -) else if exist "%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Professional\MSBuild\Current\Bin\msbuild.exe" ( -"%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Professional\MSBuild\Current\Bin\msbuild.exe" %1 %2 %3 %4 - -) else if exist "%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Enterprise\MSBuild\Current\Bin\msbuild.exe" ( -"%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Enterprise\MSBuild\Current\Bin\msbuild.exe" %1 %2 %3 %4 - - - -rem Если хотите добавить другой путь к Visual Studio, можете записать его в переменную среды MSBUILD_PATH -) else if exist "%MSBUILD_PATH%" ( -"%MSBUILD_PATH%" %1 %2 %3 %4 - - - -) else ( - ECHO Visual Studio not found - SET ERRORLEVEL=1 -) - - diff --git a/SyntaxTree/SyntaxTree.csproj b/SyntaxTree/SyntaxTree.csproj index 2c2c071a8..91d4ff252 100644 --- a/SyntaxTree/SyntaxTree.csproj +++ b/SyntaxTree/SyntaxTree.csproj @@ -1,164 +1,24 @@  - + - Local - 9.0.30729 - 2.0 - {C2CAC65A-B2AE-4CCC-B067-E6B8E75DF73A} - Debug - AnyCPU - - - - - SyntaxTree - - - JScript - Grid - IE50 - false - Library - SyntaxTree - OnBuildSuccess - - - - - - - 4.0 - v4.0 - - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - false - true - - + net40 + ..\bin\ - false - 285212672 - false - - - DEBUG;TRACE - - - true - 4096 - false - - - false - false - false - false - 4 - full - prompt - AllRules.ruleset - false - false + false + + false + false - - ..\bin\ - false - 285212672 - false - - - TRACE - - - false - 4096 - false - - - true - false - false - false - 4 - none - prompt - AllRules.ruleset - - - - - System.Data - - - System.XML - - + - Config\globalassemblyinfo.cs + Config\GlobalAssemblyInfo.cs - - - - - - - - - - - - - Code - - - Code - - - Code - - + + + - - False - Клиентский профиль .NET Framework 3.5 SP1 - false - - - False - .NET Framework 3.5 SP1 - true - - - False - Установщик Windows 3.1 - true - + - - - {e8aefbf9-0113-4fa4-be45-6cda555498b7} - StringConstants - - - - - - - - - \ No newline at end of file diff --git a/SyntaxTreeConverters/SyntaxTreeConverters.csproj b/SyntaxTreeConverters/SyntaxTreeConverters.csproj index 48d4b5818..7d506787a 100644 --- a/SyntaxTreeConverters/SyntaxTreeConverters.csproj +++ b/SyntaxTreeConverters/SyntaxTreeConverters.csproj @@ -1,71 +1,21 @@  - - + - Debug - AnyCPU - {F10A5330-DCF4-4533-877C-7B1B1BE23884} - Library - Properties + net40 + Languages.Pascal.Frontend.Converters - SyntaxTreeConverters - v4.0 - 512 - - - true - full - false + ..\bin\ - DEBUG;TRACE - prompt - 4 - true - - - pdbonly - true - ..\bin\ - TRACE - prompt - 4 + false + + false + - - + + + + + - - - - - - - {44a01f9e-dce7-470c-aae5-c3de0ccbee3b} - Errors - - - {2de2842f-0912-4251-bc0f-480854c44a13} - Localization - - - {c2cac65a-b2ae-4ccc-b067-e6b8e75df73a} - SyntaxTree - - - {a9ab4282-83b4-41a7-86c3-e5bf6a45e7e2} - SyntaxVisitors - - - {1c9c945a-586d-42a2-a06b-65d84fa7ff78} - TreeConverter - - - - \ No newline at end of file diff --git a/SyntaxVisitors/SyntaxVisitors.csproj b/SyntaxVisitors/SyntaxVisitors.csproj index 769fd5667..7f4736d44 100644 --- a/SyntaxVisitors/SyntaxVisitors.csproj +++ b/SyntaxVisitors/SyntaxVisitors.csproj @@ -1,148 +1,19 @@  - - + - Debug - AnyCPU - {A9AB4282-83B4-41A7-86C3-E5BF6A45E7E2} - Library - Properties - SyntaxVisitors - SyntaxVisitors - v4.0 - 512 - - - - true - full - false + net40 + ..\bin\ - DEBUG;TRACE - prompt - 4 - true - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - + false + + false + - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {44a01f9e-dce7-470c-aae5-c3de0ccbee3b} - Errors - - - {2de2842f-0912-4251-bc0f-480854c44a13} - Localization - - - {af2efd7b-69dd-4b43-af65-b59b29349c23} - ParserTools - - - {c2cac65a-b2ae-4ccc-b067-e6b8e75df73a} - SyntaxTree - - - {ce5c55c2-a11c-4e94-a9fa-3fc6ca3e4c09} - YieldHelpers - - - - - \ No newline at end of file diff --git a/SyntaxVisitors/YieldVisitors/JustTestVisitor.cs b/SyntaxVisitors/YieldVisitors/JustTestVisitor.cs deleted file mode 100644 index 05fe454b7..000000000 --- a/SyntaxVisitors/YieldVisitors/JustTestVisitor.cs +++ /dev/null @@ -1,150 +0,0 @@ -// Copyright (c) Ivan Bondarev, Stanislav Mikhalkovich (for details please see \doc\copyright.txt) -// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -using PascalABCCompiler; -using PascalABCCompiler.SyntaxTree; - -namespace SyntaxVisitors -{ - public class JustTestVisitor : BaseChangeVisitor - { - private void CollectFormalParams(procedure_definition pd, ISet collectedFormalParams) - { - if ((object)pd.proc_header.parameters != null) - collectedFormalParams.UnionWith(pd.proc_header.parameters.params_list.Select(tp => new var_def_statement(tp.idents, tp.vars_type))); - } - - private void CollectFormalParamsNames(procedure_definition pd, ISet collectedFormalParamsNames) - { - if ((object)pd.proc_header.parameters != null) - collectedFormalParamsNames.UnionWith(pd.proc_header.parameters.params_list.SelectMany(tp => tp.idents.idents).Select(id => id.name)); - } - - private void CollectClassFieldsNames(procedure_definition pd, ISet collectedFields, out bool isInClassMethod) - { - isInClassMethod = false; - - ident className = null; - if ((object)pd.proc_header.name.class_name != null) - { - // Объявление вне класса его метода - className = pd.proc_header.name.class_name; - } - else - { - // Объявление функции в классе? - var classDef = UpperNode(3) as class_definition; - if ((object)(UpperNode(3) as class_definition) != null) - { - var td = UpperNode(4) as type_declaration; - if ((object)td != null) - { - className = td.type_name; - } - } - } - - if ((object)className != null) - { - isInClassMethod = true; - - CollectClassFieldsVisitor fieldsVis = new CollectClassFieldsVisitor(className); - var cu = UpperTo(); - if ((object)cu != null) - { - cu.visit(fieldsVis); - // Collect - collectedFields.UnionWith(fieldsVis.CollectedFields.Select(id => id.name)); - } - } - } - - private void CollectUnitGlobalsNames(procedure_definition pd, ISet collectedUnitGlobalsName) - { - var cu = UpperTo(); - if ((object)cu != null) - { - var ugVis = new CollectUnitGlobalsVisitor(); - cu.visit(ugVis); - // Collect - collectedUnitGlobalsName.UnionWith(ugVis.CollectedGlobals.Select(id => id.name)); - } - } - - private void CreateCapturedLocalsNamesMap(ISet localsNames, IDictionary capturedLocalsNamesMap) - { - foreach (var localName in localsNames) - { - capturedLocalsNamesMap.Add(localName, CapturedNamesHelper.MakeCapturedLocalName(localName)); - } - } - - private void CreateCapturedFormalParamsNamesMap(ISet formalParamsNames, IDictionary captueedFormalParamsNamesMap) - { - foreach (var formalParamName in formalParamsNames) - { - captueedFormalParamsNamesMap.Add(formalParamName, CapturedNamesHelper.MakeCapturedFormalParameterName(formalParamName)); - } - } - - public override void visit(procedure_definition pd) - { - // frninja - - // Classification - ISet CollectedLocalsNames = new HashSet(); - ISet CollectedFormalParamsNames = new HashSet(); - ISet CollectedClassFieldsNames = new HashSet(); - ISet CollectedUnitGlobalsNames = new HashSet(); - - ISet CollectedLocals = new HashSet(); - ISet CollectedFormalParams = new HashSet(); - - // Map from ident idName -> captured ident idName - IDictionary CapturedLocalsNamesMap = new Dictionary(); - IDictionary CapturedFormalParamsNamesMap = new Dictionary(); - - var dld = new DeleteAllLocalDefs(); // mids.vars - все захваченные переменные - pd.visit(dld); // Удалить в локальных и блочных описаниях этой процедуры все переменные и вынести их в отдельный список var_def_statement - - // frninja 08/12/15 - bool isInClassMethod; - - // Collect locals - CollectedLocals.UnionWith(dld.LocalDeletedDefs); - CollectedLocalsNames.UnionWith(dld.LocalDeletedDefs.SelectMany(vds => vds.vars.idents).Select(id => id.name)); - // Collect formal params - CollectFormalParams(pd, CollectedFormalParams); - CollectFormalParamsNames(pd, CollectedFormalParamsNames); - // Collect class fields - CollectClassFieldsNames(pd, CollectedClassFieldsNames, out isInClassMethod); - - // Collect unit globals - CollectUnitGlobalsNames(pd, CollectedUnitGlobalsNames); - - // Create maps :: idName -> captureName - CreateCapturedLocalsNamesMap(CollectedLocalsNames, CapturedLocalsNamesMap); - CreateCapturedFormalParamsNamesMap(CollectedFormalParamsNames, CapturedFormalParamsNamesMap); - - // AHAHA test! - ReplaceCapturedVariablesVisitor rcapVis = new ReplaceCapturedVariablesVisitor( - CollectedLocalsNames, - CollectedFormalParamsNames, - CollectedClassFieldsNames, - new HashSet(), - new HashSet(), - CollectedUnitGlobalsNames, - CapturedLocalsNamesMap, - CapturedFormalParamsNamesMap, - isInClassMethod - ); - // Replace - (pd.proc_body as block).program_code.visit(rcapVis); - } - } -} diff --git a/SyntaxVisitors/YieldVisitors/RenameSameVarNamesVisitor.cs b/SyntaxVisitors/YieldVisitors/RenameSameVarNamesVisitor.cs deleted file mode 100644 index eb934a2cb..000000000 --- a/SyntaxVisitors/YieldVisitors/RenameSameVarNamesVisitor.cs +++ /dev/null @@ -1,181 +0,0 @@ -// Copyright (c) Ivan Bondarev, Stanislav Mikhalkovich (for details please see \doc\copyright.txt) -// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) -using System; -using System.Collections.Generic; -using System.Linq; -using PascalABCCompiler.SyntaxTree; - -namespace PascalABCCompiler.SyntaxTreeConverters -{ - - // Первое предназначение - вынести последовательность из заголовка в foreach до foreach как отдельное присваивание - // Второе предназначение - переименовать все переменные, совпадающие по имени с типом T обобщенного класса, в котором находится метод, содержащий лямбду - public class VarNamesInMethodsWithSameNameAsClassGenericParamsReplacer: CollectLightSymInfoVisitor - { - /// - /// Надо приводить к нижнему регистру - /// - //public List NamesForReplace = new List(); - - private int LambdaNestedLevel = 0; - - Dictionary d = new Dictionary(); // словарь скоупов для каждого имени - // При входе в обобщенный класс или запись мы в словарь добавляем все его обобщенные параметры со значением nil - // При выходе из класса мы очищаем словарь - // При встрече описания переменной с именем, совпадающим с одним из ключей в словаре, мы заменяем значение null на пространство имен, в котором мы находимся - // Описание переменной в словарь добавляется только если она описана в методе, но вне лямбды, поскольку в лямбде конфликтов имен нет - // При выходе из пространства имен мы проверяем, есть ли в словаре такое значение, и если да, очищаем его, присваивая null - // Переименовывать будем все имена name если ключ name есть в словаре и d[name] != null - public static new VarNamesInMethodsWithSameNameAsClassGenericParamsReplacer New - { - get => new VarNamesInMethodsWithSameNameAsClassGenericParamsReplacer(); - } - public override void AddSymbol(ident name, SymKind kind, type_definition td = null, Attributes attr = 0) - { - if (name == null || name.name == null) - { - return; - } - var n = name.name.ToLower(); - //if (LambdaNestedLevel > 0) // т.е. впервые встретилось переопределение именно в лямбде, тогда пропускать эту лямбду - // return; - if (d.ContainsKey(n) && d[n] == null && (kind == SymKind.var || kind == SymKind.param)) // Добавляем не все, а только разыскиваемые и только если это - переменная - { - d[n] = this.Current; - base.AddSymbol(name, kind, td, attr); - } - } - public override void Enter(syntax_tree_node st) - { - base.Enter(st); - if (st is function_lambda_definition) - LambdaNestedLevel += 1; - else if (st is class_definition cl) - { - var td = cl.Parent as type_declaration; - if (td?.type_name is template_type_name ttn) - { - foreach (var id in ttn.template_args.idents) - { - d[id.name.ToLower()] = null; - } - } - } - else if (st is procedure_definition pd) - { - var cn = pd.proc_header.name?.class_name; - if (cn is template_type_name ttn) - { - foreach (var id in ttn.template_args.idents) - { - d[id.name.ToLower()] = null; - } - } - } - } - public override void PreExitScope(syntax_tree_node st) - { - var l = d.Keys.Where(k => d[k] == Current).ToList(); - // Обходим все словари и смотрим у них вершину стеков - foreach (var k in l) - { - d[k] = null; // т.е. в этом пространстве имен мы захватили одноименное описание переменной - освобождаем его - } - } - public override void Exit(syntax_tree_node st) - { - if (st is function_lambda_definition) - LambdaNestedLevel -= 1; - else if (st is class_definition) // то мы не ищем переопределение имен, поскольку мы вышли из класса - { - d.Clear(); - } - else if (st is procedure_definition pd) // мы вышли из метода вида t1.p - { - var cn = pd.proc_header.name?.class_name; - if (cn is template_type_name ttn) - d.Clear(); - } - base.Exit(st); - } - - public override void visit(template_type_name tn) - { - // игнорировать чтобы там ничего не переименовывалось - } - public override void visit(ident id) - { - ReplaceNameOrNot(id); - } - public override void visit(dot_node dn) - { - if (dn.left is ident id) - ReplaceNameOrNot(id); - else ProcessNode(dn.left); - } - - public static int ReplaceNum = 0; - public void ReplaceNameOrNot(ident id) - { - var n = id.name.ToLower(); - if (d.ContainsKey(n) && d[n] != null) // Переименовываем без страха - { - id.name = id.name + "$Replace$" + ReplaceNum; // имя такое чтобы при выдаче сообщения об ошибке в нем можно было бы обрезать конец - } - } - } - - // Может, переименовать все T? Всё равно алгоритм переименовывания будет один - // Искать описания с T. Как нашли - с этого места переименовывать - // Сделать визитор LocalRenamer и переименовывать с места описания - - /*public class LocalRenamer : BaseChangeVisitor - { - - public static void RenameFrom(var_def_statement vd, string Name, string NewName) - { - var lr = new LocalRenamer(); - lr.ProcessNode(vd); - } - }*/ - - - // Поиск всех захваченных переменных в лямбде - // Это сложно - /*public class LambdaCapturedNamesSearcher : BaseChangeVisitor - { - List idents = new List(); - public static LambdaCapturedNamesSearcher New - { - get - { - return new LambdaCapturedNamesSearcher(); - } - } - public override void visit(ident id) - { - // хорошо бы всё здесь захватить! Но вдруг это - описание... - } - public override void visit(dot_node dn) - { - // это точно надо захватывать - } - - public override void visit(var_def_statement vds) - { - // имена обойти отдельно, инициализатор - отдельно - foreach (var id in vds.vars.idents) - { - // Надо проверять совпадение имен с именами в параметрах обобщения - // если не совпадают, то просто пропускаем - // если совпадают, то исключаем это имя из списка проверки! Всё - имя уже переопределено! И это произошло в лямбде, что можно - } - visit(vds.inital_value); - } - public override void visit(function_lambda_definition ld) - { - // параметры обойти отдельно, тело отдельно - // проблема, что могут быть вложенные лямбды. Т.е это - основная, а в ней - ещё. - } - }*/ -} diff --git a/TreeConverter/Collections/returner.cs b/TreeConverter/Collections/returner.cs deleted file mode 100644 index 97a433d23..000000000 --- a/TreeConverter/Collections/returner.cs +++ /dev/null @@ -1,43 +0,0 @@ -using System; - -using PascalABCCompiler.TreeConverter; - -namespace PascalABCCompiler.Collections -{ - - public class returner where ST : SyntaxTree.tree_node - { - private stack internal_stack = new stack(); - private syntax_tree_visitor stg; - - public returner(syntax_tree_visitor _stg) - { - this.stg = _stg; - } - - public T visit(ST value) - { -#if (DEBUG) - int stack_size = internal_stack.size; -#endif - - value.visit(stg); - -#if (DEBUG) - if (internal_stack.size != stack_size + 1) - { - throw new InvalidStackState(); - } -#endif - - T en = internal_stack.pop(); - return en; - } - - public void return_value(T value) - { - internal_stack.push(value); - } - } - -} diff --git a/TreeConverter/SymbolTable/NVSymbolTable.cs b/TreeConverter/SymbolTable/NVSymbolTable.cs deleted file mode 100644 index 42f7c5a16..000000000 --- a/TreeConverter/SymbolTable/NVSymbolTable.cs +++ /dev/null @@ -1,379 +0,0 @@ - -using System; -using System.Collections; - -namespace TreeConverter -{ - public abstract class scope : base_scope - { - private Hashtable ht=new Hashtable(); - - public string name_to_symtab(string name) - { - return name.ToLower(); - } - - public void add_name(string name,SymbolInfo si) - { - name=name_to_symtab(name); - object o=ht[name]; - if (o==null) - { - SymbolInfoArrayList syal=new SymbolInfoArrayList(); - syal.Add(si); - ht[name]=syal; - return; - } - else - { - /*if (si.symbol_kind==symbol_kind.sk_none) - { - throw new CompilerInternalError("Duplicate name definition"); - }*/ - SymbolInfoArrayList syal1=(SymbolInfoArrayList)o; - syal1.Add(si); - return; - } - } - - public virtual SymbolInfo find_only_in_namespace(string name) - { - name=name_to_symtab(name); - object o=ht[name]; - if (o==null) - { - return null; - } - SymbolInfoArrayList syal=(SymbolInfoArrayList)o; - int i=1; - while(i - ///Collection of base_scope - /// - [Serializable] - public class base_scopeArrayList : System.Collections.IEnumerable,System.Collections.ICollection,System.ICloneable - { - - private System.Collections.ArrayList arr=new System.Collections.ArrayList(); - - /// - ///Adds an base_scope to the end of the base_scopeArrayList. - /// - ///The base_scope to be added to the end of the ArrayList. The value can be a null reference. - ///The base_scopeArrayList index at which the value has been added. - public int Add(base_scope value) - { - return arr.Add(value); - } - - /// - ///Adds the elements of an ICollection to the end of the base_scopeArrayList - /// - ///The ICollection whose elements should be added to the end of the ArrayList. The collection itself cannot be a null reference (Nothing in Visual Basic), but it can contain elements that are a null reference. - ///Return value is void - private void AddRange(System.Collections.ICollection c) - { - arr.AddRange(c); - } - - /// - ///Adds the elements of an base_scope[] to the end of the base_scopeArrayList - /// - ///The base_scope[] whose elements should be added to the end of the ArrayList. The base_scope[] itself cannot be a null reference, but it can contain elements that are a null reference. - ///Return value is void - public void AddRange(base_scope[] array) - { - arr.AddRange(array); - } - - /// - ///Adds the elements of an base_scopeArrayList to the end of the base_scopeArrayList - /// - ///The base_scopeArrayList whose elements should be added to the end of the ArrayList. The base_scopeArrayList itself cannot be a null reference, but it can contain elements that are a null reference. - ///Return value is void - public void AddRange(base_scopeArrayList array_list) - { - arr.AddRange(array_list); - } - - /// - ///Uses a binary search algorithm to locate a specific element in the sorted base_scopeArrayList or a portion of it. - /// - ///The Object to locate. The value can be a null reference. - ///The zero-based index of value in the sorted base_scopeArrayList, if value is found; otherwise, a negative number, which is the bitwise complement of the index of the next element that is larger than value or, if there is no larger element, the bitwise complement of Count. - public int BinarySearch(base_scope value) - { - return arr.BinarySearch(value); - } - - /// - ///Searches the entire sorted ArrayList for an element using the specified comparer and returns the zero-based index of the element. - /// - ///The Object to locate. The value can be a null reference. - ///The IComparer implementation to use when comparing elements. -or- A null reference (Nothing in Visual Basic) to use the default comparer that is the IComparable implementation of each element. - ///The zero-based index of value in the sorted base_scopeArrayList, if value is found; otherwise, a negative number, which is the bitwise complement of the index of the next element that is larger than value or, if there is no larger element, the bitwise complement of Count. - public void BinarySearch(base_scope value,System.Collections.IComparer comparer) - { - arr.BinarySearch(value,comparer); - } - - /// - ///Searches the entire sorted ArrayList for an element using the specified comparer and returns the zero-based index of the element. - /// - ///The zero-based starting index of the range to search. - ///The length of the range to search. - ///The Object to locate. The value can be a null reference. - ///The IComparer implementation to use when comparing elements. -or- A null reference (Nothing in Visual Basic) to use the default comparer that is the IComparable implementation of each element. - ///The zero-based index of value in the sorted base_scopeArrayList, if value is found; otherwise, a negative number, which is the bitwise complement of the index of the next element that is larger than value or, if there is no larger element, the bitwise complement of Count. - public void BinarySearch(int index,int count,base_scope value,System.Collections.IComparer comparer) - { - arr.BinarySearch(value,comparer); - } - - /// - ///Creates a shallow copy of the ArrayList. - /// - ///A shallow copy of the base_scopeArrayList. - public virtual base_scopeArrayList clone() - { - base_scopeArrayList al=new base_scopeArrayList(); - al.arr=(System.Collections.ArrayList)this.arr.Clone(); - return al; - } - - /// - ///Creates a shallow copy of the ArrayList. - /// - ///A shallow copy of the base_scopeArrayList. - public virtual object Clone() - { - return this.clone(); - } - - /// - ///Determines whether an element is in the base_scopeArrayList. - /// - ///The base_scope to locate in the ArrayList. The value can be a null reference. - ///true if item is found in the base_scopeArrayList; otherwise, false. - public bool Contains(base_scope item) - { - return arr.Contains(item); - } - - /// - ///Searches for the specified base_scope and returns the zero-based index of the first occurrence within the entire base_scopeArrayList. - /// - ///The base_scope to locate in the base_scopeArrayList. The value can be a null reference. - ///The zero-based index of the first occurrence of value within the entire base_scopeArrayList, if found; otherwise, -1. - public int IndexOf(base_scope value) - { - return arr.IndexOf(value); - } - - /// - ///Searches for the specified base_scope and returns the zero-based index of the first occurrence within the section of the base_scopeArrayList that extends from the specified index to the last element. - /// - ///The base_scope to locate in the base_scopeArrayList. The value can be a null reference. - ///The zero-based starting index of the search. - ///The zero-based index of the first occurrence of value within the section of the base_scopeArrayList that extends from startIndex to the last element, if found; otherwise, -1. - public int IndexOf(base_scope value,int startIndex) - { - return arr.IndexOf(value,startIndex); - } - - /// - ///Searches for the specified base_scope and returns the zero-based index of the first occurrence within the section of the base_scopeArrayList that starts at the specified index and contains the specified number of elements. - /// - ///The base_scope to locate in the base_scopeArrayList. The value can be a null reference. - ///The zero-based starting index of the search. - ///The number of elements in the section to search. - ///The zero-based index of the first occurrence of value within the section of the ArrayList that starts at startIndex and contains count number of elements, if found; otherwise, -1. - public int IndexOf(base_scope value,int startIndex,int count) - { - return arr.IndexOf(value,startIndex,count); - } - - /// - ///Inserts an element into the base_scopeArrayList at the specified index. - /// - ///The zero-based index at which value should be inserted. - ///The base_scope to insert. The value can be a null reference. - ///Return value is void - public void Insert(int index,base_scope value) - { - arr.Insert(index,value); - } - - /// - ///Inserts the elements of a base_scope into the base_scopeArrayList at the specified index. - /// - ///The zero-based index at which the new elements should be inserted. - ///The base_scope[] whose elements should be inserted into the base_scopeArrayList. The base_scope[] itself cannot be a null reference, but it can contain elements that are a null reference. - ///Return value is void - public void InsertRange(int index,base_scope[] base_scope_arr) - { - arr.InsertRange(index,arr); - } - - /// - ///Inserts the elements of a collection into the base_scopeArrayList at the specified index. - /// - ///The zero-based index at which the new elements should be inserted. - ///The base_scopeArrayList whose elements should be inserted into the base_scopeArrayList. The base_scopeArrayList itself cannot be a null reference, but it can contain elements that are a null reference. - ///Return value is void - public void InsertRange(int index,base_scopeArrayList array_list) - { - arr.InsertRange(index,array_list); - } - - /// - ///Inserts the elements of a collection into the base_scopeArrayList at the specified index. - /// - ///The zero-based index at which the new elements should be inserted. - ///The ICollection whose elements should be inserted into the base_scopeArrayList. The collection itself cannot be a null reference, but it can contain elements that are a null reference. - ///Return value is void - private void InsertRange(int index,System.Collections.ICollection c) - { - arr.InsertRange(index,c); - } - - /// - ///Searches for the specified base_scope and returns the zero-based index of the last occurrence within the entire base_scopeArrayList. - /// - ///The base_scope to locate in the base_scopeArrayList. The value can be a null reference. - ///The zero-based index of the last occurrence of value within the entire the ArrayList, if found; otherwise, -1. - public int LastIndexOf(base_scope value) - { - return arr.LastIndexOf(value); - } - - /// - ///Searches for the specified base_scope and returns the zero-based index of the last occurrence within the section of the base_scopeArrayList that extends from the first element to the specified index. - /// - ///The base_scope to locate in the base_scopeArrayList. The value can be a null reference. - ///The zero-based starting index of the backward search. - ///The zero-based index of the last occurrence of value within the section of the base_scopeArrayList that extends from the first element to startIndex, if found; otherwise, -1. - public int LastIndexOf(base_scope value,int startIndex) - { - return arr.LastIndexOf(value,startIndex); - } - - /// - ///Searches for the specified base_scope and returns the zero-based index of the last occurrence within the section of the base_scopeArrayList that contains the specified number of elements and ends at the specified index. - /// - ///The base_scope to locate in the base_scopeArrayList. The value can be a null reference. - ///The zero-based starting index of the backward search. - ///The number of elements in the section to search. - ///The zero-based index of the last occurrence of value within the section of the base_scopeArrayList that extends from the first element to startIndex, if found; otherwise, -1. - public int LastIndexOf(base_scope value,int startIndex,int count) - { - return arr.LastIndexOf(value,startIndex,count); - } - - /// - ///Gets or sets the element at the specified index. - /// - ///The zero-based index of the element to get or set. - public base_scope this [int index] - { - get - { - return ((base_scope)(arr[index])); - } - set - { - arr[index]=value; - } - } - - /// - ///Removes the first occurrence of a specific object from the ArrayList. - /// - ///The base_scope to remove from the ArrayList. The value can be a null reference. - ///Return value is void - public void Remove(base_scope value) - { - arr.Remove(value); - } - - /// - ///Copies the elements of a collection over a range of elements in the base_scopeArrayList. - /// - ///The zero-based base_scopeArrayList index at which to start copying the elements of c. - ///The ICollection whose elements to copy to the ArrayList. The collection itself cannot be a null reference (Nothing in Visual Basic), but it can contain elements that are a null reference. - ///Return value is void - private void SetRange(int index,System.Collections.ICollection c) - { - arr.SetRange(index,c); - } - - /// - ///Copies the elements of the base_scopeArrayList to a new base_scope array. - /// - ///An base_scope array containing copies of the elements of the base_scopeArrayList. - public base_scope[] ToArray() - { - return ((base_scope[])(arr.ToArray(typeof(base_scope)))); - } - - /// - ///Gets the number of elements actually contained in the ArrayList. - /// - public int Count - { - get - { - return arr.Count; - } - } - - /// - ///Copies the entire ArrayList to a compatible one-dimensional Array, starting at the specified index of the target array. - /// - ///The one-dimensional Array that is the destination of the elements copied from base_scopeArrayList. The Array must have zero-based indexing. - ///The zero-based index in array at which copying begins. - ///Return value is void - public void CopyTo(System.Array array,int arrayIndex) - { - arr.CopyTo(array,arrayIndex); - } - - /// - ///Copies the entire ArrayList to a compatible one-dimensional base_scope[], starting at the specified index of the target array. - /// - ///The one-dimensional base_scope[] that is the destination of the elements copied from base_scopeArrayList. The Array must have zero-based indexing. - ///The zero-based index in array at which copying begins. - ///Return value is void - public void CopyTo(base_scope[] array,int arrayIndex) - { - arr.CopyTo(array,arrayIndex); - } - - /// - ///Copies the entire base_scopeArrayList to a compatible one-dimensional base_scope[], starting at the beginning of the target array. - /// - ///The one-dimensional base_scope[] that is the destination of the elements copied from base_scopeArrayList. The Array must have zero-based indexing. - ///Return value is void - public void CopyTo(base_scope[] array) - { - arr.CopyTo(array); - } - - /// - ///Copies the entire ArrayList to a compatible one-dimensional base_scope[], starting at the specified index of the target array. - /// - ///The zero-based index in the source ArrayList at which copying begins. - ///The one-dimensional base_scope[] that is the destination of the elements copied from base_scopeArrayList. The Array must have zero-based indexing. - ///The zero-based index in array at which copying begins. - ///The number of elements to copy. - ///Return value is void - public void CopyTo(int index,base_scope[] array,int arrayIndex,int count) - { - arr.CopyTo(index,array,arrayIndex,count); - } - - /// - ///Gets a value indicating whether access to the ArrayList is synchronized (thread-safe). - /// - public bool IsSynchronized - { - get - { - return arr.IsSynchronized; - } - } - - /// - ///Gets a value indicating whether the ArrayList has a fixed size. - /// - public bool IsFixedSize - { - get - { - return arr.IsFixedSize; - } - } - - /// - ///Gets a value indicating whether the ArrayList is read-only. - /// - public bool IsReadOnly - { - get - { - return arr.IsReadOnly; - } - } - - /// - ///Gets an object that can be used to synchronize access to the ArrayList. - /// - public object SyncRoot - { - get - { - return arr.SyncRoot; - } - } - - /// - ///Returns an enumerator for the entire ArrayList. - /// - ///An IEnumerator for the entire base_scopeArrayList. - public System.Collections.IEnumerator GetEnumerator() - { - return arr.GetEnumerator(); - } - - /// - ///Removes all elements from the ArrayList. - /// - ///Return value is void - public void Clear() - { - arr.Clear(); - } - - public int Capacity - { - get - { - return arr.Capacity; - } - set - { - arr.Capacity=value; - } - } - - public base_scopeArrayList GetRange(int index,int count) - { - System.Collections.ArrayList al=arr.GetRange(index,count); - base_scopeArrayList tnal=new base_scopeArrayList(); - tnal.arr=al; - return tnal; - } - - public void RemoveAt(int index) - { - arr.RemoveAt(index); - } - - public void RemoveRange(int index,int count) - { - arr.RemoveRange(index,count); - } - - public void Reverse() - { - arr.Reverse(); - } - - public void Reverse(int index,int count) - { - arr.Reverse(index,count); - } - - public void SetRange(int index,base_scope[] tnarr) - { - SetRange(index,tnarr); - } - - public void SetRange(int index,base_scopeArrayList tnarl) - { - SetRange(index,tnarl); - } - - public void TrimToSize() - { - arr.TrimToSize(); - } - - } - -} \ No newline at end of file diff --git a/TreeConverter/SymbolTable/scope_wrap.cs b/TreeConverter/SymbolTable/scope_wrap.cs deleted file mode 100644 index 96857e30a..000000000 --- a/TreeConverter/SymbolTable/scope_wrap.cs +++ /dev/null @@ -1,212 +0,0 @@ - -using System; - -namespace TreeConverter -{ - public class BaseScope - { - public virtual SymbolInfo Find(string name) - { - return null; - } - } -} - -namespace SymbolTable -{ - - public class Scope:TreeConverter.BaseScope - { - protected TreeConverter.scope _sc; - protected Scope _top_scope; - - public TreeConverter.scope internal_scope - { - get - { - return _sc; - } - } - - public Scope() - { - } - - public Scope TopScope - { - get - { - return _top_scope; - } - } - - public Scope(TreeConverter.base_scope us,Scope top_scope) - { - _sc=new TreeConverter.function_scope(us); - _top_scope=top_scope; - } - - public override TreeConverter.SymbolInfo Find(string name) - { - return _sc.find(name); - } - public TreeConverter.SymbolInfo FindOnlyInScope(string name) - { - return _sc.find_only_in_namespace(name); - } - public TreeConverter.SymbolInfo FindOnlyInType(string name) - { - TreeConverter.type_scope ts=_sc as TreeConverter.type_scope; - if (ts!=null) - { - return ts.find_in_type(name); - } - return null; - } - public void AddSymbol(string Name,TreeConverter.SymbolInfo Inf) - { - _sc.add_name(Name,Inf); - } - } - - public class UnitInterfaceScope : Scope - { - public UnitInterfaceScope(TreeConverter.base_scope[] bsa) - { - _sc=new TreeConverter.interface_scope(bsa); - } - - } - - public class UnitImplementationScope : Scope - { - public UnitImplementationScope(TreeConverter.interface_scope isc,TreeConverter.base_scope[] bsa) - { - _sc=new TreeConverter.implementation_scope(isc,bsa); - } - } - - public class ClassScope : Scope - { - TreeConverter.type_scope _ts; - Scope _bcs; - public ClassScope(TreeConverter.base_scope bts, TreeConverter.base_scope cs, Scope bcs) - { - _bcs=bcs; - _ts=new TreeConverter.type_scope(bts,cs); - _sc=_ts; - } - public Scope BaseClassScope - { - get - { - return _bcs; - } - set - { - _bcs=value; - _ts.base_type_scope=(TreeConverter.type_scope)_bcs.internal_scope; - } - } - } - - public class ClassMethodScope : Scope - { - public ClassMethodScope(TreeConverter.base_scope ts,TreeConverter.base_scope cns) - { - _sc=new TreeConverter.method_scope(ts,cns); - } - } - - public class TreeConverterSymbolTable - { - public Scope CreateScope(Scope TopScope) - { - TreeConverter.base_scope bs2=null; - if (TopScope!=null) - { - bs2=TopScope.internal_scope; - } - return new Scope(bs2,TopScope); - } - public ClassScope CreateClassScope(Scope TopScope,Scope BaseClass) - { - TreeConverter.base_scope bs1=null; - if (BaseClass!=null) - { - bs1=BaseClass.internal_scope; - } - TreeConverter.base_scope bs2=null; - if (TopScope!=null) - { - bs2=TopScope.internal_scope; - } - return new ClassScope(bs1,bs2,BaseClass); - } - public UnitInterfaceScope CreateUnitInterfaceScope(Scope[] UsedUnits) - { - TreeConverter.base_scope[] arr=new TreeConverter.base_scope[UsedUnits.Length]; - for(int i=0;i0) break; - } - } - if (mis.Length != 0) - { - //Console.WriteLine(mis[0].GetAccessors()[0].Name); - si = new SymbolInfo(GetFieldNode(mis[0])); - SymbolInfo temp=si; - for (int i=1; i0) break; - } - } - if (mis.Length != 0) - { - //Console.WriteLine(mis[0].GetAccessors()[0].Name); - si = new SymbolInfo(GetPropertyNode(mis[0])); - SymbolInfo temp=si; - for (int i=1; i0) break; - } - } - if (mis.Length != 0) - { - si = new SymbolInfo(GetMethodNode(mis[0])); - SymbolInfo temp=si; - for (int i=1; i 0) break; - } - } - if (mis.Length != 0) - { - //Console.WriteLine(mis[0].GetAccessors()[0].Name); - if (mis[0] is MethodInfo) - { - si = new SymbolInfo(GetMethodNode((MethodInfo)mis[0])); - SymbolInfo temp=si; - for (int i=1; i var_defs = - new System.Collections.Generic.List(); - - private readonly System.Collections.Generic.Stack> var_defs_stack = - new System.Collections.Generic.Stack>(); - - private readonly System.Collections.Generic.List _special_local_vars = - new System.Collections.Generic.List(); - - private System.Collections.Generic.Stack _scope_stack - = new System.Collections.Generic.Stack(); - - private statement_node _main_procedure; - - private SymbolInfo _last_created_function; - - private statement_node_stack _cycles_stack=new statement_node_stack(); - - private int _num_of_for_cycles; - - private convertion_data_and_alghoritms convertion_data_and_alghoritms; - - private SemanticTree.field_access_level _fal; - - public blocks(convertion_data_and_alghoritms convertion_data_and_alghoritms) - { - this.convertion_data_and_alghoritms = convertion_data_and_alghoritms; - } - - public void reset() - { - _cmn = null; - _ctn = null; - _func_stack.clear(); - var_defs.Clear(); - _main_procedure = null; - _last_created_function = null; - _cycles_stack.clear(); - _num_of_for_cycles = 0; - _fal = SemanticTree.field_access_level.fal_private; - rec_num = 1; - var_defs_stack.Clear(); - type_stack.Clear(); - clear_special_local_vars(); - _scope_stack.Clear(); - } - - public void AddTemplate(string name, template_class tc, location loc) - { - check_name_free(name, loc); - _cmn.scope.AddSymbol(name, new SymbolInfo(tc)); - } - - public void AddTemplateInstance(string name, type_node t) - { - _cmn.scope.AddSymbol(name, new SymbolInfo(t)); - } - - private void clear_special_local_vars() - { - _special_local_vars.Clear(); - } - - public void add_special_local_var(local_variable lv) - { - _special_local_vars.Add(lv); - } - - /* - public System.Collections.Generic.List special_local_vars - { - get - { - return _special_local_vars; - } - } - */ - public void apply_special_local_vars(common_namespace_function_node cnfn) - { - foreach (local_variable lv in _special_local_vars) - { - lv.function = cnfn; - cnfn.var_definition_nodes_list.AddElement(lv); - } - clear_special_local_vars(); - } - - public void enter_scope(global::SymbolTable.Scope new_scope) - { - switch (converting_block()) - { - case block_type.function_block: - { - _scope_stack.Push(top_function.scope); - top_function.scope = new_scope; - break; - } - case block_type.namespace_block: - { - _scope_stack.Push(_cmn.scope); - _cmn.scope = new_scope; - break; - } - case block_type.type_block: - { - throw new CompilerInternalError("Unsupported scope relations"); - break; - } - default: - { - throw new CompilerInternalError("Undefined block type"); - } - } - } - - public void leave_scope() - { - switch (converting_block()) - { - case block_type.function_block: - { - top_function.scope = _scope_stack.Pop(); - break; - } - case block_type.namespace_block: - { - _cmn.scope = _scope_stack.Pop(); - break; - } - case block_type.type_block: - { - throw new CompilerInternalError("Unsupported scope relations"); - break; - } - default: - { - throw new CompilerInternalError("Undefined block type"); - } - } - } - - public statement_node main_procedure - { - get - { - return _main_procedure; - } - set - { - _main_procedure=value; - } - } - - public void set_field_access_level(SemanticTree.field_access_level fal) - { - _fal=fal; - } - - public common_function_node top_function - { - get - { - if (_func_stack.size==0) - { - return null; - } - return (_func_stack.top()); - } - } - - public common_type_node converted_type - { - get - { - return _ctn; - } - //ssyy - set - { - _ctn = value; - } - //\ssyy - } - - //ssyy - public common_function_node_stack converted_func_stack - { - get - { - return _func_stack; - } - set - { - _func_stack = value; - } - } - //\ssyy - - public common_namespace_node converted_namespace - { - get - { - return _cmn; - } - set - { - _cmn = value; - } - } - - public common_namespace_node create_namespace(common_namespace_node comprehensive_namespace,string namespace_name, - common_unit_node cont_unit,SymbolTable.Scope _scope,location loc) - { - SymbolTable.Scope scope; - if (comprehensive_namespace == null) - { - //scope = convertion_data_and_alghoritms.symbol_table.CreateScope(cont_unit.scope); - scope = _scope; - } - else - { - scope = convertion_data_and_alghoritms.symbol_table.CreateScope(comprehensive_namespace.scope); - } - _cmn = new common_namespace_node(comprehensive_namespace, cont_unit, namespace_name, scope, loc); - cont_unit.namespaces.AddElement(_cmn); - _cmn.scope.AddSymbol(namespace_name,new SymbolInfo(_cmn)); - return _cmn; - } - - public common_namespace_node create_namespace(string namespace_name, common_unit_node cont_unit,SymbolTable.Scope _scope, location loc) - { - return create_namespace(null, namespace_name, cont_unit,_scope, loc); - } - - public bool func_stack_size_is_one() - { - return (_func_stack.size == 1); - } - - public block_type converting_block() - { - if (_ctn != null && _ctn.is_value_type) return block_type.type_block; - - if (_func_stack.size!=0) - { - return block_type.function_block; - } - if (_ctn!=null) - { - return block_type.type_block; - } - return block_type.namespace_block; - } - - public common_type_node enter_in_type_method(string type_name, location loc) - { - SymbolInfo si = find(type_name); - if (si == null) - { - throw new UndefinedNameReference(type_name, loc); - } - if (si.sym_info.general_node_type != general_node_type.type_node) - { - throw new TypeNameExpected(type_name,si.sym_info,loc); - } -#if DEBUG - if (si.Next != null) - { - throw new CompilerInternalError("Must find only type, found some other."); - } -#endif - if (si.sym_info.semantic_node_type != semantic_node_type.common_type_node) - { - throw new OnlyCommonTypeMethodDefinitionAllowed(((type_node)si.sym_info), loc); - } - - //TODO: В случае создания вложенных классов этот код надо поправить. - common_type_node ctn = si.sym_info as common_type_node; - _ctn = ctn; - return ctn; - } - - public void leave_type_method() - { - _ctn = null; - } - - private readonly System.Collections.Generic.Stack type_stack = new System.Collections.Generic.Stack(); - - public void leave_record() - { - if (type_stack.Count != 0) - { - _cmn.types.AddElement(_ctn); - _ctn = type_stack.Pop(); - } - else - { - _cmn.types.AddElement(_ctn); - _ctn = null; - } - } - - public SymbolInfo create_special_names() - { - SymbolInfo si= new SymbolInfo(top_function.return_variable); - top_function.scope.AddSymbol(compiler_string_consts.result_variable_name, si); - return si; - } - - public common_function_node create_function(string name,location def_loc) - { - check_function_name(name,def_loc); - common_function_node cfn=null; - switch (converting_block()) - { - case block_type.function_block: - { - common_function_node top_func = _func_stack.top(); - SymbolTable.Scope scope = convertion_data_and_alghoritms.symbol_table.CreateScope(top_func.scope); - common_in_function_function_node ciffn; - ciffn=new common_in_function_function_node(name,def_loc,top_func,scope); - top_func.functions_nodes_list.AddElement(ciffn); - _last_created_function=new SymbolInfo(ciffn); - top_func.scope.AddSymbol(name,_last_created_function); - cfn=ciffn; - break; - } - case block_type.type_block: - { - common_method_node cmmn; - SymbolTable.Scope scope = convertion_data_and_alghoritms.symbol_table.CreateClassMethodScope(_cmn.scope, _ctn.Scope); - //TODO:сделать static и virtual. - //TODO: interface and implementation scopes. - cmmn=new common_method_node(name,def_loc,_ctn,SemanticTree.polymorphic_state.ps_common,_fal,scope); - _last_created_function=new SymbolInfo(cmmn); - _ctn.Scope.AddSymbol(name,_last_created_function); - _ctn.methods.AddElement(cmmn); - - local_variable lv = new local_variable(compiler_string_consts.self_word, _ctn, cmmn, def_loc); - cmmn.scope.AddSymbol(compiler_string_consts.self_word, new SymbolInfo(lv)); - cmmn.self_variable = lv; - cmmn.var_definition_nodes_list.AddElement(lv); - - cfn=cmmn; - break; - } - case block_type.namespace_block: - { - common_namespace_function_node cnfnn; - SymbolTable.Scope scope = convertion_data_and_alghoritms.symbol_table.CreateScope(_cmn.scope); - cnfnn=new common_namespace_function_node(name,def_loc,_cmn,scope); - _cmn.functions.AddElement(cnfnn); - _last_created_function=new SymbolInfo(cnfnn); - _cmn.scope.AddSymbol(name,_last_created_function); - cfn=cnfnn; - break; - } - } - _func_stack.push(cfn); - return cfn; - } - - public common_type_node create_type(string name,location def_loc) - { - check_name_free(name,def_loc); - if (converting_block()!=block_type.namespace_block) - { - throw new TypeCanNotBeDefinedInTypeOrFunction(name,def_loc); - } - SymbolTable.ClassScope scope = convertion_data_and_alghoritms.symbol_table.CreateClassScope(_cmn.scope,null); - common_type_node tctn=new common_type_node(name,SemanticTree.type_access_level.tal_public,_cmn, - scope,def_loc); - set_field_access_level(SemanticTree.field_access_level.fal_public); - _cmn.scope.AddSymbol(name,new SymbolInfo(tctn)); - - //_cmn.types.AddElement(tctn); - _ctn=tctn; - SystemLibrary.SystemLibrary.init_reference_type(tctn); - return tctn; - } - - /****************************modified***********************/ - private int rec_num=0; - - public common_type_node create_record_type(location def_loc) - { - SymbolTable.ClassScope scope = convertion_data_and_alghoritms.symbol_table.CreateClassScope(_cmn.scope, null); - string name = "$record$" + rec_num++; - common_type_node tctn = new common_type_node(name, SemanticTree.type_access_level.tal_public, _cmn, - scope, def_loc); - set_field_access_level(SemanticTree.field_access_level.fal_public); - //_cmn.scope.AddSymbol(name, new SymbolInfo(tctn)); - tctn.SetBaseType(compiled_type_node.get_type_node(typeof(ValueType))); - //_cmn.types.AddElement(tctn); - if (_ctn != null) type_stack.Push(_ctn); - _ctn = tctn; - SystemLibrary.SystemLibrary.init_reference_type(tctn); - return tctn; - } - - public void save_var_definitions() - { - var_defs_stack.Push(var_defs); - var_defs = new System.Collections.Generic.List(); - } - - public void restore_var_definitions() - { - var_defs = var_defs_stack.Pop(); - } - - public string BuildName(string name) - { - if (converting_block() == block_type.function_block) - { - return name + "$" + rec_num++; - } - else - { - return name; - } - } - /*************************************************************/ - - public var_definition_node add_var_definition(string name,location loc) - { - check_name_free(name,loc); - var_definition_node vdn=null; - switch (converting_block()) - { - case block_type.function_block: - { - common_function_node top_func = _func_stack.top(); - local_variable lv=new local_variable(name,top_func,loc); - vdn=lv; - top_func.var_definition_nodes_list.AddElement(lv); - top_func.scope.AddSymbol(name,new SymbolInfo(lv)); - var_defs.Add(vdn); - break; - } - case block_type.type_block: - { - //TODO:сделать static и virtual. - class_field cf = new class_field(name, _ctn, SemanticTree.polymorphic_state.ps_common,_fal,loc); - vdn=cf; - _ctn.Scope.AddSymbol(name,new SymbolInfo(cf)); - _ctn.fields.AddElement(cf); - var_defs.Add(vdn); - break; - } - case block_type.namespace_block: - { - namespace_variable nsv=new namespace_variable(name,_cmn,loc); - vdn=nsv; - _cmn.scope.AddSymbol(name,new SymbolInfo(nsv)); - _cmn.variables.AddElement(nsv); - var_defs.Add(vdn); - break; - } - } - return vdn; - } - - private int num_of_for_cycles - { - get - { - switch (converting_block()) - { - case block_type.function_block: - { - return top_function.num_of_for_cycles; - } - case block_type.namespace_block: - { - return _num_of_for_cycles; - } - case block_type.type_block: - { - throw new CompilerInternalError("For cycle in class body"); - } - } - throw new CompilerInternalError("Invalid block type"); - } - set - { - switch (converting_block()) - { - case block_type.function_block: - { - top_function.num_of_for_cycles=value; - break; - } - case block_type.namespace_block: - { - //TODO: Переделать. Число циклов не должно хранится в функции. - _num_of_for_cycles=value; - break; - } - case block_type.type_block: - { - throw new CompilerInternalError("For cycle in class body"); - } - } - } - } - - private int get_and_postinc_num_of_for_cycles() - { - int temp = _num_of_for_cycles; - _num_of_for_cycles++; - return temp; - } - - public string get_delegate_type_name() - { - return (compiler_string_consts.delegate_type_name_template+get_and_postinc_num_of_for_cycles()); - } - - public var_definition_node create_for_temp_variable(type_node type,location loc) - { - num_of_for_cycles=num_of_for_cycles+1; - string name=compiler_string_consts.temp_for_variable_name+num_of_for_cycles.ToString(); - return create_temp_variable(name,type,loc); - } - - public var_definition_node create_temp_variable(string name,type_node type,location loc) - { - var_definition_node vdn=null; - switch (converting_block()) - { - case block_type.function_block: - { - common_function_node top_func = _func_stack.top(); - local_variable lv=new local_variable(name,type,top_func,loc); - vdn=lv; - top_func.var_definition_nodes_list.AddElement(lv); - break; - } - case block_type.type_block: - { - //TODO:сделать static и virtual. - class_field cf=new class_field(name,type,_ctn,SemanticTree.polymorphic_state.ps_common,_fal,loc); - vdn=cf; - _ctn.fields.AddElement(cf); - break; - } - case block_type.namespace_block: - { - namespace_variable nsv=new namespace_variable(name,type,_cmn,loc); - vdn=nsv; - _cmn.variables.AddElement(nsv); - break; - } - } - return vdn; - } - - public common_parameter add_parameter(string name,SemanticTree.parameter_type pt, - concrete_parameter_type cpt,location loc) - { - check_name_free(name,loc); -#if (DEBUG) - if (converting_block()!=block_type.function_block) - { - throw new CompilerInternalError("Parameters can be defined with functions only"); - } -#endif - common_function_node top_func = _func_stack.top(); - common_parameter cp=new common_parameter(name,pt,top_func,cpt,loc); - top_func.parameters.AddElement(cp); - top_func.scope.AddSymbol(name,new SymbolInfo(cp)); - var_defs.Add(cp); - return cp; - } - - public constant_definition_node add_const_definition(string name,location loc) - { - constant_definition_node cdn=null; - //cdn.loc=loc; - switch (converting_block()) - { - case block_type.function_block: - { - common_function_node top_func = _func_stack.top(); - function_constant_definition fcd = new function_constant_definition(name, loc, top_func); - top_func.scope.AddSymbol(name,new SymbolInfo(fcd)); - top_func.constants.AddElement(fcd); - cdn = fcd; - break; - } - case block_type.type_block: - { - class_constant_definition ccd = new class_constant_definition(name, loc, _ctn); - _ctn.Scope.AddSymbol(name,new SymbolInfo(ccd)); - _ctn.const_defs.AddElement(ccd); - cdn = ccd; - break; - } - case block_type.namespace_block: - { - namespace_constant_definition ncd = new namespace_constant_definition(name, loc, _cmn); - _cmn.scope.AddSymbol(name,new SymbolInfo(ncd)); - _cmn.constants.AddElement(ncd); - cdn = ncd; - break; - } - } - return cdn; - } - - public void make_constructor() - { -#if (DEBUG) - if (converting_block()!=block_type.function_block) - { - throw new CompilerInternalError("Create constructor call without function"); - } - if (_func_stack.top().node_location_kind!=SemanticTree.node_location_kind.in_class_location) - { - throw new CompilerInternalError("Create constructor applied to non class method"); - } -#endif - common_function_node top_func=_func_stack.top(); - - top_func.return_value_type=_ctn; - - common_method_node top_method=(common_method_node)top_func; - - common_method_node cmn=new common_method_node(top_func.name,_ctn,top_method.loc,_ctn, - SemanticTree.polymorphic_state.ps_static,_fal,top_func.scope); - cmn.is_constructor=true; - cmn.is_overload=top_function.is_overload; - - //parameter_list pl = new parameter_list(); - foreach (common_parameter pr in top_method.parameters) - { - common_parameter new_par = new common_parameter(pr.name, pr.type, pr.parameter_type, cmn, pr.concrete_parameter_type, - pr.default_value, pr.loc); - cmn.parameters.AddElement(new_par); - } - //cmn.parameters.AddRange(top_method.parameters); - - statements_list stl=new statements_list(top_func.loc); - cmn.function_code=stl; - this_node thn=new this_node(_ctn,top_func.loc); - common_method_call csmc=new common_method_call(top_method,thn,top_func.loc); - foreach(common_parameter cp in cmn.parameters) - { - common_parameter_reference cpr=new common_parameter_reference(cp,0,top_func.loc); - csmc.parametres.AddElement(cpr); - } - stl.statements.AddElement(csmc); - _ctn.methods.AddElement(cmn); - - top_method.pascal_associated_constructor=cmn; - } - - public void close_var_definition_list(type_node tp) - { - if (var_defs.Count==0) - { - return; - } - foreach(var_definition_node vdn in var_defs) - { - vdn.type=tp; - } - var_defs.Clear(); - } - - public SymbolInfo find(string name) - { - switch (converting_block()) - { - case block_type.function_block: - { - return _func_stack.top().find(name); - } - case block_type.type_block: - { - return _ctn.find(name); - } - case block_type.namespace_block: - { - return _cmn.find(name); - } - } - return null; - } - - public SymbolInfo find_only_in_namespace(string name) - { - switch (converting_block()) - { - case block_type.function_block: - { - return _func_stack.top().find_only_in_namespace(name); - } - case block_type.type_block: - { - return _ctn.Scope.FindOnlyInScope(name); - } - case block_type.namespace_block: - { - return _cmn.scope.FindOnlyInScope(name); - } - } - return null; - } - - public void leave_interface_part() - { - _cmn = null; - } - - public void check_all_name_unit_defined(common_unit_node cmn) - { - common_namespace_node cfn = cmn.namespaces[0]; - foreach (common_namespace_function_node cnfn in cfn.functions) - { - if (cnfn.function_code == null) - { - throw new FunctionPredefinitionWithoutDefinition(cnfn); - } - } - } - - public void leave_block() - { - switch (converting_block()) - { - case block_type.function_block: - { - common_function_node top_func = _func_stack.top(); - location loc; - if (top_func.function_code == null) - { - loc = top_func.loc; - } - else if ((top_func.function_code as statements_list) != null) - { - statements_list stl = (statements_list)top_func.function_code; - if (stl.statements.Count > 0) - { - loc = stl.statements[stl.statements.Count - 1].location; - } - else - { - loc = top_func.loc; - } - } - else - { - loc = top_func.function_code.location; - } - if (top_func.function_code != null) - { - if (top_func.return_variable != null) - { - //TODO: Обратить внимание на преобразования типов. Можно сделать метод, который если тело функции не statement создает список statement-ов и добавляет в него существующий statement. - statements_list stl = (statements_list)top_func.function_code; - local_variable_reference lvr = new local_variable_reference(top_func.return_variable, 0, loc); - stl.statements.AddElement(new return_node(lvr, loc)); - } - else if ((top_func.return_value_type != null) && (_ctn != null)) - { - //TODO: Обратить внимание на преобразования типов. Можно сделать метод, который если тело функции не statement создает список statement-ов и добавляет в него существующий statement. - statements_list stl = (statements_list)top_func.function_code; - this_node thn = new this_node(_ctn, loc); - stl.statements.AddElement(new return_node(thn, loc)); - } - } - check_predefinition_defined(); - _func_stack.pop(); - break; - } - case block_type.type_block: - { - //TODO: Может и сюда вставить check_predefinition_defined, несмотря на то, что в данный момент он ничего не делает. - _cmn.types.AddElement(_ctn); - _ctn=null; - break; - } - case block_type.namespace_block: - { - check_predefinition_defined(); - _cmn=null; - break; - } - } - } - - public SymbolInfo last_created_function - { - get - { - return _last_created_function; - } - } - - public void close_function_params(bool body_exists) - { - if (body_exists) - { - close_function_params_with_body(); - } - else - { - close_function_params_without_body(); - } - } - - private void close_function_params_without_body() - { - check_function_not_exists(_func_stack.top()); - } - - private void close_function_params_with_body() - { - check_unique_or_predefined(_func_stack.top()); - } - - public void check_name_free(string name,SemanticTree.ILocation name_loc) - { - SymbolInfo si=find_only_in_namespace(name); - if (si==null) - { - return; - } - SemanticTree.ILocation first_loc=convertion_data_and_alghoritms.get_location(si.sym_info); - //TODO: Можно передавать список всех повторных объявлений. - throw new NameRedefinition(first_loc,name_loc); - } - - private bool is_predefinition(common_function_node predef, common_function_node def, bool error_on_false) - { - if (convertion_data_and_alghoritms.function_eq_params(predef,def)) - { - for(int param_num=0;param_num - ///Collection of unit_node - /// - [Serializable] - public class unit_nodeArrayList : System.Collections.IEnumerable,System.Collections.ICollection,System.ICloneable - { - - private System.Collections.ArrayList arr=new System.Collections.ArrayList(); - - /// - ///Adds an unit_node to the end of the unit_nodeArrayList. - /// - ///The unit_node to be added to the end of the ArrayList. The value can be a null reference. - ///The unit_nodeArrayList index at which the value has been added. - public int Add(unit_node value) - { - return arr.Add(value); - } - - /// - ///Adds the elements of an ICollection to the end of the unit_nodeArrayList - /// - ///The ICollection whose elements should be added to the end of the ArrayList. The collection itself cannot be a null reference (Nothing in Visual Basic), but it can contain elements that are a null reference. - ///Return value is void - private void AddRange(System.Collections.ICollection c) - { - arr.AddRange(c); - } - - /// - ///Adds the elements of an unit_node[] to the end of the unit_nodeArrayList - /// - ///The unit_node[] whose elements should be added to the end of the ArrayList. The unit_node[] itself cannot be a null reference, but it can contain elements that are a null reference. - ///Return value is void - public void AddRange(unit_node[] array) - { - arr.AddRange(array); - } - - /// - ///Adds the elements of an unit_nodeArrayList to the end of the unit_nodeArrayList - /// - ///The unit_nodeArrayList whose elements should be added to the end of the ArrayList. The unit_nodeArrayList itself cannot be a null reference, but it can contain elements that are a null reference. - ///Return value is void - public void AddRange(unit_nodeArrayList array_list) - { - arr.AddRange(array_list); - } - - /// - ///Uses a binary search algorithm to locate a specific element in the sorted unit_nodeArrayList or a portion of it. - /// - ///The Object to locate. The value can be a null reference. - ///The zero-based index of value in the sorted unit_nodeArrayList, if value is found; otherwise, a negative number, which is the bitwise complement of the index of the next element that is larger than value or, if there is no larger element, the bitwise complement of Count. - public int BinarySearch(unit_node value) - { - return arr.BinarySearch(value); - } - - /// - ///Searches the entire sorted ArrayList for an element using the specified comparer and returns the zero-based index of the element. - /// - ///The Object to locate. The value can be a null reference. - ///The IComparer implementation to use when comparing elements. -or- A null reference (Nothing in Visual Basic) to use the default comparer that is the IComparable implementation of each element. - ///The zero-based index of value in the sorted unit_nodeArrayList, if value is found; otherwise, a negative number, which is the bitwise complement of the index of the next element that is larger than value or, if there is no larger element, the bitwise complement of Count. - public void BinarySearch(unit_node value,System.Collections.IComparer comparer) - { - arr.BinarySearch(value,comparer); - } - - /// - ///Searches the entire sorted ArrayList for an element using the specified comparer and returns the zero-based index of the element. - /// - ///The zero-based starting index of the range to search. - ///The length of the range to search. - ///The Object to locate. The value can be a null reference. - ///The IComparer implementation to use when comparing elements. -or- A null reference (Nothing in Visual Basic) to use the default comparer that is the IComparable implementation of each element. - ///The zero-based index of value in the sorted unit_nodeArrayList, if value is found; otherwise, a negative number, which is the bitwise complement of the index of the next element that is larger than value or, if there is no larger element, the bitwise complement of Count. - public void BinarySearch(int index,int count,unit_node value,System.Collections.IComparer comparer) - { - arr.BinarySearch(value,comparer); - } - - /// - ///Creates a shallow copy of the ArrayList. - /// - ///A shallow copy of the unit_nodeArrayList. - public virtual unit_nodeArrayList clone() - { - unit_nodeArrayList al=new unit_nodeArrayList(); - al.arr=(System.Collections.ArrayList)this.arr.Clone(); - return al; - } - - /// - ///Creates a shallow copy of the ArrayList. - /// - ///A shallow copy of the unit_nodeArrayList. - public virtual object Clone() - { - return this.clone(); - } - - /// - ///Determines whether an element is in the unit_nodeArrayList. - /// - ///The unit_node to locate in the ArrayList. The value can be a null reference. - ///true if item is found in the unit_nodeArrayList; otherwise, false. - public bool Contains(unit_node item) - { - return arr.Contains(item); - } - - /// - ///Searches for the specified unit_node and returns the zero-based index of the first occurrence within the entire unit_nodeArrayList. - /// - ///The unit_node to locate in the unit_nodeArrayList. The value can be a null reference. - ///The zero-based index of the first occurrence of value within the entire unit_nodeArrayList, if found; otherwise, -1. - public int IndexOf(unit_node value) - { - return arr.IndexOf(value); - } - - /// - ///Searches for the specified unit_node and returns the zero-based index of the first occurrence within the section of the unit_nodeArrayList that extends from the specified index to the last element. - /// - ///The unit_node to locate in the unit_nodeArrayList. The value can be a null reference. - ///The zero-based starting index of the search. - ///The zero-based index of the first occurrence of value within the section of the unit_nodeArrayList that extends from startIndex to the last element, if found; otherwise, -1. - public int IndexOf(unit_node value,int startIndex) - { - return arr.IndexOf(value,startIndex); - } - - /// - ///Searches for the specified unit_node and returns the zero-based index of the first occurrence within the section of the unit_nodeArrayList that starts at the specified index and contains the specified number of elements. - /// - ///The unit_node to locate in the unit_nodeArrayList. The value can be a null reference. - ///The zero-based starting index of the search. - ///The number of elements in the section to search. - ///The zero-based index of the first occurrence of value within the section of the ArrayList that starts at startIndex and contains count number of elements, if found; otherwise, -1. - public int IndexOf(unit_node value,int startIndex,int count) - { - return arr.IndexOf(value,startIndex,count); - } - - /// - ///Inserts an element into the unit_nodeArrayList at the specified index. - /// - ///The zero-based index at which value should be inserted. - ///The unit_node to insert. The value can be a null reference. - ///Return value is void - public void Insert(int index,unit_node value) - { - arr.Insert(index,value); - } - - /// - ///Inserts the elements of a unit_node into the unit_nodeArrayList at the specified index. - /// - ///The zero-based index at which the new elements should be inserted. - ///The unit_node[] whose elements should be inserted into the unit_nodeArrayList. The unit_node[] itself cannot be a null reference, but it can contain elements that are a null reference. - ///Return value is void - public void InsertRange(int index,unit_node[] unit_node_arr) - { - arr.InsertRange(index,arr); - } - - /// - ///Inserts the elements of a collection into the unit_nodeArrayList at the specified index. - /// - ///The zero-based index at which the new elements should be inserted. - ///The unit_nodeArrayList whose elements should be inserted into the unit_nodeArrayList. The unit_nodeArrayList itself cannot be a null reference, but it can contain elements that are a null reference. - ///Return value is void - public void InsertRange(int index,unit_nodeArrayList array_list) - { - arr.InsertRange(index,array_list); - } - - /// - ///Inserts the elements of a collection into the unit_nodeArrayList at the specified index. - /// - ///The zero-based index at which the new elements should be inserted. - ///The ICollection whose elements should be inserted into the unit_nodeArrayList. The collection itself cannot be a null reference, but it can contain elements that are a null reference. - ///Return value is void - private void InsertRange(int index,System.Collections.ICollection c) - { - arr.InsertRange(index,c); - } - - /// - ///Searches for the specified unit_node and returns the zero-based index of the last occurrence within the entire unit_nodeArrayList. - /// - ///The unit_node to locate in the unit_nodeArrayList. The value can be a null reference. - ///The zero-based index of the last occurrence of value within the entire the ArrayList, if found; otherwise, -1. - public int LastIndexOf(unit_node value) - { - return arr.LastIndexOf(value); - } - - /// - ///Searches for the specified unit_node and returns the zero-based index of the last occurrence within the section of the unit_nodeArrayList that extends from the first element to the specified index. - /// - ///The unit_node to locate in the unit_nodeArrayList. The value can be a null reference. - ///The zero-based starting index of the backward search. - ///The zero-based index of the last occurrence of value within the section of the unit_nodeArrayList that extends from the first element to startIndex, if found; otherwise, -1. - public int LastIndexOf(unit_node value,int startIndex) - { - return arr.LastIndexOf(value,startIndex); - } - - /// - ///Searches for the specified unit_node and returns the zero-based index of the last occurrence within the section of the unit_nodeArrayList that contains the specified number of elements and ends at the specified index. - /// - ///The unit_node to locate in the unit_nodeArrayList. The value can be a null reference. - ///The zero-based starting index of the backward search. - ///The number of elements in the section to search. - ///The zero-based index of the last occurrence of value within the section of the unit_nodeArrayList that extends from the first element to startIndex, if found; otherwise, -1. - public int LastIndexOf(unit_node value,int startIndex,int count) - { - return arr.LastIndexOf(value,startIndex,count); - } - - /// - ///Gets or sets the element at the specified index. - /// - ///The zero-based index of the element to get or set. - public unit_node this [int index] - { - get - { - return ((unit_node)(arr[index])); - } - set - { - arr[index]=value; - } - } - - /// - ///Removes the first occurrence of a specific object from the ArrayList. - /// - ///The unit_node to remove from the ArrayList. The value can be a null reference. - ///Return value is void - public void Remove(unit_node value) - { - arr.Remove(value); - } - - /// - ///Copies the elements of a collection over a range of elements in the unit_nodeArrayList. - /// - ///The zero-based unit_nodeArrayList index at which to start copying the elements of c. - ///The ICollection whose elements to copy to the ArrayList. The collection itself cannot be a null reference (Nothing in Visual Basic), but it can contain elements that are a null reference. - ///Return value is void - private void SetRange(int index,System.Collections.ICollection c) - { - arr.SetRange(index,c); - } - - /// - ///Copies the elements of the unit_nodeArrayList to a new unit_node array. - /// - ///An unit_node array containing copies of the elements of the unit_nodeArrayList. - public unit_node[] ToArray() - { - return ((unit_node[])(arr.ToArray(typeof(unit_node)))); - } - - /// - ///Gets the number of elements actually contained in the ArrayList. - /// - public int Count - { - get - { - return arr.Count; - } - } - - /// - ///Copies the entire ArrayList to a compatible one-dimensional Array, starting at the specified index of the target array. - /// - ///The one-dimensional Array that is the destination of the elements copied from unit_nodeArrayList. The Array must have zero-based indexing. - ///The zero-based index in array at which copying begins. - ///Return value is void - public void CopyTo(System.Array array,int arrayIndex) - { - arr.CopyTo(array,arrayIndex); - } - - /// - ///Copies the entire ArrayList to a compatible one-dimensional unit_node[], starting at the specified index of the target array. - /// - ///The one-dimensional unit_node[] that is the destination of the elements copied from unit_nodeArrayList. The Array must have zero-based indexing. - ///The zero-based index in array at which copying begins. - ///Return value is void - public void CopyTo(unit_node[] array,int arrayIndex) - { - arr.CopyTo(array,arrayIndex); - } - - /// - ///Copies the entire unit_nodeArrayList to a compatible one-dimensional unit_node[], starting at the beginning of the target array. - /// - ///The one-dimensional unit_node[] that is the destination of the elements copied from unit_nodeArrayList. The Array must have zero-based indexing. - ///Return value is void - public void CopyTo(unit_node[] array) - { - arr.CopyTo(array); - } - - /// - ///Copies the entire ArrayList to a compatible one-dimensional unit_node[], starting at the specified index of the target array. - /// - ///The zero-based index in the source ArrayList at which copying begins. - ///The one-dimensional unit_node[] that is the destination of the elements copied from unit_nodeArrayList. The Array must have zero-based indexing. - ///The zero-based index in array at which copying begins. - ///The number of elements to copy. - ///Return value is void - public void CopyTo(int index,unit_node[] array,int arrayIndex,int count) - { - arr.CopyTo(index,array,arrayIndex,count); - } - - /// - ///Gets a value indicating whether access to the ArrayList is synchronized (thread-safe). - /// - public bool IsSynchronized - { - get - { - return arr.IsSynchronized; - } - } - - /// - ///Gets a value indicating whether the ArrayList has a fixed size. - /// - public bool IsFixedSize - { - get - { - return arr.IsFixedSize; - } - } - - /// - ///Gets a value indicating whether the ArrayList is read-only. - /// - public bool IsReadOnly - { - get - { - return arr.IsReadOnly; - } - } - - /// - ///Gets an object that can be used to synchronize access to the ArrayList. - /// - public object SyncRoot - { - get - { - return arr.SyncRoot; - } - } - - /// - ///Returns an enumerator for the entire ArrayList. - /// - ///An IEnumerator for the entire unit_nodeArrayList. - public System.Collections.IEnumerator GetEnumerator() - { - return arr.GetEnumerator(); - } - - /// - ///Removes all elements from the ArrayList. - /// - ///Return value is void - public void Clear() - { - arr.Clear(); - } - - public int Capacity - { - get - { - return arr.Capacity; - } - set - { - arr.Capacity=value; - } - } - - public unit_nodeArrayList GetRange(int index,int count) - { - System.Collections.ArrayList al=arr.GetRange(index,count); - unit_nodeArrayList tnal=new unit_nodeArrayList(); - tnal.arr=al; - return tnal; - } - - public void RemoveAt(int index) - { - arr.RemoveAt(index); - } - - public void RemoveRange(int index,int count) - { - arr.RemoveRange(index,count); - } - - public void Reverse() - { - arr.Reverse(); - } - - public void Reverse(int index,int count) - { - arr.Reverse(index,count); - } - - public void SetRange(int index,unit_node[] tnarr) - { - SetRange(index,tnarr); - } - - public void SetRange(int index,unit_nodeArrayList tnarl) - { - SetRange(index,tnarl); - } - - public void TrimToSize() - { - arr.TrimToSize(); - } - - } - -} \ No newline at end of file diff --git a/TreeConverter/TreeConversion/using_namespaceArrayList.cs b/TreeConverter/TreeConversion/using_namespaceArrayList.cs deleted file mode 100644 index 1ef8e229b..000000000 --- a/TreeConverter/TreeConversion/using_namespaceArrayList.cs +++ /dev/null @@ -1,453 +0,0 @@ -using System; - -using PascalABCCompiler.TreeRealization; - -namespace PascalABCCompiler.TreeConverter -{ - - //TODO: Переделать с использованием коллекций. - /// - ///Collection of using_namespace - /// - [Serializable] - public class using_namespaceArrayList : System.Collections.IEnumerable,System.Collections.ICollection,System.ICloneable - { - - private System.Collections.ArrayList arr=new System.Collections.ArrayList(); - - /// - ///Adds an using_namespace to the end of the using_namespaceArrayList. - /// - ///The using_namespace to be added to the end of the ArrayList. The value can be a null reference. - ///The using_namespaceArrayList index at which the value has been added. - public int Add(using_namespace value) - { - return arr.Add(value); - } - - /// - ///Adds the elements of an ICollection to the end of the using_namespaceArrayList - /// - ///The ICollection whose elements should be added to the end of the ArrayList. The collection itself cannot be a null reference (Nothing in Visual Basic), but it can contain elements that are a null reference. - ///Return value is void - private void AddRange(System.Collections.ICollection c) - { - arr.AddRange(c); - } - - /// - ///Adds the elements of an using_namespace[] to the end of the using_namespaceArrayList - /// - ///The using_namespace[] whose elements should be added to the end of the ArrayList. The using_namespace[] itself cannot be a null reference, but it can contain elements that are a null reference. - ///Return value is void - public void AddRange(using_namespace[] array) - { - arr.AddRange(array); - } - - /// - ///Adds the elements of an using_namespaceArrayList to the end of the using_namespaceArrayList - /// - ///The using_namespaceArrayList whose elements should be added to the end of the ArrayList. The using_namespaceArrayList itself cannot be a null reference, but it can contain elements that are a null reference. - ///Return value is void - public void AddRange(using_namespaceArrayList array_list) - { - arr.AddRange(array_list); - } - - /// - ///Uses a binary search algorithm to locate a specific element in the sorted using_namespaceArrayList or a portion of it. - /// - ///The Object to locate. The value can be a null reference. - ///The zero-based index of value in the sorted using_namespaceArrayList, if value is found; otherwise, a negative number, which is the bitwise complement of the index of the next element that is larger than value or, if there is no larger element, the bitwise complement of Count. - public int BinarySearch(using_namespace value) - { - return arr.BinarySearch(value); - } - - /// - ///Searches the entire sorted ArrayList for an element using the specified comparer and returns the zero-based index of the element. - /// - ///The Object to locate. The value can be a null reference. - ///The IComparer implementation to use when comparing elements. -or- A null reference (Nothing in Visual Basic) to use the default comparer that is the IComparable implementation of each element. - ///The zero-based index of value in the sorted using_namespaceArrayList, if value is found; otherwise, a negative number, which is the bitwise complement of the index of the next element that is larger than value or, if there is no larger element, the bitwise complement of Count. - public void BinarySearch(using_namespace value,System.Collections.IComparer comparer) - { - arr.BinarySearch(value,comparer); - } - - /// - ///Searches the entire sorted ArrayList for an element using the specified comparer and returns the zero-based index of the element. - /// - ///The zero-based starting index of the range to search. - ///The length of the range to search. - ///The Object to locate. The value can be a null reference. - ///The IComparer implementation to use when comparing elements. -or- A null reference (Nothing in Visual Basic) to use the default comparer that is the IComparable implementation of each element. - ///The zero-based index of value in the sorted using_namespaceArrayList, if value is found; otherwise, a negative number, which is the bitwise complement of the index of the next element that is larger than value or, if there is no larger element, the bitwise complement of Count. - public void BinarySearch(int index,int count,using_namespace value,System.Collections.IComparer comparer) - { - arr.BinarySearch(value,comparer); - } - - /// - ///Creates a shallow copy of the ArrayList. - /// - ///A shallow copy of the using_namespaceArrayList. - public virtual using_namespaceArrayList clone() - { - using_namespaceArrayList al=new using_namespaceArrayList(); - al.arr=(System.Collections.ArrayList)this.arr.Clone(); - return al; - } - - /// - ///Creates a shallow copy of the ArrayList. - /// - ///A shallow copy of the using_namespaceArrayList. - public virtual object Clone() - { - return this.clone(); - } - - /// - ///Determines whether an element is in the using_namespaceArrayList. - /// - ///The using_namespace to locate in the ArrayList. The value can be a null reference. - ///true if item is found in the using_namespaceArrayList; otherwise, false. - public bool Contains(using_namespace item) - { - return arr.Contains(item); - } - - /// - ///Searches for the specified using_namespace and returns the zero-based index of the first occurrence within the entire using_namespaceArrayList. - /// - ///The using_namespace to locate in the using_namespaceArrayList. The value can be a null reference. - ///The zero-based index of the first occurrence of value within the entire using_namespaceArrayList, if found; otherwise, -1. - public int IndexOf(using_namespace value) - { - return arr.IndexOf(value); - } - - /// - ///Searches for the specified using_namespace and returns the zero-based index of the first occurrence within the section of the using_namespaceArrayList that extends from the specified index to the last element. - /// - ///The using_namespace to locate in the using_namespaceArrayList. The value can be a null reference. - ///The zero-based starting index of the search. - ///The zero-based index of the first occurrence of value within the section of the using_namespaceArrayList that extends from startIndex to the last element, if found; otherwise, -1. - public int IndexOf(using_namespace value,int startIndex) - { - return arr.IndexOf(value,startIndex); - } - - /// - ///Searches for the specified using_namespace and returns the zero-based index of the first occurrence within the section of the using_namespaceArrayList that starts at the specified index and contains the specified number of elements. - /// - ///The using_namespace to locate in the using_namespaceArrayList. The value can be a null reference. - ///The zero-based starting index of the search. - ///The number of elements in the section to search. - ///The zero-based index of the first occurrence of value within the section of the ArrayList that starts at startIndex and contains count number of elements, if found; otherwise, -1. - public int IndexOf(using_namespace value,int startIndex,int count) - { - return arr.IndexOf(value,startIndex,count); - } - - /// - ///Inserts an element into the using_namespaceArrayList at the specified index. - /// - ///The zero-based index at which value should be inserted. - ///The using_namespace to insert. The value can be a null reference. - ///Return value is void - public void Insert(int index,using_namespace value) - { - arr.Insert(index,value); - } - - /// - ///Inserts the elements of a using_namespace into the using_namespaceArrayList at the specified index. - /// - ///The zero-based index at which the new elements should be inserted. - ///The using_namespace[] whose elements should be inserted into the using_namespaceArrayList. The using_namespace[] itself cannot be a null reference, but it can contain elements that are a null reference. - ///Return value is void - public void InsertRange(int index,using_namespace[] using_namespace_arr) - { - arr.InsertRange(index,arr); - } - - /// - ///Inserts the elements of a collection into the using_namespaceArrayList at the specified index. - /// - ///The zero-based index at which the new elements should be inserted. - ///The using_namespaceArrayList whose elements should be inserted into the using_namespaceArrayList. The using_namespaceArrayList itself cannot be a null reference, but it can contain elements that are a null reference. - ///Return value is void - public void InsertRange(int index,using_namespaceArrayList array_list) - { - arr.InsertRange(index,array_list); - } - - /// - ///Inserts the elements of a collection into the using_namespaceArrayList at the specified index. - /// - ///The zero-based index at which the new elements should be inserted. - ///The ICollection whose elements should be inserted into the using_namespaceArrayList. The collection itself cannot be a null reference, but it can contain elements that are a null reference. - ///Return value is void - private void InsertRange(int index,System.Collections.ICollection c) - { - arr.InsertRange(index,c); - } - - /// - ///Searches for the specified using_namespace and returns the zero-based index of the last occurrence within the entire using_namespaceArrayList. - /// - ///The using_namespace to locate in the using_namespaceArrayList. The value can be a null reference. - ///The zero-based index of the last occurrence of value within the entire the ArrayList, if found; otherwise, -1. - public int LastIndexOf(using_namespace value) - { - return arr.LastIndexOf(value); - } - - /// - ///Searches for the specified using_namespace and returns the zero-based index of the last occurrence within the section of the using_namespaceArrayList that extends from the first element to the specified index. - /// - ///The using_namespace to locate in the using_namespaceArrayList. The value can be a null reference. - ///The zero-based starting index of the backward search. - ///The zero-based index of the last occurrence of value within the section of the using_namespaceArrayList that extends from the first element to startIndex, if found; otherwise, -1. - public int LastIndexOf(using_namespace value,int startIndex) - { - return arr.LastIndexOf(value,startIndex); - } - - /// - ///Searches for the specified using_namespace and returns the zero-based index of the last occurrence within the section of the using_namespaceArrayList that contains the specified number of elements and ends at the specified index. - /// - ///The using_namespace to locate in the using_namespaceArrayList. The value can be a null reference. - ///The zero-based starting index of the backward search. - ///The number of elements in the section to search. - ///The zero-based index of the last occurrence of value within the section of the using_namespaceArrayList that extends from the first element to startIndex, if found; otherwise, -1. - public int LastIndexOf(using_namespace value,int startIndex,int count) - { - return arr.LastIndexOf(value,startIndex,count); - } - - /// - ///Gets or sets the element at the specified index. - /// - ///The zero-based index of the element to get or set. - public using_namespace this [int index] - { - get - { - return ((using_namespace)(arr[index])); - } - set - { - arr[index]=value; - } - } - - /// - ///Removes the first occurrence of a specific object from the ArrayList. - /// - ///The using_namespace to remove from the ArrayList. The value can be a null reference. - ///Return value is void - public void Remove(using_namespace value) - { - arr.Remove(value); - } - - /// - ///Copies the elements of a collection over a range of elements in the using_namespaceArrayList. - /// - ///The zero-based using_namespaceArrayList index at which to start copying the elements of c. - ///The ICollection whose elements to copy to the ArrayList. The collection itself cannot be a null reference (Nothing in Visual Basic), but it can contain elements that are a null reference. - ///Return value is void - private void SetRange(int index,System.Collections.ICollection c) - { - arr.SetRange(index,c); - } - - /// - ///Copies the elements of the using_namespaceArrayList to a new using_namespace array. - /// - ///An using_namespace array containing copies of the elements of the using_namespaceArrayList. - public using_namespace[] ToArray() - { - return ((using_namespace[])(arr.ToArray(typeof(using_namespace)))); - } - - /// - ///Gets the number of elements actually contained in the ArrayList. - /// - public int Count - { - get - { - return arr.Count; - } - } - - /// - ///Copies the entire ArrayList to a compatible one-dimensional Array, starting at the specified index of the target array. - /// - ///The one-dimensional Array that is the destination of the elements copied from using_namespaceArrayList. The Array must have zero-based indexing. - ///The zero-based index in array at which copying begins. - ///Return value is void - public void CopyTo(System.Array array,int arrayIndex) - { - arr.CopyTo(array,arrayIndex); - } - - /// - ///Copies the entire ArrayList to a compatible one-dimensional using_namespace[], starting at the specified index of the target array. - /// - ///The one-dimensional using_namespace[] that is the destination of the elements copied from using_namespaceArrayList. The Array must have zero-based indexing. - ///The zero-based index in array at which copying begins. - ///Return value is void - public void CopyTo(using_namespace[] array,int arrayIndex) - { - arr.CopyTo(array,arrayIndex); - } - - /// - ///Copies the entire using_namespaceArrayList to a compatible one-dimensional using_namespace[], starting at the beginning of the target array. - /// - ///The one-dimensional using_namespace[] that is the destination of the elements copied from using_namespaceArrayList. The Array must have zero-based indexing. - ///Return value is void - public void CopyTo(using_namespace[] array) - { - arr.CopyTo(array); - } - - /// - ///Copies the entire ArrayList to a compatible one-dimensional using_namespace[], starting at the specified index of the target array. - /// - ///The zero-based index in the source ArrayList at which copying begins. - ///The one-dimensional using_namespace[] that is the destination of the elements copied from using_namespaceArrayList. The Array must have zero-based indexing. - ///The zero-based index in array at which copying begins. - ///The number of elements to copy. - ///Return value is void - public void CopyTo(int index,using_namespace[] array,int arrayIndex,int count) - { - arr.CopyTo(index,array,arrayIndex,count); - } - - /// - ///Gets a value indicating whether access to the ArrayList is synchronized (thread-safe). - /// - public bool IsSynchronized - { - get - { - return arr.IsSynchronized; - } - } - - /// - ///Gets a value indicating whether the ArrayList has a fixed size. - /// - public bool IsFixedSize - { - get - { - return arr.IsFixedSize; - } - } - - /// - ///Gets a value indicating whether the ArrayList is read-only. - /// - public bool IsReadOnly - { - get - { - return arr.IsReadOnly; - } - } - - /// - ///Gets an object that can be used to synchronize access to the ArrayList. - /// - public object SyncRoot - { - get - { - return arr.SyncRoot; - } - } - - /// - ///Returns an enumerator for the entire ArrayList. - /// - ///An IEnumerator for the entire using_namespaceArrayList. - public System.Collections.IEnumerator GetEnumerator() - { - return arr.GetEnumerator(); - } - - /// - ///Removes all elements from the ArrayList. - /// - ///Return value is void - public void Clear() - { - arr.Clear(); - } - - public int Capacity - { - get - { - return arr.Capacity; - } - set - { - arr.Capacity=value; - } - } - - public using_namespaceArrayList GetRange(int index,int count) - { - System.Collections.ArrayList al=arr.GetRange(index,count); - using_namespaceArrayList tnal=new using_namespaceArrayList(); - tnal.arr=al; - return tnal; - } - - public void RemoveAt(int index) - { - arr.RemoveAt(index); - } - - public void RemoveRange(int index,int count) - { - arr.RemoveRange(index,count); - } - - public void Reverse() - { - arr.Reverse(); - } - - public void Reverse(int index,int count) - { - arr.Reverse(index,count); - } - - public void SetRange(int index,using_namespace[] tnarr) - { - SetRange(index,tnarr); - } - - public void SetRange(int index,using_namespaceArrayList tnarl) - { - SetRange(index,tnarl); - } - - public void TrimToSize() - { - arr.TrimToSize(); - } - - } - -} \ No newline at end of file diff --git a/TreeConverter/TreeConverter.csproj b/TreeConverter/TreeConverter.csproj index 80a1af3ee..8151139b3 100644 --- a/TreeConverter/TreeConverter.csproj +++ b/TreeConverter/TreeConverter.csproj @@ -1,293 +1,27 @@  - + - Local - 9.0.30729 - 2.0 - {1C9C945A-586D-42A2-A06B-65D84FA7FF78} - Debug - AnyCPU - TreeConverter - JScript - Grid - IE50 - false - Library - TreeConverter - OnBuildSuccess - bin\TreeConverter.dll.xml - Auto - AnyCPU - - - 4.0 - - - v4.0 - - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - false - true - - + net40 + ..\bin\ - false - 285212672 - false - DEBUG;TRACE - true - 4096 - false - false - false - false - false - 4 - Full - prompt - - - AllRules.ruleset - true - - - ..\bin\ - false - 285212672 - false - TRACE - false - 4096 - false - true - false - false - false - 4 - none - prompt - - - AllRules.ruleset + false + + false + - - System - - - System.Data - - - - System.XML - - - - - Code - - - - - - - - - - - - - - - - - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - - - - Code - - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - - - - - - - - Code - - - - - - - - - - - Code - - - Code - - - - Code - - - - Code - - - Code - - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - - - {A25D26FB-3043-4BCF-833E-E3F4C3BE795E} - CompilerTools - - - {44A01F9E-DCE7-470C-AAE5-C3DE0CCBEE3B} - Errors - - - {2DE2842F-0912-4251-BC0F-480854C44A13} - Localization - - - SemanticTree - {613E0DDA-AA8A-437C-AC45-507B47429FF9} - {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - - - {e8aefbf9-0113-4fa4-be45-6cda555498b7} - StringConstants - - - SyntaxTree - {C2CAC65A-B2AE-4CCC-B067-E6B8E75DF73A} - {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Config\GlobalAssemblyInfo.cs - - - - - - - - {ce5c55c2-a11c-4e94-a9fa-3fc6ca3e4c09} - YieldHelpers - + - - False - Клиентский профиль .NET Framework 3.5 SP1 - false - - - False - .NET Framework 3.5 SP1 - true - - - False - Установщик Windows 3.1 - true - + + + + + + + - - \ No newline at end of file diff --git a/VisualPascalABCNET/FormsDesignerBinding/Dependecies/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj b/VisualPascalABCNET/FormsDesignerBinding/Dependecies/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj index 35b2e8a0e..24d77f027 100644 --- a/VisualPascalABCNET/FormsDesignerBinding/Dependecies/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj +++ b/VisualPascalABCNET/FormsDesignerBinding/Dependecies/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj @@ -1,105 +1,29 @@  - + + + net40 + + true + true + + ..\..\..\..\bin\ + false + True + + false + + + - Debug - AnyCPU - 8.0.50215 - 2.0 - {2748AD25-9C63-4E12-877B-4DCE96FBED54} - ICSharpCode.SharpDevelop - Library - False - False - Library false ..\..\ICSharpCode.SharpDevelop.snk File - True - False + False + Auto 88080384 - AnyCPU - 4096 - false - False - 0809 1591 - 4 - ..\..\..\..\bin\ - v4.0 - - - - Full - true - False - True - DEBUG,TRACE;PUBLICINTERPROCESS - ..\..\..\..\..\..\..\bin\ - true - - - false - PdbOnly - True - False - TRACE;PUBLICINTERPROCESS - - - - ..\..\..\..\..\Libs\AvalonDock.dll - - - ..\..\..\..\..\Libs\ICSharpCode.AvalonEdit.dll - - - ..\..\..\..\..\Libs\ICSharpCode.NRefactory.dll - - - ..\..\..\..\..\Libs\ICSharpCode.SharpDevelop.Dom.dll - - - ..\..\..\..\..\Libs\ICSharpCode.SharpDevelop.Widgets.dll - - - - ..\..\..\..\..\Libs\Mono.Cecil.dll - - - 3.0 - - - 3.0 - - - 3.0 - - - - - - - - - 3.0 - - - 3.0 - - - - - - - - - 3.5 - - - 3.0 - - - + Src\Gui\Dialogs\ReferenceDialog\KnownFrameworkAssemblies.cs @@ -119,854 +43,53 @@ Src\Project\MSBuildEngine\ExtendedBinaryReader.cs - - ListViewPad.xaml - - - - - - - - - - - - - - UserControl - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ToolTipService.cs - - - - - - ToolTipService.cs - - - - - - - - - - - - - ToolTipService.cs - - - - - - - App.xaml - Code - - - - ColorPickerButton.xaml - Code - - - - UserControl - - - - Form - - - AddOpenWithEntryDialog.cs - - - Form - - - AsynchronousWaitDialog.cs - - - Form - - - AbstractAttachToProcessForm.cs - - - Form - + Src\Services\RefactoringService\ExtractInterfaceDialog.cs - - ExtractInterfaceDialog.cs - Src\Services\RefactoringService\ExtractInterfaceDialog.Designer.cs ExtractInterfaceDialog.cs - - - Form - - - NewProjectDialog.cs - - - Form - - - OpenWithDialog.cs - - - LoadSaveOptions.xaml - Code - - - ProjectAndSolutionOptions.xaml - Code - - - SelectCulturePanel.xaml - Code - - - TaskListOptionsl.xaml - Code - - - DebugOptions.xaml - Code - - - - - - - - AddServiceReferenceDialog.xaml - Code - - - - AdvancedServiceDialog.xaml - Code - - - - - - - - - - - - - - - - - - - - - - - - - - - ServiceReferenceOptionsPanel..xaml - Code - - - - - - - - - Form - - - ToolNotFoundDialog.cs - - - UserControl - - - Form - - - AddNewConfigurationDialog.cs - - - TabbedOptionsDialog.xaml - Code - - - TreeViewOptionsDialog.xaml - Code - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - UpgradeView.xaml - Code - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ContextActionsBulbControl.xaml - Code - - - - ContextActionsHeaderedControl.xaml - Code - - - - - - - - - - ContextActionsControl.xaml - - - - - - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - IProgressMonitor.cs - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - UserControl - - - Form - - - UserControl - - - - Form - - - UserControl - - - UserControl - - - UserControl - - - Component - - - Component - - - UserControl - - - Component - SelectReferenceDialog.cs - - - Form - - - - - - - - - - - - - - - - - UserControl - - - Form - - - - - - - - - - - - - UserControl - - - - - - - - - - - - - - - - - UserControl - - - - - UserControl - - - - - - - - - - - - - - - - UserControl - - - UserControl - - - - - - - - - - - - - - - - - - - - - - - Form - - - - UserControl - - - - - - - - - - - - - - - - - Component - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - UserControl - - - - - - - - - UserControl - - - UserControl - - - UserControl - - - BuildEvents.xaml - - - - - - - - - - - - - - - - - - - - UserControl - - - Form - - - - UserControl - - - - - - - UserControl - - - - Component - - - - Component - - - - - Form - - - UserControl - - - - - - - - - - - - Form - - - Component - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - SolutionConfigurationEditor.cs - - - Form - - - Component - - - - - - EditAvailableConfigurationsDialog.cs - - - Form - - - - - - - - - - - - - - - - - - - - - - - - Src\Services\RefactoringService\ExtractInterfaceDialog.resx - ExtractInterfaceDialog.cs - - - NewProjectDialog.cs - - - AddNewConfigurationDialog.cs - + - - - - - - ProjectOptionPanel.cs - - - - - - - - - - {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} - ICSharpCode.Core - - - {7E4A7172-7FF5-48D0-B719-7CD959DD1AC9} - ICSharpCode.Core.Presentation - - - {857CA1A3-FC88-4BE0-AB6A-D1EE772AB288} - ICSharpCode.Core.WinForms - False - - - - - GotoDialog.cs - - - - - - - - + + ..\..\..\..\..\Libs\AvalonDock.dll + + + ..\..\..\..\..\Libs\ICSharpCode.AvalonEdit.dll + + + ..\..\..\..\..\Libs\ICSharpCode.NRefactory.dll + + + ..\..\..\..\..\Libs\ICSharpCode.SharpDevelop.Dom.dll + + + ..\..\..\..\..\Libs\ICSharpCode.SharpDevelop.Widgets.dll + + + ..\..\..\..\..\Libs\Mono.Cecil.dll + + + + + + + - + + + + + + + \ No newline at end of file diff --git a/VisualPascalABCNET/FormsDesignerBinding/Dependecies/src/Main/Base/Project/PostBuildEvent.proj b/VisualPascalABCNET/FormsDesignerBinding/Dependecies/src/Main/Base/Project/PostBuildEvent.proj index d22fcfb48..76976ca86 100644 --- a/VisualPascalABCNET/FormsDesignerBinding/Dependecies/src/Main/Base/Project/PostBuildEvent.proj +++ b/VisualPascalABCNET/FormsDesignerBinding/Dependecies/src/Main/Base/Project/PostBuildEvent.proj @@ -1,4 +1,4 @@ - + $(PrepareForRunDependsOn);MyPostBuildTarget diff --git a/VisualPascalABCNET/FormsDesignerBinding/Dependecies/src/Main/Core/Project/ICSharpCode.Core.csproj b/VisualPascalABCNET/FormsDesignerBinding/Dependecies/src/Main/Core/Project/ICSharpCode.Core.csproj index b53881d16..5f55375f9 100644 --- a/VisualPascalABCNET/FormsDesignerBinding/Dependecies/src/Main/Core/Project/ICSharpCode.Core.csproj +++ b/VisualPascalABCNET/FormsDesignerBinding/Dependecies/src/Main/Core/Project/ICSharpCode.Core.csproj @@ -1,146 +1,31 @@  - + + + net40 + + false + + ..\..\..\..\bin\ + false + + + - Debug - AnyCPU - 8.0.50215 - 2.0 - {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} - ICSharpCode.Core - ICSharpCode.Core - Library - False - False - Library false ..\..\ICSharpCode.SharpDevelop.snk 83886080 Always False File - v4.0 - False - false - C:\Users\daniel\AppData\Roaming\ICSharpCode/SharpDevelop3.0\Settings.SourceAnalysis - - - - true - False - Full - ..\..\..\..\bin\ICSharpCode.Core.xml - 1591 - DEBUG - True - ..\..\..\..\bin\ - 4 - true - - - False - True - False - ..\..\..\..\bin\ - 4 - - - False - Auto - AnyCPU - 4096 - - - Program - - - - - 3.5 - - - + Configuration\GlobalAssemblyInfo.cs - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + Src\AddInTree\AddIn\AddIn.xsd - \ No newline at end of file diff --git a/VisualPascalABCNET/FormsDesignerBinding/Dependecies/src/Main/ICSharpCode.Core.Presentation/ICSharpCode.Core.Presentation.csproj b/VisualPascalABCNET/FormsDesignerBinding/Dependecies/src/Main/ICSharpCode.Core.Presentation/ICSharpCode.Core.Presentation.csproj index 4a96750a3..550731379 100644 --- a/VisualPascalABCNET/FormsDesignerBinding/Dependecies/src/Main/ICSharpCode.Core.Presentation/ICSharpCode.Core.Presentation.csproj +++ b/VisualPascalABCNET/FormsDesignerBinding/Dependecies/src/Main/ICSharpCode.Core.Presentation/ICSharpCode.Core.Presentation.csproj @@ -1,122 +1,38 @@  - + - {7E4A7172-7FF5-48D0-B719-7CD959DD1AC9} - Debug - AnyCPU - Library - ICSharpCode.Core.Presentation - ICSharpCode.Core.Presentation - v4.0 - Properties - "C:\Program Files\SharpDevelop\3.0\bin\..\AddIns\AddIns\Misc\SourceAnalysis\Settings.SourceAnalysis" + net40 + + true + ..\..\..\bin\ - False - False - 4 - false + false + + false + + + + false ..\ICSharpCode.SharpDevelop.snk False File - False - -Microsoft.Performance#CA1810 - - - - true - Full - False - True - DEBUG;TRACE - - - False - None - True - False - TRACE - - - False - Auto - 4194304 - AnyCPU - 4096 - - - true - - - - - 3.0 - - - 3.0 - - - - 3.5 - - - - - - - - 3.0 - - - + Properties\GlobalAssemblyInfo.cs - - - - - - - - - - - - - - IStatusUpdate.cs - - - - - - - - - - - - - - - - - - + - + - - + + + - - {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} - ICSharpCode.Core - + \ No newline at end of file diff --git a/VisualPascalABCNET/FormsDesignerBinding/Dependecies/src/Main/ICSharpCode.Core.WinForms/ICSharpCode.Core.WinForms.csproj b/VisualPascalABCNET/FormsDesignerBinding/Dependecies/src/Main/ICSharpCode.Core.WinForms/ICSharpCode.Core.WinForms.csproj index 91f76338c..ac38b15d4 100644 --- a/VisualPascalABCNET/FormsDesignerBinding/Dependecies/src/Main/ICSharpCode.Core.WinForms/ICSharpCode.Core.WinForms.csproj +++ b/VisualPascalABCNET/FormsDesignerBinding/Dependecies/src/Main/ICSharpCode.Core.WinForms/ICSharpCode.Core.WinForms.csproj @@ -1,126 +1,31 @@  - + - {857CA1A3-FC88-4BE0-AB6A-D1EE772AB288} - Debug - AnyCPU - Library - ICSharpCode.Core.WinForms - ICSharpCode.Core.WinForms - v4.0 - Properties + net40 + + true + ..\..\..\bin\ - False - False - 4 - false + false + + false + + + + false ..\ICSharpCode.SharpDevelop.snk False File - - - - true - Full - False - True - DEBUG;TRACE - - - False - None - True - False - TRACE - - - False - Auto - 4194304 - AnyCPU - 4096 - - - true - - - - - - - - + Properties\GlobalAssemblyInfo.cs - - - - Component - - - Component - - - Component - - - Component - - - - Form - - - - Form - - - Form - - - Form - - - - - Component - - - Component - - - Component - - - Component - - - Component - - - Component - - - - Component - - - Component - - - - - + - - {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} - ICSharpCode.Core - False - + \ No newline at end of file diff --git a/VisualPascalABCNET/VisualPascalABCNET.csproj b/VisualPascalABCNET/VisualPascalABCNET.csproj index 8de68ee1e..daeb804a3 100644 --- a/VisualPascalABCNET/VisualPascalABCNET.csproj +++ b/VisualPascalABCNET/VisualPascalABCNET.csproj @@ -1,123 +1,27 @@  - + - Debug - AnyCPU - 9.0.30729 - 2.0 - {BC35F816-54EE-47E0-89FC-1C66EAC155A9} + net471 WinExe - Properties + VisualPascalABC - PascalABCNET + _ABC13.ico - LocalIntranet - false - False - False - false - - - 4.0 - - - v4.7.1 - false - - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - true - - - true - full - false - ..\bin\ - DEBUG;TRACE - prompt - 4 - AllRules.ruleset - false - false + + false + false + true - false - - - PdbOnly - true - ..\bin\ - RELEASE;TRACE - prompt - 4 - false - AllRules.ruleset - true - false - - - False - - - False - Auto - 4194304 - AnyCPU - 4096 - - + app.manifest + + ..\bin\ + false + PascalABCNET + + true - - - ..\Libraries\Debugger.Core.dll - - - False - FormsDesignerBinding\Libs\ICSharpCode.SharpDevelop.Dom.dll - - - False - FormsDesignerBinding\Libs\ICSharpCode.SharpDevelop.Widgets.dll - - - ..\Libraries\ICSharpCode.TextEditor.dll - - - - - - - - ..\Libraries\SharpDisasm.dll - - - - - - - - - - - - - - ..\Libraries\WeifenLuo.WinFormsUI.Docking.dll - - - - + Form @@ -642,44 +546,18 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -790,104 +668,71 @@ RunArguments.cs Designer + + + + - - {1AB15F6E-C22E-499A-A7ED-54BA7DE5CFA6} - CodeCompletion - - - {a25d26fb-3043-4bcf-833e-e3f4c3be795e} - CompilerTools - - - {1E42361A-EDA3-4872-88AF-A3AAF600D36D} - Compiler - - - {44A01F9E-DCE7-470C-AAE5-C3DE0CCBEE3B} - Errors - - - {2DE2842F-0912-4251-BC0F-480854C44A13} - Localization - - - {a48d9069-d569-4110-9252-a10f139b669b} - LanguageIntegrator - - - {AF2EFD7B-69DD-4B43-AF65-B59B29349C23} - ParserTools - - - {cfc683f8-0165-4a9f-9c3f-bb8c5bab507f} - PluginsSupport - - - {e8aefbf9-0113-4fa4-be45-6cda555498b7} - StringConstants - - - {C2CAC65A-B2AE-4CCC-B067-E6B8E75DF73A} - SyntaxTree - - - {1C9C945A-586D-42A2-A06B-65D84FA7FF78} - TreeConverter - - - {a9ab4282-83b4-41a7-86c3-e5bf6a45e7e2} - SyntaxVisitors - - - {2748AD25-9C63-4E12-877B-4DCE96FBED54} - ICSharpCode.SharpDevelop - - - {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} - ICSharpCode.Core - - - {7E4A7172-7FF5-48D0-B719-7CD959DD1AC9} - ICSharpCode.Core.Presentation - - - {857CA1A3-FC88-4BE0-AB6A-D1EE772AB288} - ICSharpCode.Core.WinForms - - - PABCNETC - {2aef58a1-2bcf-4c4b-ab03-f44bbb2628e6} + + + + + + + + + + + + + + + + + false + - - False - Клиентский профиль .NET Framework 3.5 SP1 - false - - - False - .NET Framework 3.5 SP1 - true - - - False - Установщик Windows 3.1 - true - + + - + + ..\Libraries\Debugger.Core.dll + + + False + FormsDesignerBinding\Libs\ICSharpCode.SharpDevelop.Dom.dll + + + False + FormsDesignerBinding\Libs\ICSharpCode.SharpDevelop.Widgets.dll + + + ..\Libraries\ICSharpCode.TextEditor.dll + + + + + + + ..\Libraries\SharpDisasm.dll + + + + + + + + + + + ..\Libraries\WeifenLuo.WinFormsUI.Docking.dll + + + - - \ No newline at end of file diff --git a/VisualPascalABCNET/app.config b/VisualPascalABCNET/app.config index af5ee9e99..1303a56fe 100644 --- a/VisualPascalABCNET/app.config +++ b/VisualPascalABCNET/app.config @@ -14,6 +14,6 @@ - + diff --git a/VisualPascalABCNETLinux/VisualPascalABCNETLinux.csproj b/VisualPascalABCNETLinux/VisualPascalABCNETLinux.csproj index d1d9e3f20..471b130f6 100644 --- a/VisualPascalABCNETLinux/VisualPascalABCNETLinux.csproj +++ b/VisualPascalABCNETLinux/VisualPascalABCNETLinux.csproj @@ -1,115 +1,26 @@  - + - Debug - AnyCPU - 9.0.30729 - 2.0 - {3BF3CEB4-0E08-485A-8E6D-924841818B01} + net471 WinExe - Properties + ..\bin\ + VisualPascalABC PascalABCNETLinux _ABC13.ico - LocalIntranet false - False - False - false - - - 4.0 - - - v4.7.1 - false - - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - true - - - true - full - false - ..\bin\ - DEBUG;TRACE - prompt - 4 - AllRules.ruleset - false - false + true - false - - - PdbOnly - true - ..\bin\ - RELEASE;TRACE - prompt - 4 - false - AllRules.ruleset - true - false - - - False - - - False - Auto - 4194304 - AnyCPU - 4096 - - + + false + false + false + app.manifest + + true - - - ..\Libraries\Debugger.Core.dll - - - - - - ..\Libraries\SharpDisasm.dll - - - - - - - - - - - - - - False - ..\Libraries\WeifenLuo.WinFormsUI.Docking.ThemeVS2005Linux.dll - - - False - ..\Libraries\WeifenLuo.WinFormsUI.DockingLinux.dll - - - - + Form @@ -758,41 +669,17 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -905,92 +792,57 @@ Designer + - - {1AB15F6E-C22E-499A-A7ED-54BA7DE5CFA6} - CodeCompletion - - - {a25d26fb-3043-4bcf-833e-e3f4c3be795e} - CompilerTools - - - {1E42361A-EDA3-4872-88AF-A3AAF600D36D} - Compiler - - - {44A01F9E-DCE7-470C-AAE5-C3DE0CCBEE3B} - Errors - - - {2d18be89-d210-49eb-a9dd-2246fbb3df6d} - ICSharpCode.TextEditorLinux - - - {2DE2842F-0912-4251-BC0F-480854C44A13} - Localization - - - {a48d9069-d569-4110-9252-a10f139b669b} - LanguageIntegrator - - - {AF2EFD7B-69DD-4B43-AF65-B59B29349C23} - ParserTools - - - {e009e776-9280-4061-b5ca-7f0c3e2d3c2a} - PluginsSupportLinux - - - {e8aefbf9-0113-4fa4-be45-6cda555498b7} - StringConstants - - - {C2CAC65A-B2AE-4CCC-B067-E6B8E75DF73A} - SyntaxTree - - - {1C9C945A-586D-42A2-A06B-65D84FA7FF78} - TreeConverter - - - {a9ab4282-83b4-41a7-86c3-e5bf6a45e7e2} - SyntaxVisitors - - - PABCNETC - {2aef58a1-2bcf-4c4b-ab03-f44bbb2628e6} + + + + + + + + + + + + + + false + - - False - Клиентский профиль .NET Framework 3.5 SP1 - false - - - False - .NET Framework 3.5 SP1 - true - - - False - Установщик Windows 3.1 - true - + + ..\Libraries\Debugger.Core.dll + + + + + + ..\Libraries\SharpDisasm.dll + + + + + + + + + + + False + ..\Libraries\WeifenLuo.WinFormsUI.Docking.ThemeVS2005Linux.dll + + + False + ..\Libraries\WeifenLuo.WinFormsUI.DockingLinux.dll + + + + - + - - - \ No newline at end of file diff --git a/VisualPascalABCNETLinux/app.config b/VisualPascalABCNETLinux/app.config index 677a6dcfd..291383d54 100644 --- a/VisualPascalABCNETLinux/app.config +++ b/VisualPascalABCNETLinux/app.config @@ -9,6 +9,5 @@ - diff --git a/VisualPlugins/CodeTemplatesPlugin/CodeTemplatesPlugin.csproj b/VisualPlugins/CodeTemplatesPlugin/CodeTemplatesPlugin.csproj index 2d46b23cf..e34932d16 100644 --- a/VisualPlugins/CodeTemplatesPlugin/CodeTemplatesPlugin.csproj +++ b/VisualPlugins/CodeTemplatesPlugin/CodeTemplatesPlugin.csproj @@ -1,42 +1,22 @@  - - + - Debug - AnyCPU - {3AA92A45-7142-4C59-B12F-56DAE32A40E3} - Library - Properties - CodeTemplatesPlugin - CodeTemplatesPlugin - v4.7.1 - 512 - true - - - - true - full - false + net471 + ..\..\bin\ - DEBUG;TRACE - prompt - 4 - false - false - - - pdbonly - true - ..\..\bin\ - TRACE - prompt - 4 - false + false + + false + + true + + + + + + - - False ..\..\VisualPascalABCNET\FormsDesignerBinding\Dependecies\bin\ICSharpCode.Core.dll @@ -49,7 +29,6 @@ False ..\..\VisualPascalABCNET\FormsDesignerBinding\Dependecies\bin\ICSharpCode.Core.WinForms.dll - False ..\..\bin\ICSharpCode.SharpDevelop.dll @@ -66,81 +45,23 @@ False ..\..\Libraries\ICSharpCode.TextEditor.dll - - - - - - - - ..\..\Libraries\WeifenLuo.WinFormsUI.Docking.dll - + - - Form - - - CodeTemplatesForm.cs - - - - Form - - - Images.cs - - - - True - True - Resources.resx - + - - - {cfc683f8-0165-4a9f-9c3f-bb8c5bab507f} - PluginsSupport - - - {bc35f816-54ee-47e0-89fc-1c66eac155a9} - VisualPascalABCNET - - - - - CodeTemplatesForm.cs - - - Images.cs - - - ResXFileCodeGenerator - Resources.Designer.cs - - - - - - - - - - - - \ No newline at end of file diff --git a/VisualPlugins/CompilerController/CompilerController.csproj b/VisualPlugins/CompilerController/CompilerController.csproj index 15f0adbda..b2466b648 100644 --- a/VisualPlugins/CompilerController/CompilerController.csproj +++ b/VisualPlugins/CompilerController/CompilerController.csproj @@ -1,140 +1,33 @@  - + - Debug - AnyCPU - 8.0.50727 - 2.0 - {50F4AB3F-0A1E-4AF9-88CF-48A8D3E1D1D7} - Library - Properties + net462 + VisualPascalABCPlugins - CompilerController - - - 4.0 - - - v4.0 - - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - false - true - - - true - full - false + + false + ..\..\bin\ - DEBUG;TRACE - prompt - 4 - AllRules.ruleset - true - - - pdbonly - true - ..\..\bin\ - TRACE - prompt - 4 - AllRules.ruleset + false + + true + false + + + + + + + + + - - False - - - - + - - Form - - - CompilerInformation.cs - - - - - True - True - Resources.resx - - + - - - Designer - CompilerInformation.cs - - - Designer - ResXFileCodeGenerator - Resources.Designer.cs - - - - - {1AB15F6E-C22E-499A-A7ED-54BA7DE5CFA6} - CodeCompletion - - - {1e42361a-eda3-4872-88af-a3aaf600d36d} - Compiler - - - {44A01F9E-DCE7-470C-AAE5-C3DE0CCBEE3B} - Errors - - - {2DE2842F-0912-4251-BC0F-480854C44A13} - Localization - - - {cfc683f8-0165-4a9f-9c3f-bb8c5bab507f} - PluginsSupport - - - - - False - Клиентский профиль .NET Framework 3.5 SP1 - false - - - False - .NET Framework 3.5 SP1 - true - - - False - Установщик Windows 3.1 - true - - - - \ No newline at end of file diff --git a/VisualPlugins/CompilerController/Properties/Resources.Designer.cs b/VisualPlugins/CompilerController/Properties/Resources.Designer.cs index 4ee9b1bac..8b81f6781 100644 --- a/VisualPlugins/CompilerController/Properties/Resources.Designer.cs +++ b/VisualPlugins/CompilerController/Properties/Resources.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // Этот код создан программой. -// Исполняемая версия:4.0.30319.1 +// Исполняемая версия:4.0.30319.42000 // // Изменения в этом файле могут привести к неправильной работе и будут потеряны в случае // повторной генерации кода. @@ -19,7 +19,7 @@ namespace VisualPascalABCPlugins.Properties { // с помощью такого средства, как ResGen или Visual Studio. // Чтобы добавить или удалить член, измените файл .ResX и снова запустите ResGen // с параметром /str или перестройте свой проект VS. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { diff --git a/VisualPlugins/InternalErrorReport/InternalErrorReport.csproj b/VisualPlugins/InternalErrorReport/InternalErrorReport.csproj index c119ac1f4..c8762e896 100644 --- a/VisualPlugins/InternalErrorReport/InternalErrorReport.csproj +++ b/VisualPlugins/InternalErrorReport/InternalErrorReport.csproj @@ -1,149 +1,36 @@  - + - Debug - AnyCPU - 8.0.50727 - 2.0 - {A36031B7-D3D1-4372-B478-07621069602E} - Library - Properties + net462 + VisualPascalABCPlugins - InternalErrorReport - - - 4.0 - - - v4.0 - - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - false - true - - - true - full - false + + false + ..\..\bin\ - DEBUG;TRACE - prompt - 4 - AllRules.ruleset - true - - - pdbonly - true - ..\..\bin\ - TRACE - prompt - 4 - AllRules.ruleset + false + + false + + true + + + + + + + + - - False - ..\..\Libraries\ICSharpCode.SharpZipLib.dll - - - + - - Form - - - CompilerInternalErrorReport.cs - - - Form - - - ErrorReport.cs - - - - - True - True - Resources.resx - - + - - - Designer - CompilerInternalErrorReport.cs - - - Designer - ErrorReport.cs - - - Designer - ResXFileCodeGenerator - Resources.Designer.cs - - - - - {1e42361a-eda3-4872-88af-a3aaf600d36d} - Compiler - - - {44A01F9E-DCE7-470C-AAE5-C3DE0CCBEE3B} - Errors - - - {2DE2842F-0912-4251-BC0F-480854C44A13} - Localization - - - {cfc683f8-0165-4a9f-9c3f-bb8c5bab507f} - PluginsSupport - - - - - False - Клиентский профиль .NET Framework 3.5 SP1 - false - - - False - .NET Framework 3.5 SP1 - true - - - False - Установщик Windows 3.1 - true - - - - \ No newline at end of file diff --git a/VisualPlugins/LanguageConverter/Source/ISemanticNodeConverter.cs b/VisualPlugins/LanguageConverter/ISemanticNodeConverter.cs similarity index 100% rename from VisualPlugins/LanguageConverter/Source/ISemanticNodeConverter.cs rename to VisualPlugins/LanguageConverter/ISemanticNodeConverter.cs diff --git a/VisualPlugins/LanguageConverter/LanguageConverter.csproj b/VisualPlugins/LanguageConverter/LanguageConverter.csproj index 9d057afce..7984ea723 100644 --- a/VisualPlugins/LanguageConverter/LanguageConverter.csproj +++ b/VisualPlugins/LanguageConverter/LanguageConverter.csproj @@ -1,149 +1,40 @@  - + - Debug - AnyCPU - 8.0.50727 - 2.0 - {43879684-ADBE-470A-AAC6-2ACA36603971} - Library - Properties + net462 + Converter - LanguageConverter - - - 4.0 - - - v4.0 - - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - false - true - - - true - full - false + ..\..\bin\ - DEBUG;TRACE - prompt - 4 - AllRules.ruleset - true - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - AllRules.ruleset + false + + false + + true - - + + + + + + + + + + + + + + + + + - + - - True - True - Resources.resx - - - - - - - - - Form - - - TextFormatterForm.cs - - - + - - - Designer - ResXFileCodeGenerator - Resources.Designer.cs - - - Designer - TextFormatterForm.cs - - - - - - - - {A25D26FB-3043-4BCF-833E-E3F4C3BE795E} - CompilerTools - - - {1E42361A-EDA3-4872-88AF-A3AAF600D36D} - Compiler - - - {44A01F9E-DCE7-470C-AAE5-C3DE0CCBEE3B} - Errors - - - {2DE2842F-0912-4251-BC0F-480854C44A13} - Localization - - - {CFC683F8-0165-4A9F-9C3F-BB8C5BAB507F} - PluginsSupport - - - {613E0DDA-AA8A-437C-AC45-507B47429FF9} - SemanticTree - - - - - False - Клиентский профиль .NET Framework 3.5 SP1 - false - - - False - .NET Framework 3.5 SP1 - true - - - False - Установщик Windows 3.1 - true - - - - \ No newline at end of file diff --git a/VisualPlugins/LanguageConverter/Source/LanguageConverterPlugin.cs b/VisualPlugins/LanguageConverter/LanguageConverterPlugin.cs similarity index 100% rename from VisualPlugins/LanguageConverter/Source/LanguageConverterPlugin.cs rename to VisualPlugins/LanguageConverter/LanguageConverterPlugin.cs diff --git a/VisualPlugins/LanguageConverter/Source/ListSyntRules.cs b/VisualPlugins/LanguageConverter/ListSyntRules.cs similarity index 100% rename from VisualPlugins/LanguageConverter/Source/ListSyntRules.cs rename to VisualPlugins/LanguageConverter/ListSyntRules.cs diff --git a/VisualPlugins/LanguageConverter/Source/Rules_CS.txt b/VisualPlugins/LanguageConverter/Rules_CS.txt similarity index 100% rename from VisualPlugins/LanguageConverter/Source/Rules_CS.txt rename to VisualPlugins/LanguageConverter/Rules_CS.txt diff --git a/VisualPlugins/LanguageConverter/Source/SemanticNodeConverter.cs b/VisualPlugins/LanguageConverter/SemanticNodeConverter.cs similarity index 100% rename from VisualPlugins/LanguageConverter/Source/SemanticNodeConverter.cs rename to VisualPlugins/LanguageConverter/SemanticNodeConverter.cs diff --git a/VisualPlugins/LanguageConverter/Source/SourceTextBilder.cs b/VisualPlugins/LanguageConverter/SourceTextBilder.cs similarity index 100% rename from VisualPlugins/LanguageConverter/Source/SourceTextBilder.cs rename to VisualPlugins/LanguageConverter/SourceTextBilder.cs diff --git a/VisualPlugins/LanguageConverter/Source/TextFormatter.cs b/VisualPlugins/LanguageConverter/TextFormatter.cs similarity index 100% rename from VisualPlugins/LanguageConverter/Source/TextFormatter.cs rename to VisualPlugins/LanguageConverter/TextFormatter.cs diff --git a/VisualPlugins/LanguageConverter/Source/TextFormatterForm.Designer.cs b/VisualPlugins/LanguageConverter/TextFormatterForm.Designer.cs similarity index 100% rename from VisualPlugins/LanguageConverter/Source/TextFormatterForm.Designer.cs rename to VisualPlugins/LanguageConverter/TextFormatterForm.Designer.cs diff --git a/VisualPlugins/LanguageConverter/Source/TextFormatterForm.cs b/VisualPlugins/LanguageConverter/TextFormatterForm.cs similarity index 100% rename from VisualPlugins/LanguageConverter/Source/TextFormatterForm.cs rename to VisualPlugins/LanguageConverter/TextFormatterForm.cs diff --git a/VisualPlugins/LanguageConverter/Source/TextFormatterForm.resx b/VisualPlugins/LanguageConverter/TextFormatterForm.resx similarity index 100% rename from VisualPlugins/LanguageConverter/Source/TextFormatterForm.resx rename to VisualPlugins/LanguageConverter/TextFormatterForm.resx diff --git a/VisualPlugins/LanguageConverter/Source/Visitor.cs b/VisualPlugins/LanguageConverter/Visitor.cs similarity index 100% rename from VisualPlugins/LanguageConverter/Source/Visitor.cs rename to VisualPlugins/LanguageConverter/Visitor.cs diff --git a/VisualPlugins/PT4Provider/PT4Provider.csproj b/VisualPlugins/PT4Provider/PT4Provider.csproj index 83462c494..66b1d9dc1 100644 --- a/VisualPlugins/PT4Provider/PT4Provider.csproj +++ b/VisualPlugins/PT4Provider/PT4Provider.csproj @@ -1,147 +1,32 @@  - + - Debug - AnyCPU - 9.0.30729 - 2.0 - {4A9AC1AA-698E-49C2-B1ED-15B5E4AB963D} - Library - Properties - PT4Provider - PT4Provider - - - - - 4.0 - - - v4.0 - - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - false - true - - - true - full - false + net462 + ..\..\bin\ - DEBUG;TRACE - prompt - 4 - AllRules.ruleset - true - - - pdbonly - true - ..\..\bin\ - TRACE - prompt - 4 - AllRules.ruleset + false + + false + true + + + + + + + + False ..\..\bin\PT4\PT4Tools.dll - - - - + - - - Form - - - Images.cs - - - - - Designer - Images.cs - - - ResXFileCodeGenerator - Resources.Designer.cs - Designer - - - True - Resources.resx - True - - - SettingsSingleFileGenerator - Settings.Designer.cs - - - True - Settings.settings - True - + - - - {1E42361A-EDA3-4872-88AF-A3AAF600D36D} - Compiler - - - {44a01f9e-dce7-470c-aae5-c3de0ccbee3b} - Errors - - - {2DE2842F-0912-4251-BC0F-480854C44A13} - Localization - - - {cfc683f8-0165-4a9f-9c3f-bb8c5bab507f} - PluginsSupport - - - - - False - Клиентский профиль .NET Framework 3.5 SP1 - false - - - False - .NET Framework 3.5 SP1 - true - - - False - Установщик Windows 3.1 - true - - - - \ No newline at end of file diff --git a/VisualPlugins/SyntaxTreeVisualisator/SyntaxTreeVisualisator.csproj b/VisualPlugins/SyntaxTreeVisualisator/SyntaxTreeVisualisator.csproj index d7e5a1ce0..9e0f9d2b2 100644 --- a/VisualPlugins/SyntaxTreeVisualisator/SyntaxTreeVisualisator.csproj +++ b/VisualPlugins/SyntaxTreeVisualisator/SyntaxTreeVisualisator.csproj @@ -1,149 +1,34 @@  - + - Debug - AnyCPU - 8.0.50727 - 2.0 - {1437FD01-0741-4912-8035-6BDFEAA45626} - Library - Properties + net462 + VisualPascalABCPlugins - SyntaxTreeVisualisator - - - 4.0 - - - v4.0 - - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - false - true - - - true - full - false + ..\..\bin\ - DEBUG;TRACE - prompt - 4 - AllRules.ruleset - true - - - pdbonly - true - ..\..\bin\ - TRACE - prompt - 4 - AllRules.ruleset + false + + false + + true + + + + + + + + + + + - - False - - - - + - - True - True - Resources.resx - - - Form - - - SyntaxTreeVisualisatorForm.cs - - - - - + - - - Designer - ResXFileCodeGenerator - Resources.Designer.cs - - - Designer - SyntaxTreeVisualisatorForm.cs - - - - - {A25D26FB-3043-4BCF-833E-E3F4C3BE795E} - CompilerTools - - - {1e42361a-eda3-4872-88af-a3aaf600d36d} - Compiler - - - {44A01F9E-DCE7-470C-AAE5-C3DE0CCBEE3B} - Errors - - - {a48d9069-d569-4110-9252-a10f139b669b} - LanguageIntegrator - - - {2DE2842F-0912-4251-BC0F-480854C44A13} - Localization - - - {AF2EFD7B-69DD-4B43-AF65-B59B29349C23} - ParserTools - - - {cfc683f8-0165-4a9f-9c3f-bb8c5bab507f} - PluginsSupport - - - - - False - Клиентский профиль .NET Framework 3.5 SP1 - false - - - False - .NET Framework 3.5 SP1 - true - - - False - Установщик Windows 3.1 - true - - - - \ No newline at end of file diff --git a/VisualPlugins/TestPlugin/Properties/Resources.Designer.cs b/VisualPlugins/TestPlugin/Properties/Resources.Designer.cs index 4ee9b1bac..8b81f6781 100644 --- a/VisualPlugins/TestPlugin/Properties/Resources.Designer.cs +++ b/VisualPlugins/TestPlugin/Properties/Resources.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // Этот код создан программой. -// Исполняемая версия:4.0.30319.1 +// Исполняемая версия:4.0.30319.42000 // // Изменения в этом файле могут привести к неправильной работе и будут потеряны в случае // повторной генерации кода. @@ -19,7 +19,7 @@ namespace VisualPascalABCPlugins.Properties { // с помощью такого средства, как ResGen или Visual Studio. // Чтобы добавить или удалить член, измените файл .ResX и снова запустите ResGen // с параметром /str или перестройте свой проект VS. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { diff --git a/VisualPlugins/TestPlugin/TestPlugin.csproj b/VisualPlugins/TestPlugin/TestPlugin.csproj index e98814370..126d5eec1 100644 --- a/VisualPlugins/TestPlugin/TestPlugin.csproj +++ b/VisualPlugins/TestPlugin/TestPlugin.csproj @@ -1,140 +1,32 @@  - + - Debug - AnyCPU - 8.0.50727 - 2.0 - {DBE875B5-6187-45D8-8B75-2E43CC513A60} - Library - Properties + net462 + VisualPascalABCPlugins - TestPlugin - - - 4.0 - - - v4.0 - - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - false - true - - - true - full - false + + true + ..\..\bin\ - DEBUG;TRACE - prompt - 4 - AllRules.ruleset - true - - - pdbonly - true - ..\..\bin\ - TRACE - prompt - 4 - AllRules.ruleset + false + + false + + + + + + + + + + - - - - + - - True - True - Resources.resx - - - Form - - - TestForm.cs - - - + - - - Designer - ResXFileCodeGenerator - Resources.Designer.cs - - - Designer - TestForm.cs - - - - - {A25D26FB-3043-4BCF-833E-E3F4C3BE795E} - CompilerTools - - - {1e42361a-eda3-4872-88af-a3aaf600d36d} - Compiler - - - {44A01F9E-DCE7-470C-AAE5-C3DE0CCBEE3B} - Errors - - - {2DE2842F-0912-4251-BC0F-480854C44A13} - Localization - - - {AF2EFD7B-69DD-4B43-AF65-B59B29349C23} - ParserTools - - - {cfc683f8-0165-4a9f-9c3f-bb8c5bab507f} - PluginsSupport - - - - - False - Клиентский профиль .NET Framework 3.5 SP1 - false - - - False - .NET Framework 3.5 SP1 - true - - - False - Установщик Windows 3.1 - true - - - - \ No newline at end of file diff --git a/VisualPlugins/TraningControlPlugin/TeacherControlPlugin.csproj b/VisualPlugins/TraningControlPlugin/TeacherControlPlugin.csproj index 765e46b77..814661007 100644 --- a/VisualPlugins/TraningControlPlugin/TeacherControlPlugin.csproj +++ b/VisualPlugins/TraningControlPlugin/TeacherControlPlugin.csproj @@ -1,169 +1,36 @@  - + - Debug - AnyCPU - 8.0.50727 - 2.0 - {536CC813-7C4E-42BC-AE3A-BA1427F38756} - Library - Properties + net471 + VisualPascalABCPlugins - TeacherControlPlugin - - - 4.0 - - - v4.7.1 - - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - false - true - - - true - full - false + ..\..\bin\ - DEBUG;TRACE - prompt - 4 - AllRules.ruleset - true - false - - - pdbonly - true - ..\..\bin\ - TRACE - prompt - 4 - AllRules.ruleset - false + false + + false + + true + + + + + + + + + + + - - - - + - - Form - - - LoginForm.cs - - - - True - True - Resources.resx - - - - Form - - - TeacherControlForm.cs - - - + - - - LoginForm.cs - - - Designer - ResXFileCodeGenerator - Resources.Designer.cs - - - Designer - TeacherControlForm.cs - - - - - {A25D26FB-3043-4BCF-833E-E3F4C3BE795E} - CompilerTools - - - {1e42361a-eda3-4872-88af-a3aaf600d36d} - Compiler - - - {44A01F9E-DCE7-470C-AAE5-C3DE0CCBEE3B} - Errors - - - {2DE2842F-0912-4251-BC0F-480854C44A13} - Localization - - - {AF2EFD7B-69DD-4B43-AF65-B59B29349C23} - ParserTools - - - {cfc683f8-0165-4a9f-9c3f-bb8c5bab507f} - PluginsSupport - - - {c2cac65a-b2ae-4ccc-b067-e6b8e75df73a} - SyntaxTree - - - - - False - Клиентский профиль .NET Framework 3.5 SP1 - false - - - False - .NET Framework 3.5 SP1 - true - - - False - Установщик Windows 3.1 - true - - - - - - - - - - - - - \ No newline at end of file diff --git a/Yield/YieldConversionSyntax/YieldConversionSyntax.csproj b/Yield/YieldConversionSyntax/YieldConversionSyntax.csproj index bdebcb159..112678f64 100644 --- a/Yield/YieldConversionSyntax/YieldConversionSyntax.csproj +++ b/Yield/YieldConversionSyntax/YieldConversionSyntax.csproj @@ -1,72 +1,19 @@  - - + - Debug - AnyCPU - {276EE073-60F6-46D2-8811-1B8026BCAADA} - Library - Properties - YieldConversionSyntax - YieldConversionSyntax - v4.0 - 512 - - - - true - full - false + net40 + ..\..\bin\ - TRACE;DEBUG - prompt - 4 - - - pdbonly - true - ..\..\bin\ - TRACE - prompt - 4 + false + + false + false + - - - - - - - + + + + - - - - - - - {44a01f9e-dce7-470c-aae5-c3de0ccbee3b} - Errors - - - {f10a5330-dcf4-4533-877c-7b1b1be23884} - SyntaxTreeConverters - - - {c2cac65a-b2ae-4ccc-b067-e6b8e75df73a} - SyntaxTree - - - {a9ab4282-83b4-41a7-86c3-e5bf6a45e7e2} - SyntaxVisitors - - - - \ No newline at end of file diff --git a/Yield/YieldHelpers/YieldHelpers.csproj b/Yield/YieldHelpers/YieldHelpers.csproj index 9516d94c8..23625065b 100644 --- a/Yield/YieldHelpers/YieldHelpers.csproj +++ b/Yield/YieldHelpers/YieldHelpers.csproj @@ -1,55 +1,11 @@  - - + - Debug - AnyCPU - {CE5C55C2-A11C-4E94-A9FA-3FC6CA3E4C09} - Library - Properties - YieldHelpers - YieldHelpers - v4.0 - 512 - - - - true - full - false + net40 + ..\..\bin\ - DEBUG;TRACE - prompt - 4 - true + false + + false - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/_BuildDebug.bat b/_BuildDebug.bat index 89f790070..4b3ee8af8 100644 --- a/_BuildDebug.bat +++ b/_BuildDebug.bat @@ -1,3 +1,3 @@ -call Studio.bat PascalABCNET.sln +dotnet build PascalABCNET.sln @IF %ERRORLEVEL% NEQ 0 PAUSE \ No newline at end of file diff --git a/_BuildDebug.sh b/_BuildDebug.sh index a741000c5..c0d5639b6 100644 --- a/_BuildDebug.sh +++ b/_BuildDebug.sh @@ -1,3 +1,3 @@ #!/bin/sh -e -MONO_IOMAP=case msbuild /p:Configuration=Debug pabcnetc.sln -MONO_IOMAP=case msbuild /p:Configuration=Debug PascalABCNETLinux.sln +dotnet build pabcnetc.sln +dotnet build PascalABCNETLinux.sln diff --git a/_Clean.bat b/_Clean.bat index 76b371b29..4f4a74224 100644 --- a/_Clean.bat +++ b/_Clean.bat @@ -1,3 +1,3 @@ -call Studio.bat /t:clean PascalABCNET.sln +dotnet clean PascalABCNET.sln @IF %ERRORLEVEL% NEQ 0 PAUSE diff --git a/_GenerateAllSetups.bat b/_GenerateAllSetups.bat index e58c9f1cb..8996b9775 100644 --- a/_GenerateAllSetups.bat +++ b/_GenerateAllSetups.bat @@ -16,7 +16,7 @@ Utils\ReplaceInFiles\ReplaceInFiles.exe Configuration\Version.defs Configuration Utils\ReplaceInFiles\ReplaceInFiles.exe Configuration\Version.defs ReleaseGenerators\PascalABCNET_version.nsh.tmpl ReleaseGenerators\PascalABCNET_version.nsh Utils\ReplaceInFiles\ReplaceInFiles.exe Configuration\Version.defs Configuration\pabcversion.txt.tmpl Release\pabcversion.txt -call Studio.bat /t:rebuild "/property:Configuration=Release" PascalABCNET.sln +dotnet build -c Release --no-incremental PascalABCNET.sln @IF %ERRORLEVEL% NEQ 0 GOTO ERROR @@ -53,7 +53,7 @@ call PascalABCNET_ALL.bat cd .. -call Studio.bat /t:rebuild "/property:Configuration=Release" PascalABCNET.sln +dotnet build -c Release --no-incremental PascalABCNET.sln GOTO EXIT diff --git a/_GenerateLinuxVersion.bat b/_GenerateLinuxVersion.bat index 3663c83f3..d75ef002e 100644 --- a/_GenerateLinuxVersion.bat +++ b/_GenerateLinuxVersion.bat @@ -32,6 +32,17 @@ copy bin\OptimizerConversion.dll Release\PascalABCNETLinux\OptimizerConversion.d copy bin\LanguageIntegrator.dll Release\PascalABCNETLinux\LanguageIntegrator.dll copy bin\StringConstants.dll Release\PascalABCNETLinux\StringConstants.dll +copy bin\Microsoft.Bcl.HashCode.dll Release\PascalABCNETLinux\Microsoft.Bcl.HashCode.dll +copy bin\System.Buffers.dll Release\PascalABCNETLinux\System.Buffers.dll +copy bin\System.Collections.Immutable.dll Release\PascalABCNETLinux\System.Collections.Immutable.dll +copy bin\System.Formats.Nrbf.dll Release\PascalABCNETLinux\System.Formats.Nrbf.dll +copy bin\System.Memory.dll Release\PascalABCNETLinux\System.Memory.dll +copy bin\System.Numerics.Vectors.dll Release\PascalABCNETLinux\System.Numerics.Vectors.dll +copy bin\System.Reflection.Metadata.dll Release\PascalABCNETLinux\System.Reflection.Metadata.dll +copy bin\System.Resources.Extensions.dll Release\PascalABCNETLinux\System.Resources.Extensions.dll +copy bin\System.Runtime.CompilerServices.Unsafe.dll Release\PascalABCNETLinux\System.Runtime.CompilerServices.Unsafe.dll +copy bin\System.ValueTuple.dll Release\PascalABCNETLinux\System.ValueTuple.dll + copy bin\pabcnetc.exe Release\PascalABCNETLinux\pabcnetc.exe copy bin\pabcnetc.exe.config Release\PascalABCNETLinux\pabcnetc.exe.config copy bin\pabcnetcclear.exe Release\PascalABCNETLinux\pabcnetcclear.exe diff --git a/_ReBuildDebug.bat b/_ReBuildDebug.bat index c0fb737b9..d0b382958 100644 --- a/_ReBuildDebug.bat +++ b/_ReBuildDebug.bat @@ -1,3 +1,3 @@ -call Studio.bat /t:rebuild PascalABCNET.sln +dotnet build --no-incremental PascalABCNET.sln @IF %ERRORLEVEL% NEQ 0 PAUSE \ No newline at end of file diff --git a/_ReBuildRelease.bat b/_ReBuildRelease.bat index d550824e5..f5a446568 100644 --- a/_ReBuildRelease.bat +++ b/_ReBuildRelease.bat @@ -1,3 +1,3 @@ -call Studio.bat /t:rebuild /verbosity:d "/property:Configuration=Release" PascalABCNET.sln +dotnet build -c Release --no-incremental -v d PascalABCNET.sln @IF %ERRORLEVEL% NEQ 0 PAUSE \ No newline at end of file diff --git a/_RebuildDebugAndBuildUnits.bat b/_RebuildDebugAndBuildUnits.bat index 96e02e87c..e9ec66adb 100644 --- a/_RebuildDebugAndBuildUnits.bat +++ b/_RebuildDebugAndBuildUnits.bat @@ -1,4 +1,4 @@ -call Studio.bat /t:rebuild "/property:Configuration=Debug" "/p:Platform=Any CPU" PascalABCNET.sln +dotnet build --no-incremental PascalABCNET.sln @IF %ERRORLEVEL% NEQ 0 GOTO ERROR diff --git a/_RebuildRelease.sh b/_RebuildRelease.sh index 184111ed9..6ba36b141 100644 --- a/_RebuildRelease.sh +++ b/_RebuildRelease.sh @@ -3,8 +3,8 @@ cd Utils/DefaultLanguageResMaker mono LanguageResMaker.exe cd ../.. -MONO_IOMAP=case msbuild /p:Configuration=Release pabcnetc.sln -MONO_IOMAP=case msbuild /p:Configuration=Release PascalABCNETLinux.sln +dotnet build -c Release --no-incremental pabcnetc.sln +dotnet build -c Release --no-incremental PascalABCNETLinux.sln mono --aot bin/pabcnetc.exe mono --aot bin/NETGenerator.dll mono --aot bin/TreeConverter.dll @@ -19,6 +19,6 @@ mono --aot bin/Errors.dll mono --aot bin/LanguageIntegrator.dll mono --aot bin/StringConstants.dll mono --aot bin/PascalABCLanguageInfo.dll -export MONO_IOMAP=all + cd ReleaseGenerators mono ../bin/pabcnetc.exe RebuildStandartModulesMono.pas /rebuild diff --git a/_RebuildReleaseAndBuildUnits.bat b/_RebuildReleaseAndBuildUnits.bat index a5613c8df..89312ba05 100644 --- a/_RebuildReleaseAndBuildUnits.bat +++ b/_RebuildReleaseAndBuildUnits.bat @@ -1,4 +1,4 @@ -call Studio.bat /t:rebuild "/property:Configuration=Release" "/p:Platform=Any CPU" PascalABCNET.sln +dotnet build -c Release --no-incremental PascalABCNET.sln @IF %ERRORLEVEL% NEQ 0 GOTO ERROR diff --git a/_RebuildReleaseAndRunTests.bat b/_RebuildReleaseAndRunTests.bat index fd38b5e08..32a646e47 100644 --- a/_RebuildReleaseAndRunTests.bat +++ b/_RebuildReleaseAndRunTests.bat @@ -1,4 +1,4 @@ -call Studio.bat /t:rebuild "/property:Configuration=Release" "/p:Platform=Any CPU" PascalABCNET.sln +dotnet build -c Release --no-incremental PascalABCNET.sln @IF %ERRORLEVEL% NEQ 0 GOTO ERROR diff --git a/_RebuildReleaseAndRunTests.sh b/_RebuildReleaseAndRunTests.sh index f4d711cb1..681dcce57 100755 --- a/_RebuildReleaseAndRunTests.sh +++ b/_RebuildReleaseAndRunTests.sh @@ -3,8 +3,8 @@ cd Utils/DefaultLanguageResMaker mono LanguageResMaker.exe cd ../.. -MONO_IOMAP=case msbuild /p:Configuration=Release pabcnetc.sln -MONO_IOMAP=case msbuild /p:Configuration=Release PascalABCNETLinux.sln +dotnet build -c Release --no-incremental pabcnetc.sln +dotnet build -c Release --no-incremental PascalABCNETLinux.sln mono --aot bin/pabcnetc.exe mono --aot bin/NETGenerator.dll mono --aot bin/TreeConverter.dll @@ -19,7 +19,7 @@ mono --aot bin/Errors.dll mono --aot bin/LanguageIntegrator.dll mono --aot bin/StringConstants.dll mono --aot bin/PascalABCLanguageInfo.dll -export MONO_IOMAP=all + cd ReleaseGenerators mono ../bin/pabcnetc.exe RebuildStandartModulesMono.pas /rebuild if [ $? -eq 0 ]; then diff --git a/_RebuildReleaseAndRunTestsForGitHubActions.bat b/_RebuildReleaseAndRunTestsForGitHubActions.bat index 2a54bc99c..e2b625417 100644 --- a/_RebuildReleaseAndRunTestsForGitHubActions.bat +++ b/_RebuildReleaseAndRunTestsForGitHubActions.bat @@ -1,4 +1,4 @@ -call Studio.bat /t:rebuild "/property:Configuration=Release" "/p:Platform=Any CPU" PascalABCNET.sln +dotnet build -c Release PascalABCNET.sln @IF %ERRORLEVEL% NEQ 0 GOTO ERROR diff --git a/pabcnetc/PABCNETC.csproj b/pabcnetc/PABCNETC.csproj index 1fcc8d674..a0a67f215 100644 --- a/pabcnetc/PABCNETC.csproj +++ b/pabcnetc/PABCNETC.csproj @@ -1,174 +1,34 @@  - + - Local - 8.0.50727 - 2.0 - {2AEF58A1-2BCF-4C4B-AB03-F44BBB2628E6} - Debug - AnyCPU - App.ico - - - pabcnetc - - - JScript - Grid - IE50 - false + net40 Exe PascalABCCompiler - OnBuildSuccess - - - - - - - 4.0 - v4.0 - - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - false - true - - + + App.ico + ..\bin\ - false - 285212672 - false - - - DEBUG;TRACE - - - true - 4096 - false - - - false - false - false - false - 4 - full - prompt - AllRules.ruleset - true - - - ..\bin\ - false - 285212672 - false - - - TRACE - - - false - 4096 - false - - - true - false - false - false - 4 - none - prompt - AllRules.ruleset + false + pabcnetc + + false + + false - - System - - - System.Data - - - System.XML - - - Compiler - {1E42361A-EDA3-4872-88AF-A3AAF600D36D} - {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - - - {A25D26FB-3043-4BCF-833E-E3F4C3BE795E} - CompilerTools - - - {44A01F9E-DCE7-470C-AAE5-C3DE0CCBEE3B} - Errors - - - {2DE2842F-0912-4251-BC0F-480854C44A13} - Localization - - - {a48d9069-d569-4110-9252-a10f139b669b} - LanguageIntegrator - - - {AF2EFD7B-69DD-4B43-AF65-B59B29349C23} - ParserTools - - - {C2CAC65A-B2AE-4CCC-B067-E6B8E75DF73A} - SyntaxTree - + - - Code - - - - Code - + - + + + + + + + - - - False - Клиентский профиль .NET Framework 3.5 SP1 - false - - - False - .NET Framework 3.5 SP1 - true - - - False - Установщик Windows 3.1 - true - - - - - - - - - \ No newline at end of file diff --git a/pabcnetc_clear/PABCNETCclear.csproj b/pabcnetc_clear/PABCNETCclear.csproj index 15d4b5345..554257f2d 100644 --- a/pabcnetc_clear/PABCNETCclear.csproj +++ b/pabcnetc_clear/PABCNETCclear.csproj @@ -1,168 +1,28 @@  - + - Local - 9.0.30729 - 2.0 - {146083AD-6684-4EBC-A539-AAD749A16364} - Debug - AnyCPU - App.ico - - - pabcnetcclear - JScript - Grid - IE50 - false + net40 Exe PascalABCCompiler - OnBuildSuccess - - - - - 3.5 - true - v4.0 - - http://localhost/pabcnetcclear/ - true - Web - true - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - true - - + + App.ico + ..\bin\ - 285212672 - - - DEBUG;TRACE - - - true - 4096 - false - false - false - 4 - full - prompt - AllRules.ruleset - true - - - ..\bin\ - 285212672 - - - TRACE - - - 4096 - true - false - false - 4 - none - prompt - AllRules.ruleset + false + pabcnetcclear + + false + false - - System - - - System.Data - - - System.XML - - - False - D:\PascalABC.NET\!PABC_SVN\bin\CompilerTools.dll - - - False - D:\PascalABC.NET\!PABC_SVN\bin\Errors.dll - - - False - D:\PascalABC.NET\!PABC_SVN\bin\Localization.dll - - - False - D:\PascalABC.NET\!PABC_SVN\bin\ParserTools.dll - - - False - D:\PascalABC.NET\!PABC_SVN\bin\SyntaxTree.dll - + - - Code - - - - Code - + - - False - Клиентский профиль .NET Framework 3.5 SP1 - false - - - False - .NET Framework 2.0 %28x86%29 - true - - - False - .NET Framework 3.0 %28x86%29 - false - - - False - .NET Framework 3.5 - false - - - False - .NET Framework 3.5 SP1 - false - + + - - - - - - {1e42361a-eda3-4872-88af-a3aaf600d36d} - Compiler - - - {a48d9069-d569-4110-9252-a10f139b669b} - LanguageIntegrator - - - - - - - - - \ No newline at end of file