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

#2629

Browse source
This commit is contained in:
Ivan Bondarev 2022-02-06 10:40:44 +01:00
parent d10285c052
commit 7593c5a1d3
3 changed files with 25 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Compiler/PCU/PCUReader.cs
View file

@ -963,7 +963,13 @@ namespace PascalABCCompiler.PCU
return mi as FieldInfo;
//FieldInfo mi = t.GetField(pcu_file.dotnet_names[off].name);
List<MemberInfo> mis = NetHelper.NetHelper.GetMembers(t, pcu_file.dotnet_names[off].name);
FieldInfo fi = (FieldInfo)mis[0];
FieldInfo fi = null;
foreach (MemberInfo mi2 in mis)
if (mi2 is FieldInfo)
{
fi = (FieldInfo)mi2;
break;
}
dot_net_cache[off] = fi;
return fi;
}
@ -994,7 +1000,13 @@ namespace PascalABCCompiler.PCU
return mi as PropertyInfo;
//FieldInfo mi = t.GetField(pcu_file.dotnet_names[off].name);
List<MemberInfo> mis = NetHelper.NetHelper.GetMembers(t, pcu_file.dotnet_names[off].name);
PropertyInfo pi = (PropertyInfo)mis[0];
PropertyInfo pi = null;
foreach (MemberInfo mi2 in mis)
if (mi2 is PropertyInfo)
{
pi = (PropertyInfo)mi2;
break;
}
dot_net_cache[off] = pi;
return pi;
}

7
TestSuite/units/u_namedisambigous1.pas Normal file
View file

@ -0,0 +1,7 @@
unit u_namedisambigous1;
function fun: boolean;
begin
Result := System.Globalization.UnicodeCategory.Format = System.Globalization.UnicodeCategory.ClosePunctuation;
end;
end.

4
TestSuite/usesunits/use_namedisambigous1.pas Normal file
View file

@ -0,0 +1,4 @@
uses u_namedisambigous1;
begin
assert(not fun);
end.