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

fix

Browse source
This commit is contained in:
andrewlord607 2017-05-30 22:44:10 +03:00
parent 31af590e95
commit 88ca93d34f
2 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Compiler/PCU/PCUReader.cs
View file

@ -467,10 +467,8 @@ namespace PascalABCCompiler.PCU
{
//PCUReturner.AddPCUReader((wrapped_definition_node)si.sym_info, this);
//si.access_level = access_level.al_public;
/*TODO: AddSymbol(SymbolInfoList)
* SymbolInfoList si2 = (cun.scope as WrappedUnitInterfaceScope).FindWithoutCreation(names[i].name);
si.Add(si2);*/
SymbolInfoList si2 = (cun.scope as WrappedUnitInterfaceScope).FindWithoutCreation(names[i].name);
//si.Add(si2);
Scope.AddSymbol(names[i].name, si);
}
else
@ -491,6 +489,7 @@ namespace PascalABCCompiler.PCU
if (tn.IsDelegate)
SystemLibrary.SystemLibrary.system_delegate_type.Scope.AddSymbol(names[i].name, si);
}
else
throw new NotSupportedException();
}

10
Compiler/PCU/PCUWrappers.cs
View file

@ -67,7 +67,7 @@ namespace PascalABCCompiler.PCU
if (wdn.is_synonim)
tsi.sym_info = wdn.PCUReader.CreateTypeSynonim(wdn.offset, name);
else
tsi.sym_info = wdn.PCUReader.CreateInterfaceMember(wdn.offset, name);
tsi.sym_info = wdn.PCUReader.CreateInterfaceMember(wdn.offset,name);
}
}
return si;
@ -155,11 +155,9 @@ namespace PascalABCCompiler.PCU
if (si == null)
si = SymbolTable.Find(PartialScope, name);
else
{
si.Add(SymbolTable.Find(PartialScope, name));
}
}
if (si == null) return null;
if (si == null) return si;
//если это заглушка, то разворачиваем сущность
foreach (SymbolInfoUnit tsi in si.InfoUnitList)
{
@ -201,7 +199,7 @@ namespace PascalABCCompiler.PCU
public SymbolInfoList FindWithoutCreation(string name)
{
return SymbolTable.FindOnlyInScope(this, name, false);
return SymbolTable.FindOnlyInScope(this,name, false);
}
}
@ -318,9 +316,7 @@ namespace PascalABCCompiler.PCU
if (si == null)
{
if (base_type != null && base_type.IsDelegate)
{
return base_type.find_in_type(name, CurrentScope, no_search_in_extension_methods);
}
return si;
}