From 3cca2a894940cf585772464d55ac5f4bcf8e01ae Mon Sep 17 00:00:00 2001
From: Ivan Bondarev <ibond84@googlemail.com>
Date: Wed, 21 Feb 2024 20:56:49 +0100
Subject: [PATCH] fix in formatter

---
 Parsers/PascalABCParserNewSaushkin/ABCPascal.cs    |  6 +++---
 Parsers/PascalABCParserNewSaushkin/ABCPascal.y     |  2 +-
 .../PascalABCParserNewSaushkin/ABCPascalYacc.cs    | 14 +++++++-------
 .../input/lambdas_with_brakets2.pas                |  5 +++++
 .../should/lambdas_with_brakets2.pas               |  5 +++++
 5 files changed, 21 insertions(+), 11 deletions(-)
 create mode 100644 TestSuite/formatter_tests/input/lambdas_with_brakets2.pas
 create mode 100644 TestSuite/formatter_tests/should/lambdas_with_brakets2.pas

diff --git a/Parsers/PascalABCParserNewSaushkin/ABCPascal.cs b/Parsers/PascalABCParserNewSaushkin/ABCPascal.cs
index 720357a02..a95e56b9c 100644
--- a/Parsers/PascalABCParserNewSaushkin/ABCPascal.cs
+++ b/Parsers/PascalABCParserNewSaushkin/ABCPascal.cs
@@ -1,9 +1,9 @@
 //
 //  This CSharp output file generated by Gardens Point LEX
 //  Version:  1.1.3.301
-//  Machine:  DESKTOP-G8V08V4
-//  DateTime: 06.01.2024 9:49:55
-//  UserName: ?????????
+//  Machine:  DESKTOP-2BJCJ7I
+//  DateTime: 21.02.2024 20:44:02
+//  UserName: ibond
 //  GPLEX input file <ABCPascal.lex>
 //  GPLEX frame file <embedded resource>
 //
diff --git a/Parsers/PascalABCParserNewSaushkin/ABCPascal.y b/Parsers/PascalABCParserNewSaushkin/ABCPascal.y
index e3168e0f9..65a9ea284 100644
--- a/Parsers/PascalABCParserNewSaushkin/ABCPascal.y
+++ b/Parsers/PascalABCParserNewSaushkin/ABCPascal.y
@@ -5091,7 +5091,7 @@ func_decl_lambda
 					idList.Add(idd2);
 				}	
 				var parsType = $5;
-				var formalPars = new formal_parameters(new typed_parameters(idList, parsType, parametr_kind.none, null, loc), LexLocation.MergeAll(@2,@3,@4,@5,@6));
+				var formalPars = new formal_parameters(new typed_parameters(idList, parsType, parametr_kind.none, null, LexLocation.MergeAll(@2,@3,@4,@5)), LexLocation.MergeAll(@2,@3,@4,@5,@6));
 				
 				if ($6 != null)
 					for (int i = 0; i < ($6 as formal_parameters).Count; i++)
diff --git a/Parsers/PascalABCParserNewSaushkin/ABCPascalYacc.cs b/Parsers/PascalABCParserNewSaushkin/ABCPascalYacc.cs
index 45cba2d30..3acbc3361 100644
--- a/Parsers/PascalABCParserNewSaushkin/ABCPascalYacc.cs
+++ b/Parsers/PascalABCParserNewSaushkin/ABCPascalYacc.cs
@@ -1,10 +1,10 @@
 // (see accompanying GPPGcopyright.rtf)
 
 // GPPG version 1.3.6
-// Machine:  DESKTOP-G8V08V4
-// DateTime: 06.01.2024 9:49:56
-// UserName: ?????????
-// Input file <D:\PABC_Git\Parsers\PascalABCParserNewSaushkin\ABCPascal.y>
+// Machine:  DESKTOP-2BJCJ7I
+// DateTime: 21.02.2024 20:44:03
+// UserName: ibond
+// Input file <ABCPascal.y>
 
 // options: no-lines gplex
 
@@ -60,7 +60,7 @@ public abstract class ScanBase : AbstractScanner<PascalABCSavParser.Union,LexLoc
 
 public partial class GPPGParser: ShiftReduceParser<PascalABCSavParser.Union, LexLocation>
 {
-  // Verbatim content from D:\PABC_Git\Parsers\PascalABCParserNewSaushkin\ABCPascal.y
+  // Verbatim content from ABCPascal.y
 // Э�?и об�?явления добавля�?�?ся в класс GPPGParser, п�?едс�?авля�?�?ий собой па�?се�?, гене�?и�?�?ем�?й сис�?емой gppg
     public syntax_tree_node root; // �?о�?невой �?зел син�?акси�?еского де�?ева 
 
@@ -72,7 +72,7 @@ public partial class GPPGParser: ShiftReduceParser<PascalABCSavParser.Union, Lex
 	public ParserLambdaHelper lambdaHelper = new ParserLambdaHelper();
 	
     public GPPGParser(AbstractScanner<PascalABCSavParser.Union, LexLocation> scanner) : base(scanner) { }
-  // End verbatim content from D:\PABC_Git\Parsers\PascalABCParserNewSaushkin\ABCPascal.y
+  // End verbatim content from ABCPascal.y
 
 #pragma warning disable 649
   private static Dictionary<int, string> aliasses;
@@ -7710,7 +7710,7 @@ public partial class GPPGParser: ShiftReduceParser<PascalABCSavParser.Union, Lex
 					idList.Add(idd2);
 				}	
 				var parsType = ValueStack[ValueStack.Depth-4].td;
-				var formalPars = new formal_parameters(new typed_parameters(idList, parsType, parametr_kind.none, null, loc), LexLocation.MergeAll(LocationStack[LocationStack.Depth-7],LocationStack[LocationStack.Depth-6],LocationStack[LocationStack.Depth-5],LocationStack[LocationStack.Depth-4],LocationStack[LocationStack.Depth-3]));
+				var formalPars = new formal_parameters(new typed_parameters(idList, parsType, parametr_kind.none, null, LexLocation.MergeAll(LocationStack[LocationStack.Depth-7],LocationStack[LocationStack.Depth-6],LocationStack[LocationStack.Depth-5],LocationStack[LocationStack.Depth-4])), LexLocation.MergeAll(LocationStack[LocationStack.Depth-7],LocationStack[LocationStack.Depth-6],LocationStack[LocationStack.Depth-5],LocationStack[LocationStack.Depth-4],LocationStack[LocationStack.Depth-3]));
 				
 				if (ValueStack[ValueStack.Depth-3].stn != null)
 					for (int i = 0; i < (ValueStack[ValueStack.Depth-3].stn as formal_parameters).Count; i++)
diff --git a/TestSuite/formatter_tests/input/lambdas_with_brakets2.pas b/TestSuite/formatter_tests/input/lambdas_with_brakets2.pas
new file mode 100644
index 000000000..d667c5b89
--- /dev/null
+++ b/TestSuite/formatter_tests/input/lambdas_with_brakets2.pas
@@ -0,0 +1,5 @@
+uses GraphWPF;
+
+begin
+OnMouseDown:=(x,y:real;mb:integer) -> begin end;
+end.
\ No newline at end of file
diff --git a/TestSuite/formatter_tests/should/lambdas_with_brakets2.pas b/TestSuite/formatter_tests/should/lambdas_with_brakets2.pas
new file mode 100644
index 000000000..aa1375a22
--- /dev/null
+++ b/TestSuite/formatter_tests/should/lambdas_with_brakets2.pas
@@ -0,0 +1,5 @@
+uses GraphWPF;
+
+begin
+  OnMouseDown := (x, y: real; mb: integer) -> begin end;
+end.
\ No newline at end of file