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

bug fix #173

Browse source
This commit is contained in:
Бондарев Иван 2016-05-29 11:27:25 +02:00
parent f8c68eeb56
commit c4b314821f
4 changed files with 36 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
TestSuite/extensionmethods14.pas
View file

@ -11,8 +11,6 @@ end;
begin
//var a := Arr(1,2,3);
//System.Linq.Enumerable.Select(a,x->x); - жаль - пока не работает. Закомментил чтобы тесты не падали
var a := Arr(1,2,3);
var seq := System.Linq.Enumerable.Select(a,x->x*2);
//a.Reverse.Print;

7
TestSuite/extensionmethods17.pas Normal file
View file

@ -0,0 +1,7 @@
begin
var s := '1234';
var fnc: char->boolean := char.IsDigit;
assert(s.All(fnc) = true);
assert(s.All&<char>(char.IsDigit) = true);
assert(s.All&<char>(char.IsControl) = false);
end.

17
TestSuite/with1.pas Normal file
View file

@ -0,0 +1,17 @@
type TClass = class
a: integer;
end;
begin
var obj := new TClass;
with obj do
begin
a := 2;
assert(a = 2);
end;
var lst := Lst(1,2,3);
with lst do
begin
assert(Count = 3);
end;
end.

21
TreeConverter/TreeConversion/syntax_tree_visitor.cs
View file

@ -8538,22 +8538,25 @@ namespace PascalABCCompiler.TreeConverter
}
case general_node_type.function_node:
{
//TODO: Передается пустой список выражений.
/*
function_node fn=convertion_data_and_alghoritms.select_function(new expressions_list(),
si_right,get_location(id_right));
return create_static_method_call(fn,get_location(id_right),tn,false);
*/
//if (!(si_right.sym_info is common_in_function_function_node))
if (dn is compiled_function_node)
{
if ((dn as compiled_function_node).ConnectedToType == tn)
AddError(new UndefinedNameReference(id_right.name, get_location(id_right)));
{
if (si_right.Next != null)
return create_static_expression(tn, id_right, si_right.Next);
else
AddError(new UndefinedNameReference(id_right.name, get_location(id_right)));
}
}
else if (dn is common_namespace_function_node)
{
if ((dn as common_namespace_function_node).ConnectedToType == tn)
AddError(new UndefinedNameReference(id_right.name, get_location(id_right)));
{
if (si_right.Next != null)
return create_static_expression(tn, id_right, si_right.Next);
else
AddError(new UndefinedNameReference(id_right.name, get_location(id_right)));
}
}
if (dn.semantic_node_type == semantic_node_type.indefinite_definition_node)
{