diff --git a/Compiler/Compiler.cs b/Compiler/Compiler.cs index 762665a7d..8d7af484b 100644 --- a/Compiler/Compiler.cs +++ b/Compiler/Compiler.cs @@ -1682,7 +1682,7 @@ namespace PascalABCCompiler { PrepareCompileOptionsForProject(); } - Environment.CurrentDirectory = CompilerOptions.SourceFileDirectory; + //Environment.CurrentDirectory = CompilerOptions.SourceFileDirectory; Units = new PascalABCCompiler.TreeRealization.unit_node_list(); CurrentSyntaxUnit = new SyntaxTree.uses_unit_in(new SyntaxTree.string_const(CompilerOptions.SourceFileName)); CompileUnit(Units, CurrentSyntaxUnit); @@ -2370,11 +2370,11 @@ namespace PascalABCCompiler } //\MikhailoMMX - if (System.IO.File.Exists(FileName)) + /*if (System.IO.File.Exists(FileName)) { return FileName;//.ToLower();//? а надо ли tolover? } - else + else*/ { string name = get_assembly_path(FileName,false);//? а надо ли tolover? if (name == null) diff --git a/Configuration/GlobalAssemblyInfo.cs b/Configuration/GlobalAssemblyInfo.cs index 8792b2c23..5d5b5fdd5 100644 --- a/Configuration/GlobalAssemblyInfo.cs +++ b/Configuration/GlobalAssemblyInfo.cs @@ -15,7 +15,7 @@ internal static class RevisionClass public const string Major = "3"; public const string Minor = "0"; public const string Build = "0"; - public const string Revision = "1052"; + public const string Revision = "1055"; public const string MainVersion = Major + "." + Minor; public const string FullVersion = Major + "." + Minor + "." + Build + "." + Revision; diff --git a/Configuration/Version.defs b/Configuration/Version.defs index a1971def2..8ed27ad4b 100644 --- a/Configuration/Version.defs +++ b/Configuration/Version.defs @@ -1,4 +1,4 @@ -%MINOR%=0 -%REVISION%=1052 -%MAJOR%=3 %COREVERSION%=0 +%REVISION%=1055 +%MINOR%=0 +%MAJOR%=3 diff --git a/Localization/DefaultLang.resources b/Localization/DefaultLang.resources index 18828366c..fc59b9060 100644 Binary files a/Localization/DefaultLang.resources and b/Localization/DefaultLang.resources differ diff --git a/ReleaseGenerators/PascalABCNET_version.nsh b/ReleaseGenerators/PascalABCNET_version.nsh index fbd1c358f..a23ace764 100644 --- a/ReleaseGenerators/PascalABCNET_version.nsh +++ b/ReleaseGenerators/PascalABCNET_version.nsh @@ -1 +1 @@ -!define VERSION '3.0.0.1052' \ No newline at end of file +!define VERSION '3.0.0.1055' diff --git a/TreeConverter/TreeRealization/types.cs b/TreeConverter/TreeRealization/types.cs index 9d65c0c37..cb7e08f4d 100644 --- a/TreeConverter/TreeRealization/types.cs +++ b/TreeConverter/TreeRealization/types.cs @@ -3109,6 +3109,8 @@ namespace PascalABCCompiler.TreeRealization { SymbolInfo si = compiled_find(name); SymbolInfo si2 = find_in_additional_names(name); + /*if (name == "Clear") //статическая функция для массива при наличии такого кода не конкурирует с одноименным методом расширения для массивов. Как определить тут, что она статическая??? + si = null;*/ if (si == null && si2 == null && string.Compare(name,"Create",true) != 0) { compiled_type_node bas_type = base_type as compiled_type_node; diff --git a/bin/Lib/PABCRtl.dll b/bin/Lib/PABCRtl.dll index d971d4a15..9e3bf3436 100644 Binary files a/bin/Lib/PABCRtl.dll and b/bin/Lib/PABCRtl.dll differ