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

bug fix #235

Browse source
This commit is contained in:
Бондарев Иван 2016-07-15 21:13:17 +02:00
parent 42141bb71d
commit 995b25c4f9
1 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
NETGenerator/NETGenerator.cs
View file

@ -1316,8 +1316,16 @@ namespace PascalABCCompiler.NETGenerator
{
ConvertTypeMemberHeaderAndRemoveFromList(ts[0], ts);
}
//foreach (ICommonTypeNode t in types)
// ConvertTypeMemberHeader(t);
foreach (ICommonTypeNode t in types)
{
foreach (ICommonMethodNode meth in t.methods)
{
if (meth.is_generic_function)
{
ConvertTypeInstancesMembersInFunction(meth);
}
}
}
}
private Dictionary<TypeBuilder, TypeBuilder> added_types = new Dictionary<TypeBuilder, TypeBuilder>();
@ -1611,7 +1619,6 @@ namespace PascalABCCompiler.NETGenerator
private void ConvertTypeMemberHeader(ICommonTypeNode value)
{
//если это оболочка над массивом переводим ее особым образом
if (value.type_special_kind == type_special_kind.diap_type || value.type_special_kind == type_special_kind.array_kind) return;
if (value.fields.Length == 1 && value.fields[0].type is ISimpleArrayNode)
{
@ -1658,13 +1665,13 @@ namespace PascalABCCompiler.NETGenerator
evnt.visit(this);
//(ssyy) 21.05.2008
foreach (ICommonMethodNode meth in value.methods)
/*foreach (ICommonMethodNode meth in value.methods)
{
if (meth.is_generic_function)
{
ConvertTypeInstancesMembersInFunction(meth);
}
}
}*/
//добавляем ритерны в специальные методы
//ti.init_meth.GetILGenerator().Emit(OpCodes.Ret);
//if (hndl_mb != null) hndl_mb.GetILGenerator().Emit(OpCodes.Ret);
@ -1693,13 +1700,13 @@ namespace PascalABCCompiler.NETGenerator
foreach (ICommonEventNode evnt in value.events)
evnt.visit(this);
//(ssyy) 21.05.2008
foreach (ICommonMethodNode meth in value.methods)
/*foreach (ICommonMethodNode meth in value.methods)
{
if (meth.is_generic_function)
{
ConvertTypeInstancesMembersInFunction(meth);
}
}
}*/
}