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

Исправление автоформатирования []

Browse source
This commit is contained in:
Mikhalkovich Stanislav 2025-01-04 22:54:38 +03:00
parent d45b782a7b
commit 0848a1b796
13 changed files with 40 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CodeCompletion/CodeFormatter.cs
View file

@ -3466,7 +3466,7 @@ namespace CodeFormatters
public override void visit(array_const_new acn)
{
sb.Append("|");
sb.Append(acn.braces_type);
visit_node(acn.elements);
//sb.Append("|");
}

2
Configuration/GlobalAssemblyInfo.cs
View file

@ -15,7 +15,7 @@ internal static class RevisionClass
public const string Major = "3";
public const string Minor = "10";
public const string Build = "2";
public const string Revision = "3595";
public const string Revision = "3596";
public const string MainVersion = Major + "." + Minor;
public const string FullVersion = Major + "." + Minor + "." + Build + "." + Revision;

4
Configuration/Version.defs
View file

@ -1,4 +1,4 @@
%MINOR%=10
%REVISION%=3595
%COREVERSION%=2
%REVISION%=3596
%MINOR%=10
%MAJOR%=3

2
Parsers/PascalABCParserNewSaushkin/ABCPascal.cs
View file

@ -2,7 +2,7 @@
// This CSharp output file generated by Gardens Point LEX
// Version: 1.1.3.301
// Machine: LAPTOP-TE3HP881
// DateTime: 15.12.2024 8:40:15
// DateTime: 04.01.2025 22:10:06
// UserName: miks
// GPLEX input file <ABCPascal.lex>
// GPLEX frame file <embedded resource>

6
Parsers/PascalABCParserNewSaushkin/ABCPascal.y
View file

@ -1000,7 +1000,7 @@ pascal_set_const
is_set = true;
if (is_set)
$$ = new pascal_set_constant($2 as expression_list, @$);
else $$ = new array_const_new($2 as expression_list, @$);
else $$ = new array_const_new($2 as expression_list, '[', @$);
}
;
@ -1011,7 +1011,7 @@ const_set
}
| tkVertParen elem_list tkVertParen
{
$$ = new array_const_new($2 as expression_list, @$);
$$ = new array_const_new($2 as expression_list, '|', @$);
}
;
@ -4461,7 +4461,7 @@ variable
}
| tkVertParen elem_list tkVertParen
{
$$ = new array_const_new($2 as expression_list, @$);
$$ = new array_const_new($2 as expression_list, '|', @$);
}
| pascal_set_const
{

8
Parsers/PascalABCParserNewSaushkin/ABCPascalYacc.cs
View file

@ -2,7 +2,7 @@
// GPPG version 1.3.6
// Machine: LAPTOP-TE3HP881
// DateTime: 15.12.2024 8:40:16
// DateTime: 04.01.2025 22:10:07
// UserName: miks
// Input file <ABCPascal.y>
@ -3678,7 +3678,7 @@ public partial class GPPGParser: ShiftReduceParser<PascalABCCompiler.ParserTools
is_set = true;
if (is_set)
CurrentSemanticValue.ex = new pascal_set_constant(ValueStack[ValueStack.Depth-2].stn as expression_list, CurrentLocationSpan);
else CurrentSemanticValue.ex = new array_const_new(ValueStack[ValueStack.Depth-2].stn as expression_list, CurrentLocationSpan);
else CurrentSemanticValue.ex = new array_const_new(ValueStack[ValueStack.Depth-2].stn as expression_list, '[', CurrentLocationSpan);
}
break;
case 165: // const_set -> pascal_set_const
@ -3688,7 +3688,7 @@ public partial class GPPGParser: ShiftReduceParser<PascalABCCompiler.ParserTools
break;
case 166: // const_set -> tkVertParen, elem_list, tkVertParen
{
CurrentSemanticValue.ex = new array_const_new(ValueStack[ValueStack.Depth-2].stn as expression_list, CurrentLocationSpan);
CurrentSemanticValue.ex = new array_const_new(ValueStack[ValueStack.Depth-2].stn as expression_list, '|', CurrentLocationSpan);
}
break;
case 167: // sign -> tkPlus
@ -6954,7 +6954,7 @@ public partial class GPPGParser: ShiftReduceParser<PascalABCCompiler.ParserTools
break;
case 803: // variable -> tkVertParen, elem_list, tkVertParen
{
CurrentSemanticValue.ex = new array_const_new(ValueStack[ValueStack.Depth-2].stn as expression_list, CurrentLocationSpan);
CurrentSemanticValue.ex = new array_const_new(ValueStack[ValueStack.Depth-2].stn as expression_list, '|', CurrentLocationSpan);
}
break;
case 804: // variable -> pascal_set_const

1
Parsers/PascalABCParserNewSaushkin/PABC.ymc
View file

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

2
Release/pabcversion.txt
View file

@ -1 +1 @@
3.10.2.3595
3.10.2.3596

2
ReleaseGenerators/PascalABCNET_version.nsh
View file

@ -1 +1 @@
!define VERSION '3.10.2.3595'
!define VERSION '3.10.2.3596'

1
SyntaxTree/tree/SyntaxTreeStreamReader.cs
View file

@ -4459,6 +4459,7 @@ namespace PascalABCCompiler.SyntaxTree
{
read_addressed_value(_array_const_new);
_array_const_new.elements = _read_node() as expression_list;
_array_const_new.braces_type = br.ReadChar();
}

1
SyntaxTree/tree/SyntaxTreeStreamWriter.cs
View file

@ -6953,6 +6953,7 @@ namespace PascalABCCompiler.SyntaxTree
bw.Write((byte)1);
_array_const_new.elements.visit(this);
}
bw.Write(_array_const_new.braces_type);
}

23
SyntaxTree/tree/Tree.cs
View file

@ -54152,22 +54152,25 @@ namespace PascalABCCompiler.SyntaxTree
///<summary>
///Конструктор с параметрами.
///</summary>
public array_const_new(expression_list _elements)
public array_const_new(expression_list _elements,char _braces_type)
{
this._elements=_elements;
this._braces_type=_braces_type;
FillParentsInDirectChilds();
}
///<summary>
///Конструктор с параметрами.
///</summary>
public array_const_new(expression_list _elements,SourceContext sc)
public array_const_new(expression_list _elements,char _braces_type,SourceContext sc)
{
this._elements=_elements;
this._braces_type=_braces_type;
source_context = sc;
FillParentsInDirectChilds();
}
protected expression_list _elements;
protected char _braces_type;
///<summary>
///
@ -54186,6 +54189,21 @@ namespace PascalABCCompiler.SyntaxTree
}
}
///<summary>
///
///</summary>
public char braces_type
{
get
{
return _braces_type;
}
set
{
_braces_type=value;
}
}
/// <summary> Создает копию узла </summary>
public override syntax_tree_node Clone()
@ -54204,6 +54222,7 @@ namespace PascalABCCompiler.SyntaxTree
copy.elements = (expression_list)elements.Clone();
copy.elements.Parent = copy;
}
copy.braces_type = braces_type;
return copy;
}

2
SyntaxTree/tree/tree.xml
View file

@ -3276,6 +3276,7 @@
<SyntaxNode Name="array_const_new" BaseName="addressed_value">
<Fields>
<SyntaxField Name="elements" SyntaxType="expression_list" />
<ExtendedField Name="braces_type" Type="char" CreateVariable="false" DeleteVariable="false" />
</Fields>
<Methods />
<Tags>
@ -3552,6 +3553,7 @@
<HelpData Key="array_const" Value="" />
<HelpData Key="array_const.elements" Value="" />
<HelpData Key="array_const_new" Value="" />
<HelpData Key="array_const_new.braces_type" Value="" />
<HelpData Key="array_const_new.elements" Value="" />
<HelpData Key="array_of_const_type" Value="array of const" />
<HelpData Key="array_of_const_type_defenition" Value="array of const" />