From 5f15134dab3ffbd0fa0c3275b413e53632a70645 Mon Sep 17 00:00:00 2001 From: Mikhalkovich Stanislav Date: Mon, 24 Jun 2019 15:43:25 +0300 Subject: [PATCH] fix #1989 --- Configuration/GlobalAssemblyInfo.cs | 2 +- Configuration/Version.defs | 4 +- .../PascalABCParserNewSaushkin/ABCPascal.cs | 2 +- .../PascalABCParserNewSaushkin/ABCPascal.y | 2 +- .../ABCPascalYacc.cs | 1864 ++++++++--------- Parsers/PascalABCParserNewSaushkin/PABC.ymc | 1 + ReleaseGenerators/PascalABCNET_version.nsh | 2 +- TestSuite/lambda_lambda.pas | 10 + 8 files changed, 949 insertions(+), 938 deletions(-) create mode 100644 TestSuite/lambda_lambda.pas diff --git a/Configuration/GlobalAssemblyInfo.cs b/Configuration/GlobalAssemblyInfo.cs index 255c840ce..6798c93a6 100644 --- a/Configuration/GlobalAssemblyInfo.cs +++ b/Configuration/GlobalAssemblyInfo.cs @@ -15,7 +15,7 @@ internal static class RevisionClass public const string Major = "3"; public const string Minor = "5"; public const string Build = "0"; - public const string Revision = "2149"; + public const string Revision = "2150"; public const string MainVersion = Major + "." + Minor; public const string FullVersion = Major + "." + Minor + "." + Build + "." + Revision; diff --git a/Configuration/Version.defs b/Configuration/Version.defs index b7cc6243e..bb860dfc4 100644 --- a/Configuration/Version.defs +++ b/Configuration/Version.defs @@ -1,4 +1,4 @@ -%MINOR%=5 -%REVISION%=2149 %COREVERSION%=0 +%REVISION%=2150 +%MINOR%=5 %MAJOR%=3 diff --git a/Parsers/PascalABCParserNewSaushkin/ABCPascal.cs b/Parsers/PascalABCParserNewSaushkin/ABCPascal.cs index 8fae03c29..700583922 100644 --- a/Parsers/PascalABCParserNewSaushkin/ABCPascal.cs +++ b/Parsers/PascalABCParserNewSaushkin/ABCPascal.cs @@ -2,7 +2,7 @@ // This CSharp output file generated by Gardens Point LEX // Version: 1.1.3.301 // Machine: DESKTOP-G8V08V4 -// DateTime: 19.06.2019 14:36:10 +// DateTime: 24.06.2019 15:32:41 // UserName: ????????? // GPLEX input file // GPLEX frame file diff --git a/Parsers/PascalABCParserNewSaushkin/ABCPascal.y b/Parsers/PascalABCParserNewSaushkin/ABCPascal.y index fba301020..ef0c578f6 100644 --- a/Parsers/PascalABCParserNewSaushkin/ABCPascal.y +++ b/Parsers/PascalABCParserNewSaushkin/ABCPascal.y @@ -4689,7 +4689,7 @@ common_lambda_body lambda_function_body - : expr_l1 + : expr_l1_func_decl_lambda { var id = SyntaxVisitors.ExprHasNameVisitor.HasName($1, "Result"); if (id != null) diff --git a/Parsers/PascalABCParserNewSaushkin/ABCPascalYacc.cs b/Parsers/PascalABCParserNewSaushkin/ABCPascalYacc.cs index 203586240..75f5a2389 100644 --- a/Parsers/PascalABCParserNewSaushkin/ABCPascalYacc.cs +++ b/Parsers/PascalABCParserNewSaushkin/ABCPascalYacc.cs @@ -2,7 +2,7 @@ // GPPG version 1.3.6 // Machine: DESKTOP-G8V08V4 -// DateTime: 19.06.2019 14:36:11 +// DateTime: 24.06.2019 15:32:41 // UserName: ????????? // Input file @@ -166,7 +166,7 @@ public partial class GPPGParser: ShiftReduceParser expr_l1 + case 938: // lambda_function_body -> expr_l1_func_decl_lambda { var id = SyntaxVisitors.ExprHasNameVisitor.HasName(ValueStack[ValueStack.Depth-1].ex, "Result"); if (id != null) diff --git a/Parsers/PascalABCParserNewSaushkin/PABC.ymc b/Parsers/PascalABCParserNewSaushkin/PABC.ymc index 1ba42d12f..0d3253737 100644 --- a/Parsers/PascalABCParserNewSaushkin/PABC.ymc +++ b/Parsers/PascalABCParserNewSaushkin/PABC.ymc @@ -244,5 +244,6 @@ script= + diff --git a/ReleaseGenerators/PascalABCNET_version.nsh b/ReleaseGenerators/PascalABCNET_version.nsh index 54fc9b43e..bdf9a5502 100644 --- a/ReleaseGenerators/PascalABCNET_version.nsh +++ b/ReleaseGenerators/PascalABCNET_version.nsh @@ -1 +1 @@ -!define VERSION '3.5.0.2149' +!define VERSION '3.5.0.2150' diff --git a/TestSuite/lambda_lambda.pas b/TestSuite/lambda_lambda.pas new file mode 100644 index 000000000..1fdacd46c --- /dev/null +++ b/TestSuite/lambda_lambda.pas @@ -0,0 +1,10 @@ +begin + var f: ()->()->(); + + f := + ()->()->Assert(1=1); //Ошибка: Встречено ')', а ожидалось выражение + + var p := f(); + p; + +end. \ No newline at end of file