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

bug fix #151

Browse source
This commit is contained in:
Бондарев Иван 2016-04-28 20:33:40 +02:00
parent b3ae185e96
commit 0534187ee1
1 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
NETGenerator/NETGenerator.cs
View file

@ -1455,10 +1455,20 @@ namespace PascalABCCompiler.NETGenerator
ICommonClassFieldNode icfn = dn as ICommonClassFieldNode;
if (icfn != null)
{
FieldInfo finfo = helper.GetField(icfn).fi;
Type ftype = GetTypeOfGenericInstanceField(t, finfo);
FieldInfo fi = TypeBuilder.GetField(t, finfo);
helper.AddGenericField(value.used_members[dn] as ICommonClassFieldNode, fi, ftype);
FldInfo fldinfo = helper.GetField(icfn);
if (!(fldinfo is GenericFldInfo))
{
FieldInfo finfo = fldinfo.fi;
Type ftype = GetTypeOfGenericInstanceField(t, finfo);
FieldInfo fi = TypeBuilder.GetField(t, finfo);
helper.AddGenericField(value.used_members[dn] as ICommonClassFieldNode, fi, ftype);
}
else
{
FieldInfo finfo = fldinfo.fi;
FieldInfo fi = finfo;
helper.AddGenericField(value.used_members[dn] as ICommonClassFieldNode, fi, (fldinfo as GenericFldInfo).field_type);
}
continue;
}
}