This commit is contained in:
Ivan Bondarev 2021-09-28 21:01:49 +02:00
parent 4de02c9f74
commit 0b72b74aff
2 changed files with 3 additions and 2 deletions

View file

@ -686,8 +686,7 @@ namespace PascalABCCompiler.TreeConverter
type_node conv_type = en.type;
expression_node expr = create_simple_function_call(pct.first.convertion_method, en.location, en);
expr.conversion_type = conv_type;
if (expr.type == en.type)
expr.type = to;
return expr;
}

View file

@ -18501,10 +18501,12 @@ namespace PascalABCCompiler.TreeConverter
if (ltr.first != null && rtl.first == null)
{
left = convertion_data_and_alghoritms.convert_type(left, right.type);
left.type = right.type;
}
else if (ltr.first == null && rtl.first != null)
{
right = convertion_data_and_alghoritms.convert_type(right, left.type);
right.type = left.type;
}
else
{