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

fix #1996

Browse source
This commit is contained in:
Mikhalkovich Stanislav 2019-06-19 14:41:20 +03:00
parent d6bef4694d
commit fe54b731c8
7 changed files with 859 additions and 844 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Parsers/PascalABCParserNewSaushkin/ABCPascal.cs
View file

@ -1,9 +1,9 @@
// //
// This CSharp output file generated by Gardens Point LEX // This CSharp output file generated by Gardens Point LEX
// Version: 1.1.3.301 // Version: 1.1.3.301
// Machine: DESKTOP-IF20NRO // Machine: DESKTOP-G8V08V4
// DateTime: 6/19/2019 11:22:12 AM // DateTime: 19.06.2019 14:36:10
// UserName: FatCow // UserName: ?????????
// GPLEX input file <ABCPascal.lex> // GPLEX input file <ABCPascal.lex>
// GPLEX frame file <embedded resource> // GPLEX frame file <embedded resource>
// //

12
Parsers/PascalABCParserNewSaushkin/ABCPascal.y
View file

@ -4677,10 +4677,14 @@ common_lambda_body
{ {
$$ = new statement_list($1 as statement, @$); $$ = new statement_list($1 as statement, @$);
} }
/*| yield_stmt | raise_stmt
{ {
$$ = new statement_list($1 as statement, @$); $$ = new statement_list($1 as statement, @$);
}*/ }
| yield_stmt
{
parsertools.AddErrorFromResource("YIELD_STATEMENT_CANNOT_BE_USED_IN_LAMBDA_BODY", @$);
}
; ;
@ -4711,10 +4715,6 @@ lambda_procedure_body
{ {
$$ = new statement_list($1 as statement, @$); $$ = new statement_list($1 as statement, @$);
} }
| raise_stmt
{
$$ = new statement_list($1 as statement, @$);
}
| common_lambda_body | common_lambda_body
{ {
$$ = $1; $$ = $1;

1674
Parsers/PascalABCParserNewSaushkin/ABCPascalYacc.cs
View file

File diff suppressed because it is too large Load diff

1
Parsers/PascalABCParserNewSaushkin/PABC.ymc
View file

@ -243,5 +243,6 @@ script=

4
TestSuite/Lambda_body_raise.pas Normal file
View file

@ -0,0 +1,4 @@
begin
var p: procedure :=
()->raise new Exception;
end.

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

@ -73,3 +73,4 @@ STATIC_PROPERTIES_CANNOT_HAVE_ATTRBUTE_{0}=Static properties cannot have attribu
RESULT_IDENT_NOT_EXPECTED_IN_THIS_CONTEXT=Result identifier is not allowed in this context RESULT_IDENT_NOT_EXPECTED_IN_THIS_CONTEXT=Result identifier is not allowed in this context
NESTED_RECORD_DEFINITIONS_ARE_ARE_FORBIDDEN=Nested record definitions are forbidden NESTED_RECORD_DEFINITIONS_ARE_ARE_FORBIDDEN=Nested record definitions are forbidden
NIL_IN_UNNAMED_OBJECT=Anonymous class field cannot be initialized by nil constant NIL_IN_UNNAMED_OBJECT=Anonymous class field cannot be initialized by nil constant
YIELD_STATEMENT_CANNOT_BE_USED_IN_LAMBDA_BODY=yield statement cannot be used in lambda body

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

@ -74,3 +74,4 @@ STATIC_PROPERTIES_CANNOT_HAVE_ATTRBUTE_{0}=Статические свойств
RESULT_IDENT_NOT_EXPECTED_IN_THIS_CONTEXT=Имя Result недопустимо в этом контексте RESULT_IDENT_NOT_EXPECTED_IN_THIS_CONTEXT=Имя Result недопустимо в этом контексте
NESTED_RECORD_DEFINITIONS_ARE_FORBIDDEN=Вложенные описания записей запрещены NESTED_RECORD_DEFINITIONS_ARE_FORBIDDEN=Вложенные описания записей запрещены
NIL_IN_UNNAMED_OBJECT=Поле анонимного класса не может инициализироваться константой nil NIL_IN_UNNAMED_OBJECT=Поле анонимного класса не может инициализироваться константой nil
YIELD_STATEMENT_CANNOT_BE_USED_IN_LAMBDA_BODY=Оператор yield нельзя использовать в теле лямбда-выражения