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

#2705

Browse source
This commit is contained in:
Ivan Bondarev 2022-09-11 11:02:39 +02:00
parent 2f1458834d
commit 058f4785e6
3 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
TestSuite/enum8.pas Normal file
View file

@ -0,0 +1,9 @@
type
enum1 = (
v1 = 1,
v2 = v1
);
begin
assert(v2 = v1);
end.

2
TreeConverter/TreeConversion/convertion_data_and_alghoritms.cs
View file

@ -682,6 +682,8 @@ namespace PascalABCCompiler.TreeConverter
} }
else if (en.type is undefined_type && en is base_function_call bfc) else if (en.type is undefined_type && en is base_function_call bfc)
throw new SimpleSemanticError(loc, "RETURN_TYPE_UNDEFINED_{0}", bfc.function.name); throw new SimpleSemanticError(loc, "RETURN_TYPE_UNDEFINED_{0}", bfc.function.name);
else if (en is enum_const_node && (en as enum_const_node).constant_value != 0)
return new int_const_node((en as enum_const_node).constant_value, loc);
else AddError(new CanNotConvertTypes(en, en.type, to, loc)); else AddError(new CanNotConvertTypes(en, en.type, to, loc));
} }

6
TreeConverter/TreeConversion/syntax_tree_visitor.cs
View file

@ -1112,6 +1112,12 @@ namespace PascalABCCompiler.TreeConverter
type_node left_type = left.type; type_node left_type = left.type;
type_node right_type = right.type; type_node right_type = right.type;
if (left_type == null && left is enum_const_node)
{
left_type = SystemLibrary.SystemLibrary.integer_type;
left.type = left_type;
}
if (left_type.semantic_node_type == semantic_node_type.delegated_method) if (left_type.semantic_node_type == semantic_node_type.delegated_method)
{ {