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

bug fix issue #26

Browse source
This commit is contained in:
Бондарев Иван 2015-12-27 13:24:25 +01:00
parent e04cc45970
commit dbc25039b6
2 changed files with 27 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
TestSuite/extensionmethods12.pas Normal file
View file

@ -0,0 +1,3 @@
begin
assert('a23hh5'.Count(c->c.IsDigit)=3);
end.

30
TreeConverter/TreeConversion/convertion_data_and_alghoritms.cs
View file

@ -1878,12 +1878,30 @@ namespace PascalABCCompiler.TreeConverter
possible_type_convertions_list_list tcll = new possible_type_convertions_list_list(); possible_type_convertions_list_list tcll = new possible_type_convertions_list_list();
for(int i=0;i<set_of_possible_functions.Count;i++) for (int i = 0; i < set_of_possible_functions.Count; i++)
{ {
possible_type_convertions_list tc=get_conversions(parameters,set_of_possible_functions[i].parameters, possible_type_convertions_list tc = get_conversions(parameters, set_of_possible_functions[i].parameters,
is_alone_method_defined,loc); is_alone_method_defined, loc);
tcll.AddElement(tc); //fix dlja lambd i extension metodov (c->c.IsDigit)
} if (tc == null)
{
expressions_list el = new expressions_list();
el.AddRange(parameters);
bool has_lambda_var = false;
for (int k = 0; k < el.Count; k++)
{
if (el[k] is local_variable_reference && el[k].type is delegated_methods && (el[k].type as delegated_methods).empty_param_method != null)
{
el[k].type = (el[k].type as delegated_methods).empty_param_method.ret_type;
has_lambda_var = true;
}
}
if (has_lambda_var)
tc = get_conversions(el, set_of_possible_functions[i].parameters,
is_alone_method_defined, loc);
}
tcll.AddElement(tc);
}
int j=0; int j=0;
while(j<set_of_possible_functions.Count) while(j<set_of_possible_functions.Count)