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

bug fix #386

Browse source
This commit is contained in:
Бондарев Иван 2017-04-30 13:47:55 +02:00
parent 098a44831a
commit d3ae32ead9
2 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
TestSuite/property3.pas Normal file
View file

@ -0,0 +1,7 @@
begin
var l: LinkedList<integer>;
l := new LinkedList<integer>;
l.AddLast(2);
var node := l.First;
assert(node.Value = 2);
end.

17
TreeConverter/TreeConversion/syntax_tree_visitor.cs
View file

@ -9167,7 +9167,7 @@ namespace PascalABCCompiler.TreeConverter
} }
case motivation.expression_evaluation: case motivation.expression_evaluation:
{ {
if (can_convert_to_method_call(si)) if (can_convert_to_method_call(ref si))
{ {
//dot_node dnode = new dot_node(syntax_node, template_id_right); //dot_node dnode = new dot_node(syntax_node, template_id_right);
template_id_right.name = new dot_node(syntax_node, id_right); template_id_right.name = new dot_node(syntax_node, id_right);
@ -9210,7 +9210,7 @@ namespace PascalABCCompiler.TreeConverter
} }
case motivation.expression_evaluation: case motivation.expression_evaluation:
{ {
if (can_convert_to_method_call(si)) if (can_convert_to_method_call(ref si))
{ {
dot_node dnode = new dot_node(syntax_node, id_right); dot_node dnode = new dot_node(syntax_node, id_right);
method_call mc = new method_call(dnode, new expression_list()); method_call mc = new method_call(dnode, new expression_list());
@ -9296,15 +9296,16 @@ namespace PascalABCCompiler.TreeConverter
throw new CompilerInternalError("Invalid left dot node kind"); throw new CompilerInternalError("Invalid left dot node kind");
} }
private bool can_convert_to_method_call(SymbolInfo si) private bool can_convert_to_method_call(ref SymbolInfo si)
{ {
while (si != null) SymbolInfo tmp_si = si;
while (tmp_si != null)
{ {
if (si.sym_info is function_node && (si.sym_info as function_node).is_extension_method && !has_property(ref si) if (tmp_si.sym_info is function_node && (tmp_si.sym_info as function_node).is_extension_method && !has_property(ref si)
|| si.sym_info is common_method_node && (si.sym_info as common_method_node).is_constructor || tmp_si.sym_info is common_method_node && (tmp_si.sym_info as common_method_node).is_constructor
|| si.sym_info is compiled_constructor_node) || tmp_si.sym_info is compiled_constructor_node)
return true; return true;
si = si.Next; tmp_si = tmp_si.Next;
} }
return false; return false;
} }