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

#2347

Browse source
This commit is contained in:
Ivan Bondarev 2021-01-05 20:06:56 +01:00
parent bc73af899e
commit 68a1a4f3c6
4 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
NETGenerator/NETGenerator.cs
View file

@ -2272,7 +2272,7 @@ namespace PascalABCCompiler.NETGenerator
TypeAttributes ta = (not_exist) ? ConvertAttributes(value) : TypeAttributes.NotPublic;
if (value.base_type is ICompiledTypeNode && (value.base_type as ICompiledTypeNode).compiled_type == TypeFactory.EnumType)
if (value.base_type is ICompiledTypeNode && (value.base_type as ICompiledTypeNode).compiled_type == TypeFactory.EnumType && gtpb == null)
{
ta = TypeAttributes.Public;
if (value.type_access_level == type_access_level.tal_internal)

11
TestSuite/where15.pas Normal file
View file

@ -0,0 +1,11 @@
uses System;
function ToEnum<T>(self: string): T; extensionmethod; where T: System.Enum;
begin
Result := T(Enum.Parse(typeof(T), self));
end;
begin
var color := 'Black'.ToEnum&<ConsoleColor>();
assert(color = ConsoleColor.Black);
end.

4
TreeConverter/TreeConversion/syntax_tree_visitor.cs
View file

@ -12743,10 +12743,10 @@ namespace PascalABCCompiler.TreeConverter
{
AddError(get_location(specificators[i]), "OBJECT_CAN_NOT_BE_USED_AS_PARENT_SPECIFICATOR");
}
if (spec_type == SystemLibrary.SystemLibrary.enum_base_type)
/*if (spec_type == SystemLibrary.SystemLibrary.enum_base_type)
{
AddError(get_location(specificators[i]), "ENUM_CAN_NOT_BE_USED_AS_PARENT_SPECIFICATOR");
}
}*/
if (spec_type.IsStatic)
AddError(get_location(specificators[i]), "STATIC_CLASS_CAN_NOT_BE_USED_AS_PARENT_SPECIFICATOR");
check_cycle_inheritance(param, spec_type);

2
TreeConverter/TreeRealization/generics.cs
View file

@ -166,7 +166,7 @@ namespace PascalABCCompiler.TreeRealization
return new SimpleSemanticError(null, "PARAMETER_{0}_MUST_BE_DERIVED_FROM_{1}", tn.PrintableName, base_type.name);
}
}
if (gpe.base_class != null && gpe.base_class != SystemLibrary.SystemLibrary.object_type && tn.is_value && !gpe.base_class.is_value && gpe.base_class != SystemLibrary.SystemLibrary.value_type)
if (gpe.base_class != null && gpe.base_class != SystemLibrary.SystemLibrary.object_type && tn.is_value && !gpe.base_class.is_value && gpe.base_class != SystemLibrary.SystemLibrary.value_type && gpe.base_class != SystemLibrary.SystemLibrary.enum_base_type)
{
return new SimpleSemanticError(null, "PARAMETER_{0}_MUST_BE_REFERENCE_TYPE", tn.PrintableName);
}