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

bug fix #2143

Browse source
This commit is contained in:
Бондарев Иван 2020-06-29 22:01:14 +02:00
parent 5e89c96a0f
commit 735e051a87
4 changed files with 42 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
TestSuite/CompilationSamples/LibWithoutNamespace.dll Normal file
View file

Binary file not shown.

6
TestSuite/CompilationSamples/use_lib_without_namespace.pas Normal file
View file

@ -0,0 +1,6 @@
{$reference LibWithoutNamespace.dll}
begin
var o: MyClass;
var o2: MyClass;
assert(MyClass.Test = 1);
end.

BIN
TestSuite/LibWithoutNamespace.dll Normal file
View file

Binary file not shown.

38
TreeConverter/NetWrappers/NetHelper.cs
View file

@ -57,11 +57,13 @@ namespace PascalABCCompiler.NetHelper
{
foreach (using_namespace un in unl)
{
if (string.Compare(un.namespace_name, tni.us_ns.namespace_name, true) == 0)
if (tni.us_ns != null && string.Compare(un.namespace_name, tni.us_ns.namespace_name, true) == 0)
{
return tni.type_info;
}
}
if (tni.us_ns == null)
return tni.type_info;
}
return null;
}
@ -73,11 +75,13 @@ namespace PascalABCCompiler.NetHelper
{
foreach (using_namespace un in unl)
{
if (string.Compare(un.namespace_name, tni.us_ns.namespace_name, true) == 0)
if (tni.us_ns != null && string.Compare(un.namespace_name, tni.us_ns.namespace_name, true) == 0)
{
types.Add(tni.type_info);
}
}
if (tni.us_ns == null)
types.Add(tni.type_info);
}
return types;
}
@ -1964,6 +1968,22 @@ namespace PascalABCCompiler.NetHelper
if (o is TypeInfo)
{
TypeInfo t = o as TypeInfo;
if (t.type.FullName != null && t.type.FullName.IndexOf('.') == -1 && t.type.FullName.IndexOf('+') == -1)
{
if (!type_search_cache.TryGetValue(name, out fi))
{
fi = new FoundInfo(true, t);
type_search_cache[name] = fi;
}
else
{
fi.type_infos.Add(new TypeNamespaceInfo(t, null));
}
if (cur_used_assemblies.ContainsKey(t.type.Assembly))
return t.type;
else
return null;
}
for (int i = 0; i < _unar.Count; i++)
{
if (string.Compare(_unar[i].namespace_name + "." + name, t.FullName, true) == 0)
@ -1990,6 +2010,20 @@ namespace PascalABCCompiler.NetHelper
{
foreach (TypeInfo t in o as List<TypeInfo>)
{
if (t.type.FullName != null && t.type.FullName.IndexOf('.') == -1 && t.type.FullName.IndexOf('+') == -1)
{
if (!type_search_cache.TryGetValue(name, out fi))
{
fi = new FoundInfo(true, t, null);
type_search_cache[name] = fi;
}
else
{
fi.type_infos.Add(new TypeNamespaceInfo(t, null));
}
if (cur_used_assemblies.ContainsKey(t.type.Assembly))
return t.type;
}
for (int i = 0; i < _unar.Count; i++)
{
if (string.Compare(_unar[i].namespace_name + "." + name, t.FullName, true) == 0)