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

Added comments, LambdaDefScope was renamed to CurrentLambdaDefScope

Browse source
This commit is contained in:
Terky 2019-04-26 20:02:09 +03:00
parent c16108b3cd
commit 80a9d38313
1 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
TreeConverter/SymbolTable/DSST/SymbolTable.cs
View file

@ -447,18 +447,20 @@ namespace SymbolTable
//В ClassMethodScope TopScope должен быть классом
public class ClassMethodScope:Scope
{
public Scope DefScope;
public Scope DefScope;
// aab 26.04.19 Добавил для исправления захвата переменных в лямбде
// Для лямбды нужен обратный порядок поиска звхваченных переменных: сначала в месте определения, потом в классе
public Scope CurrentLambdaDefScope;
public Scope LambdaDefScope;
public ClassMethodScope(DSSymbolTable vSymbolTable, Scope TopScope, Scope DefScope, Scope LambdaDefScope, string Name):
public ClassMethodScope(DSSymbolTable vSymbolTable, Scope TopScope, Scope DefScope, Scope CurrentLambdaDefScope, string Name):
base(vSymbolTable,TopScope, Name)
{
this.Name = Name;
this.DefScope = null;
if (DefScope != null)
this.DefScope = DefScope;
this.LambdaDefScope = LambdaDefScope;
this.CurrentLambdaDefScope = CurrentLambdaDefScope;
}
}
#endregion
@ -686,9 +688,9 @@ namespace SymbolTable
{
return new UnitImplementationScope(this, InterfaceScope, UsedUnits, Name);
}
public ClassMethodScope CreateClassMethodScope(Scope TopScope, Scope DefScope, Scope LambdaDefScope = null, string Name = "")
public ClassMethodScope CreateClassMethodScope(Scope TopScope, Scope DefScope, Scope CurrentLambdaDefScope = null, string Name = "")
{
return new ClassMethodScope(this, TopScope, DefScope, LambdaDefScope, Name);
return new ClassMethodScope(this, TopScope, DefScope, CurrentLambdaDefScope, Name);
}
#endregion
@ -1130,16 +1132,19 @@ namespace SymbolTable
}
if (CurrentArea is ClassMethodScope)//мы очутились в методе класса
{
var lambdaDefScope = (CurrentArea as ClassMethodScope).LambdaDefScope;
if (lambdaDefScope != null)
// aab 26.04.19 begin
// Сначала ищем в скоупе где была объявлена лямбда
var currentLambdaDefScope = (CurrentArea as ClassMethodScope).CurrentLambdaDefScope;
if (currentLambdaDefScope != null)
{
var defScopeRes = FindAll(lambdaDefScope, Name, OnlyInType, OnlyInThisClass, lambdaDefScope);
var defScopeRes = FindAll(currentLambdaDefScope, Name, OnlyInType, OnlyInThisClass, currentLambdaDefScope);
if (defScopeRes != null && defScopeRes.Count > 0)
{
return defScopeRes;
}
}
// aab 26.04.19 end
FindAllInClass(Name, (CurrentArea as ClassMethodScope).TopScope, OnlyInThisClass, Result);//надо сделать поиск по его классу