From b1323a6e0e47b9bc85e5a710e93eecef41eb3ce1 Mon Sep 17 00:00:00 2001 From: Mikhalkovich Stanislav Date: Mon, 22 Feb 2021 21:26:52 +0300 Subject: [PATCH] =?UTF-8?q?slice-expr=20-=20=D0=BF=D0=BE=D0=B4=D0=B3=D0=BE?= =?UTF-8?q?=D1=82=D0=BE=D0=B2=D0=BA=D0=B0=20=D0=BA=20=D1=81=D0=BB=D0=B0?= =?UTF-8?q?=D0=B9=D1=81=D0=B0=D0=BC=20=D0=B2=20=D0=BC=D0=BD=D0=BE=D0=B3?= =?UTF-8?q?=D0=BE=D0=BC=D0=B5=D1=80=D0=BD=D1=8B=D1=85=20=D0=BC=D0=B0=D1=81?= =?UTF-8?q?=D1=81=D0=B8=D0=B2=D0=B0=D1=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Configuration/GlobalAssemblyInfo.cs | 2 +- Configuration/Version.defs | 2 +- Parsers/PascalABCParserNewSaushkin/ABCPascal.cs | 2 +- Parsers/PascalABCParserNewSaushkin/ABCPascalYacc.cs | 2 +- Parsers/PascalABCParserNewSaushkin/PABC.ymc | 1 + Release/pabcversion.txt | 2 +- ReleaseGenerators/PascalABCNET_version.nsh | 2 +- SyntaxTree/tree/TreeHelper.cs | 1 + TestSuite/CompilationSamples/PABCSystem.pas | 3 +++ bin/Lib/PABCSystem.pas | 3 +++ 10 files changed, 14 insertions(+), 6 deletions(-) diff --git a/Configuration/GlobalAssemblyInfo.cs b/Configuration/GlobalAssemblyInfo.cs index 911ccc68a..445719d67 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 = "7"; public const string Build = "2"; - public const string Revision = "2821"; + public const string Revision = "2823"; 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 c31495089..e1e48041c 100644 --- a/Configuration/Version.defs +++ b/Configuration/Version.defs @@ -1,4 +1,4 @@ %MINOR%=7 -%REVISION%=2821 +%REVISION%=2823 %COREVERSION%=2 %MAJOR%=3 diff --git a/Parsers/PascalABCParserNewSaushkin/ABCPascal.cs b/Parsers/PascalABCParserNewSaushkin/ABCPascal.cs index 4bc24ae6a..8f03a8007 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: 18.01.2021 18:43:04 +// DateTime: 22.02.2021 17:50:28 // UserName: ????????? // GPLEX input file // GPLEX frame file diff --git a/Parsers/PascalABCParserNewSaushkin/ABCPascalYacc.cs b/Parsers/PascalABCParserNewSaushkin/ABCPascalYacc.cs index cfce58470..c40b17890 100644 --- a/Parsers/PascalABCParserNewSaushkin/ABCPascalYacc.cs +++ b/Parsers/PascalABCParserNewSaushkin/ABCPascalYacc.cs @@ -2,7 +2,7 @@ // GPPG version 1.3.6 // Machine: DESKTOP-G8V08V4 -// DateTime: 18.01.2021 18:43:05 +// DateTime: 22.02.2021 17:50:29 // UserName: ????????? // Input file diff --git a/Parsers/PascalABCParserNewSaushkin/PABC.ymc b/Parsers/PascalABCParserNewSaushkin/PABC.ymc index d4b29332a..59adc3c0a 100644 --- a/Parsers/PascalABCParserNewSaushkin/PABC.ymc +++ b/Parsers/PascalABCParserNewSaushkin/PABC.ymc @@ -308,5 +308,6 @@ script= + diff --git a/Release/pabcversion.txt b/Release/pabcversion.txt index 17eb618c7..2ab71146e 100644 --- a/Release/pabcversion.txt +++ b/Release/pabcversion.txt @@ -1 +1 @@ -3.7.2.2821 +3.7.2.2823 diff --git a/ReleaseGenerators/PascalABCNET_version.nsh b/ReleaseGenerators/PascalABCNET_version.nsh index 4f0c54852..48bc84910 100644 --- a/ReleaseGenerators/PascalABCNET_version.nsh +++ b/ReleaseGenerators/PascalABCNET_version.nsh @@ -1 +1 @@ -!define VERSION '3.7.2.2821' +!define VERSION '3.7.2.2823' diff --git a/SyntaxTree/tree/TreeHelper.cs b/SyntaxTree/tree/TreeHelper.cs index b375f9c87..daddd8232 100644 --- a/SyntaxTree/tree/TreeHelper.cs +++ b/SyntaxTree/tree/TreeHelper.cs @@ -1769,6 +1769,7 @@ namespace PascalABCCompiler.SyntaxTree public partial class slice_expr { + public List> slices = new List>(); public override string ToString() => this.v + "[" + this.from + ":" + this.to + ":" + this.step + "]"; } diff --git a/TestSuite/CompilationSamples/PABCSystem.pas b/TestSuite/CompilationSamples/PABCSystem.pas index 90601d577..84ea77108 100644 --- a/TestSuite/CompilationSamples/PABCSystem.pas +++ b/TestSuite/CompilationSamples/PABCSystem.pas @@ -2773,6 +2773,9 @@ function InternalRange(l,r: real): RealRange; ///-- function IsInputPipedOrRedirectedFromFile: boolean; + +///-- +function CheckAndCorrectFromToAndCalcCountForSystemSlice(situation: integer; Len: integer; var from, &to: integer; step: integer): integer; // ----------------------------------------------------- // Internal procedures for PABCRTL.dll diff --git a/bin/Lib/PABCSystem.pas b/bin/Lib/PABCSystem.pas index 90601d577..84ea77108 100644 --- a/bin/Lib/PABCSystem.pas +++ b/bin/Lib/PABCSystem.pas @@ -2773,6 +2773,9 @@ function InternalRange(l,r: real): RealRange; ///-- function IsInputPipedOrRedirectedFromFile: boolean; + +///-- +function CheckAndCorrectFromToAndCalcCountForSystemSlice(situation: integer; Len: integer; var from, &to: integer; step: integer): integer; // ----------------------------------------------------- // Internal procedures for PABCRTL.dll