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

bug fix #1440

Browse source
This commit is contained in:
miks1965 2018-11-05 14:57:36 +03:00
parent 6c31d30188
commit 088599c8d3
4 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
SyntaxTreeConverters/StandardSyntaxConverter.cs
View file

@ -80,6 +80,7 @@ namespace PascalABCCompiler.SyntaxTreeConverters
System.IO.File.AppendAllText(@"d:\\zzz4.txt",e.Message);
}*/
#endif
return root;

5
SyntaxVisitors/YieldVisitors/MarkMethodHasYieldVisitor.cs
View file

@ -65,6 +65,11 @@ namespace SyntaxVisitors
{
throw new SyntaxVisitorError("FUNCTIONS_WITH_YIELDS_CANNOT_CONTAIN_LOCAL_TYPE_DEFINITIONS", FirstTypeDeclaration.First().source_context);
}
var FirstInheritedIdent = ee.DescendantNodes().OfType<inherited_ident>(); // SSM bug fix #1440
if (FirstInheritedIdent.Count() > 0)
{
throw new SyntaxVisitorError("FUNCTIONS_WITH_YIELDS_CANNOT_CONTAIN_INHERITED_CALLS", FirstInheritedIdent.First().source_context);
}
}
}

1
bin/Lng/Eng/SyntaxTreeVisitorsErrors.dat
View file

@ -10,6 +10,7 @@ FUNCTIONS_WITH_YIELDS_CANNOT_CONTAIN_LOCK=Functions with yield cannot contain lo
FUNCTIONS_WITH_YIELDS_CANNOT_CONTAIN_TRY_EXCEPT_FINALLY=Functions with yield cannot contain try..except or try..finally statements
FUNCTIONS_WITH_YIELDS_CANNOT_CONTAIN_NESTED_SUBROUTINES=Functions with yield cannot contain nested subrotines or be nested
FUNCTIONS_WITH_YIELDS_CANNOT_CONTAIN_LOCAL_TYPE_DEFINITIONS=Functions with yield cannot contain local type definitions
FUNCTIONS_WITH_YIELDS_CANNOT_CONTAIN_INHERITED_CALLS=Functions with yield cannot contain calls of inherited methods
YIELDS_INSIDE_WITH_ARE_ILLEGAL=with statement cannot contain yields
LAMBDA_EXPRESSIONS_CANNOT_CONTAIN_YIELD=Lambda-expressions cannot contain yields

1
bin/Lng/Rus/SyntaxTreeVisitorsErrors.dat
View file

@ -10,6 +10,7 @@ FUNCTIONS_WITH_YIELDS_CANNOT_CONTAIN_LOCK=Функции с yield не могу
FUNCTIONS_WITH_YIELDS_CANNOT_CONTAIN_TRY_EXCEPT_FINALLY=Функции с yield не могут содержать блоков try..except и try..finally
FUNCTIONS_WITH_YIELDS_CANNOT_CONTAIN_NESTED_SUBROUTINES=Функции с yield не могут содержать вложенные подпрограммы и сами быть вложенными
FUNCTIONS_WITH_YIELDS_CANNOT_CONTAIN_LOCAL_TYPE_DEFINITIONS=Функции с yield не могут содержать локальные определения типов
FUNCTIONS_WITH_YIELDS_CANNOT_CONTAIN_INHERITED_CALLS=Функции с yield не могут содержать вызовы inherited методов
YIELDS_INSIDE_WITH_ARE_ILLEGAL=Оператор yield запрещен внутри with
LAMBDA_EXPRESSIONS_CANNOT_CONTAIN_YIELD=Лямбда-выражения не могут содержать yield