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

bug fix #232

Browse source
This commit is contained in:
Бондарев Иван 2016-07-16 14:26:45 +02:00
parent 70d4a90aa6
commit ac0ce4b1be
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
NETGenerator/NETGenerator.cs
View file

@ -10150,7 +10150,7 @@ namespace PascalABCCompiler.NETGenerator
Type return_type = null; Type return_type = null;
bool is_generic = false; bool is_generic = false;
MethodInfo enumer_mi = null; //typeof(System.Collections.IEnumerable).GetMethod("GetEnumerator", Type.EmptyTypes); MethodInfo enumer_mi = null; //typeof(System.Collections.IEnumerable).GetMethod("GetEnumerator", Type.EmptyTypes);
/*if (var_tp.IsValueType) if (var_tp.IsValueType && !(in_what_type.IsArray && in_what_type.GetArrayRank() > 1))
{ {
enumer_mi = helper.GetEnumeratorMethod(in_what_type); enumer_mi = helper.GetEnumeratorMethod(in_what_type);
is_generic = enumer_mi.ReturnType.IsGenericType; is_generic = enumer_mi.ReturnType.IsGenericType;
@ -10160,7 +10160,7 @@ namespace PascalABCCompiler.NETGenerator
else if (in_what_type.IsArray && return_type.IsGenericType && !return_type.IsGenericTypeDefinition) else if (in_what_type.IsArray && return_type.IsGenericType && !return_type.IsGenericTypeDefinition)
return_type = return_type.GetGenericTypeDefinition().MakeGenericType(in_what_type.GetElementType()); return_type = return_type.GetGenericTypeDefinition().MakeGenericType(in_what_type.GetElementType());
} }
else*/ else
{ {
enumer_mi = typeof(System.Collections.IEnumerable).GetMethod("GetEnumerator", Type.EmptyTypes); enumer_mi = typeof(System.Collections.IEnumerable).GetMethod("GetEnumerator", Type.EmptyTypes);
return_type = enumer_mi.ReturnType; return_type = enumer_mi.ReturnType;