From f4c198cf9b35bf945fc16f94666118bed274504f Mon Sep 17 00:00:00 2001 From: Mikhalkovich Stanislav Date: Mon, 17 May 2021 11:59:01 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B0=20?= =?UTF-8?q?=D1=81=D0=BE=20=D1=81=D1=87=D0=B8=D1=82=D1=8B=D0=B2=D0=B0=D0=BD?= =?UTF-8?q?=D0=B8=D0=B5=D0=BC=20=D1=81=D1=82=D1=80=D0=BE=D0=BA=20=D0=BF?= =?UTF-8?q?=D0=BE=D1=81=D0=BB=D0=B5=20Assign(input,'a.txt');?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Configuration/GlobalAssemblyInfo.cs | 2 +- Configuration/Version.defs | 4 ++-- Localization/DefaultLang.resources | Bin 97561 -> 97666 bytes .../PascalABCParserNewSaushkin/ABCPascal.cs | 2 +- .../ABCPascalYacc.cs | 8 ++++---- Parsers/PascalABCParserNewSaushkin/PABC.ymc | 2 ++ Release/pabcversion.txt | 2 +- ReleaseGenerators/PascalABCNET_version.nsh | 2 +- TestSuite/CompilationSamples/PABCSystem.pas | 4 +++- bin/Lib/PABCSystem.pas | 4 +++- 10 files changed, 18 insertions(+), 12 deletions(-) diff --git a/Configuration/GlobalAssemblyInfo.cs b/Configuration/GlobalAssemblyInfo.cs index d8b8c0e89..2944d6bb1 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 = "8"; public const string Build = "0"; - public const string Revision = "2898"; + public const string Revision = "2899"; 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 4a64bae7d..1e9447612 100644 --- a/Configuration/Version.defs +++ b/Configuration/Version.defs @@ -1,4 +1,4 @@ -%COREVERSION%=0 -%REVISION%=2898 %MINOR%=8 +%REVISION%=2899 +%COREVERSION%=0 %MAJOR%=3 diff --git a/Localization/DefaultLang.resources b/Localization/DefaultLang.resources index 9478142a08411e75e14266a82d1ae0fc8c6bb55e..93fc666eebe67c111bda90f66eb88afdc0b1e84c 100644 GIT binary patch delta 106 zcmV-w0G0ol`UQgf1(4tYp0VK>pH5CsPG3+}LQF|RUs6RwPf|o*Lr+dqR8mz#R8LY< zUrtX{UqMVvPgg}mJ;&hh=<(^6u;W>h2)#^Wp30_wD=XldtC) MlN<;hvlgHO-9;NWasU7T delta 19 bcmZqr%{ucJ>x2i4rW+qh&flE8K>jWOVa*A> diff --git a/Parsers/PascalABCParserNewSaushkin/ABCPascal.cs b/Parsers/PascalABCParserNewSaushkin/ABCPascal.cs index c5a3d28ec..ef7dba535 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: 24.04.2021 8:44:33 +// DateTime: 17.05.2021 11:16:57 // UserName: ????????? // GPLEX input file // GPLEX frame file diff --git a/Parsers/PascalABCParserNewSaushkin/ABCPascalYacc.cs b/Parsers/PascalABCParserNewSaushkin/ABCPascalYacc.cs index 58a6cd5cc..0944b6f1a 100644 --- a/Parsers/PascalABCParserNewSaushkin/ABCPascalYacc.cs +++ b/Parsers/PascalABCParserNewSaushkin/ABCPascalYacc.cs @@ -2,9 +2,9 @@ // GPPG version 1.3.6 // Machine: DESKTOP-G8V08V4 -// DateTime: 24.04.2021 8:44:33 +// DateTime: 17.05.2021 11:16:58 // UserName: ????????? -// Input file +// Input file // options: no-lines gplex @@ -59,7 +59,7 @@ public abstract class ScanBase : AbstractScanner { - // Verbatim content from ABCPascal.y + // Verbatim content from D:\PABC_Git\Parsers\PascalABCParserNewSaushkin\ABCPascal.y // ��� ���������� ����������� � ����� GPPGParser, �������������� ����� ������, ������������ �������� gppg public syntax_tree_node root; // �������� ���� ��������������� ������ @@ -71,7 +71,7 @@ public partial class GPPGParser: ShiftReduceParser scanner) : base(scanner) { } - // End verbatim content from ABCPascal.y + // End verbatim content from D:\PABC_Git\Parsers\PascalABCParserNewSaushkin\ABCPascal.y #pragma warning disable 649 private static Dictionary aliasses; diff --git a/Parsers/PascalABCParserNewSaushkin/PABC.ymc b/Parsers/PascalABCParserNewSaushkin/PABC.ymc index dba837415..12455f216 100644 --- a/Parsers/PascalABCParserNewSaushkin/PABC.ymc +++ b/Parsers/PascalABCParserNewSaushkin/PABC.ymc @@ -329,6 +329,8 @@ script= + + diff --git a/Release/pabcversion.txt b/Release/pabcversion.txt index e6693ea93..c3922ebfc 100644 --- a/Release/pabcversion.txt +++ b/Release/pabcversion.txt @@ -1 +1 @@ -3.8.0.2898 +3.8.0.2899 diff --git a/ReleaseGenerators/PascalABCNET_version.nsh b/ReleaseGenerators/PascalABCNET_version.nsh index f7a02fef7..e4ce9764b 100644 --- a/ReleaseGenerators/PascalABCNET_version.nsh +++ b/ReleaseGenerators/PascalABCNET_version.nsh @@ -1 +1 @@ -!define VERSION '3.8.0.2898' +!define VERSION '3.8.0.2899' diff --git a/TestSuite/CompilationSamples/PABCSystem.pas b/TestSuite/CompilationSamples/PABCSystem.pas index 9b5947771..13fac01b9 100644 --- a/TestSuite/CompilationSamples/PABCSystem.pas +++ b/TestSuite/CompilationSamples/PABCSystem.pas @@ -5583,6 +5583,8 @@ begin if (c <> #13) and (c <> #10) then // SSM 13.12.13 sb.Append(c); c := char(peek); + if c = char(-1) then + break; end; x := sb.ToString; end; @@ -6305,7 +6307,7 @@ begin if f.sr = nil then raise new System.IO.IOException(GetTranslation(FILE_NOT_OPENED_FOR_READING)); try - x := Convert.ToChar(f.sr.Read()); + x := char(f.sr.Read()); except on e: Exception do raise e; diff --git a/bin/Lib/PABCSystem.pas b/bin/Lib/PABCSystem.pas index 9b5947771..13fac01b9 100644 --- a/bin/Lib/PABCSystem.pas +++ b/bin/Lib/PABCSystem.pas @@ -5583,6 +5583,8 @@ begin if (c <> #13) and (c <> #10) then // SSM 13.12.13 sb.Append(c); c := char(peek); + if c = char(-1) then + break; end; x := sb.ToString; end; @@ -6305,7 +6307,7 @@ begin if f.sr = nil then raise new System.IO.IOException(GetTranslation(FILE_NOT_OPENED_FOR_READING)); try - x := Convert.ToChar(f.sr.Read()); + x := char(f.sr.Read()); except on e: Exception do raise e;