Доделал форматирование a..b

This commit is contained in:
Mikhalkovich Stanislav 2020-01-04 20:43:51 +03:00
parent 15d20463d7
commit 1c4b7b7636
9 changed files with 1136 additions and 569 deletions

View file

@ -3382,6 +3382,11 @@ namespace CodeFormatters
visit_node(_dot_question_node.left);
visit_node(_dot_question_node.right);
}
public override void visit(diapason_expr_new diap)
{
visit_node(diap.left);
visit_node(diap.right);
}
#endregion
}
}

View file

@ -15,7 +15,7 @@ internal static class RevisionClass
public const string Major = "3";
public const string Minor = "5";
public const string Build = "1";
public const string Revision = "2293";
public const string Revision = "2297";
public const string MainVersion = Major + "." + Minor;
public const string FullVersion = Major + "." + Minor + "." + Build + "." + Revision;

View file

@ -1,4 +1,4 @@
%MINOR%=5
%REVISION%=2293
%REVISION%=2297
%COREVERSION%=1
%MAJOR%=3

View file

@ -2,7 +2,7 @@
// This CSharp output file generated by Gardens Point LEX
// Version: 1.1.3.301
// Machine: DESKTOP-G8V08V4
// DateTime: 04.01.2020 10:28:07
// DateTime: 04.01.2020 20:22:59
// UserName: ?????????
// GPLEX input file <ABCPascal.lex>
// GPLEX frame file <embedded resource>

View file

@ -3123,7 +3123,12 @@ expr_l1
| question_expr
{ $$ = $1; }
| expr_l1 tkDotDot expr_dq
{ $$ = new diapason_expr_new($1,$3,@$); }
{
if (parsertools.build_tree_for_formatter)
$$ = new diapason_expr($1,$3,@$);
else
$$ = new diapason_expr_new($1,$3,@$);
}
;
expr_l1_func_decl_lambda

View file

@ -2,7 +2,7 @@
// GPPG version 1.3.6
// Machine: DESKTOP-G8V08V4
// DateTime: 04.01.2020 10:28:08
// DateTime: 04.01.2020 20:22:59
// UserName: ?????????
// Input file <ABCPascal.y>
@ -5441,7 +5441,12 @@ public partial class GPPGParser: ShiftReduceParser<PascalABCSavParser.Union, Lex
{ CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; }
break;
case 583: // expr_l1 -> expr_l1, tkDotDot, expr_dq
{ CurrentSemanticValue.ex = new diapason_expr_new(ValueStack[ValueStack.Depth-3].ex,ValueStack[ValueStack.Depth-1].ex,CurrentLocationSpan); }
{
if (parsertools.build_tree_for_formatter)
CurrentSemanticValue.ex = new diapason_expr(ValueStack[ValueStack.Depth-3].ex,ValueStack[ValueStack.Depth-1].ex,CurrentLocationSpan);
else
CurrentSemanticValue.ex = new diapason_expr_new(ValueStack[ValueStack.Depth-3].ex,ValueStack[ValueStack.Depth-1].ex,CurrentLocationSpan);
}
break;
case 584: // expr_l1_func_decl_lambda -> expr_l1
{ CurrentSemanticValue.ex = ValueStack[ValueStack.Depth-1].ex; }

View file

@ -1 +1 @@
3.5.1.2293
3.5.1.2297

View file

@ -1 +1 @@
!define VERSION '3.5.1.2293'
!define VERSION '3.5.1.2297'

File diff suppressed because it is too large Load diff