Обновление
This commit is contained in:
parent
248da671c3
commit
24e208c40c
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
%MINOR%=0
|
||||
%REVISION%=1052
|
||||
%MAJOR%=3
|
||||
%COREVERSION%=0
|
||||
%REVISION%=1055
|
||||
%MINOR%=0
|
||||
%MAJOR%=3
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -1 +1 @@
|
|||
!define VERSION '3.0.0.1052'
|
||||
!define VERSION '3.0.0.1055'
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
Binary file not shown.
Loading…
Reference in a new issue