administrator/pascalabcnet
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Bug fix: var rs := s.Copy; теперь выдает ошибку компиляции

Browse source 
Bug fix: исправил падение на var rs := s.Join; Ошибка компиляции выдается корректно
This commit is contained in:
Бондарев Иван 2015-09-06 12:42:34 +02:00
parent 76c2019ee7
commit 93bffd1bf9
3 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
TestSuite/errors/err0210.pas Normal file
View file

@ -0,0 +1,4 @@
begin
var s: string;
var rs := s.Copy;
end.

5
TreeConverter/TreeConversion/CompilationErrors.cs
View file

@ -142,7 +142,10 @@ namespace PascalABCCompiler.TreeConverter
}
public override string ToString()
{
return string.Format(StringResources.Get(ErrResourceString), values);
if (values != null)
return string.Format(StringResources.Get(ErrResourceString), values);
else
return string.Format(StringResources.Get(ErrResourceString), "");
}
}

3
TreeConverter/TreeConversion/syntax_tree_visitor.cs
View file

@ -1542,7 +1542,8 @@ namespace PascalABCCompiler.TreeConverter
}
if (convertion_data_and_alghoritms.find_eq_method_in_list(fn, fnl) == null)
{
fnl.AddElement(fn);
if (!(obj != null && fn.polymorphic_state == SemanticTree.polymorphic_state.ps_static && !fn.is_extension_method))
fnl.AddElement(fn);
}
si = si.Next;
}