From c56442339e0e283b3abf369e2aaaa32640267e07 Mon Sep 17 00:00:00 2001 From: Mikhalkovich Stanislav Date: Sun, 7 Apr 2024 21:42:57 +0300 Subject: [PATCH] ! Hidden --- Configuration/GlobalAssemblyInfo.cs | 2 +- Configuration/Version.defs | 4 +- .../PascalABCParserNewSaushkin/ABCPascal.cs | 49 +++++++++---------- .../PascalABCParserNewSaushkin/ABCPascal.lex | 8 +-- .../ABCPascalYacc.cs | 6 +-- Parsers/PascalABCParserNewSaushkin/PABC.ymc | 2 + Release/pabcversion.txt | 2 +- ReleaseGenerators/PascalABCNET_version.nsh | 2 +- 8 files changed, 37 insertions(+), 38 deletions(-) diff --git a/Configuration/GlobalAssemblyInfo.cs b/Configuration/GlobalAssemblyInfo.cs index b3bc37ee7..a0ab462a0 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 = "9"; public const string Build = "0"; - public const string Revision = "3452"; + public const string Revision = "3453"; 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 f49f3695c..2bd0fafb7 100644 --- a/Configuration/Version.defs +++ b/Configuration/Version.defs @@ -1,4 +1,4 @@ -%COREVERSION%=0 -%REVISION%=3452 %MINOR%=9 +%REVISION%=3453 +%COREVERSION%=0 %MAJOR%=3 diff --git a/Parsers/PascalABCParserNewSaushkin/ABCPascal.cs b/Parsers/PascalABCParserNewSaushkin/ABCPascal.cs index a55f597a2..522adcbf2 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-2BJCJ7I -// DateTime: 07.04.2024 10:50:29 -// UserName: ibond +// Machine: DESKTOP-G8V08V4 +// DateTime: 07.04.2024 21:40:55 +// UserName: ????????? // GPLEX input file // GPLEX frame file // @@ -179,7 +179,7 @@ public PT parsertools; } }; - static int[] startState = new int[] {76, 120, 121, 122, 122, 123, + static int[] startState = new int[] {76, 119, 120, 121, 121, 122, 0}; #region TwoLevelCharacterMap @@ -191,11 +191,11 @@ public PT parsertools; static sbyte[] mLo0 = new sbyte[256] { /* '\0' */ 5, 43, 5, 5, 5, 5, 5, 5, 5, 12, 0, 5, 5, 6, 5, 5, /* '\x10' */ 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, -/* '\x20' */ 52, 5, 5, 11, 4, 5, 13, 51, 7, 9, 8, 24, 14, 25, 16, 1, +/* '\x20' */ 52, 44, 5, 11, 4, 5, 13, 51, 7, 9, 8, 24, 14, 25, 16, 1, /* '0' */ 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 15, 17, 27, 23, 26, 20, /* '@' */ 22, 49, 47, 49, 49, 50, 49, 45, 45, 48, 45, 45, 45, 45, 45, 45, /* 'P' */ 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 18, 29, 19, 28, 21, -/* '`' */ 44, 40, 47, 49, 49, 31, 49, 45, 45, 36, 45, 45, 45, 41, 38, 37, +/* '`' */ 5, 40, 47, 49, 49, 31, 49, 45, 45, 36, 45, 45, 45, 41, 38, 37, /* 'p' */ 33, 45, 34, 35, 39, 45, 45, 45, 32, 42, 45, 3, 10, 2, 5, 5, /* '\x80' */ 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, /* '\x90' */ 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, @@ -1179,15 +1179,15 @@ public PT parsertools; return MapC(code); } - static Table[] NxS = new Table[125] { + static Table[] NxS = new Table[124] { /* NxS[ 0] */ new Table(0, 0, 0, null), /* NxS[ 1] */ new Table(1, 23, -1, new sbyte[] {64, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 65}), /* NxS[ 2] */ new Table(0, 0, -1, null), -/* NxS[ 3] */ new Table(4, 1, -1, new sbyte[] {119}), +/* NxS[ 3] */ new Table(4, 1, -1, new sbyte[] {118}), /* NxS[ 4] */ new Table(31, 21, -1, new sbyte[] {61, -1, -1, -1, -1, -1, - -1, -1, -1, 61, -1, -1, -1, -1, -1, 61, 61, -1, 61, 61, 118}), + -1, -1, -1, 61, -1, -1, -1, -1, -1, 61, 61, -1, 61, 61, 117}), /* NxS[ 5] */ new Table(8, 1, -1, new sbyte[] {60}), /* NxS[ 6] */ new Table(8, 16, -1, new sbyte[] {58, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 59}), @@ -1195,7 +1195,7 @@ public PT parsertools; /* NxS[ 8] */ new Table(0, 0, -1, null), /* NxS[ 9] */ new Table(11, 40, -1, new sbyte[] {115, -1, -1, -1, -1, -1, -1, -1, -1, -1, 54, -1, -1, -1, -1, -1, -1, -1, -1, -1, 54, 54, - 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, -1, 116, 54, 55, 54, 54, + 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, -1, -1, 54, 55, 54, 54, 54, 54}), /* NxS[ 10] */ new Table(21, 30, -1, new sbyte[] {28, -1, -1, -1, -1, -1, -1, -1, -1, -1, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, @@ -1269,7 +1269,7 @@ public PT parsertools; /* NxS[ 61] */ new Table(21, 30, -1, new sbyte[] {61, -1, -1, -1, -1, -1, -1, -1, -1, -1, 61, -1, -1, -1, -1, -1, -1, -1, -1, 61, -1, -1, -1, -1, -1, 61, 61, -1, 61, 61}), -/* NxS[ 62] */ new Table(51, 1, -1, new sbyte[] {118}), +/* NxS[ 62] */ new Table(51, 1, -1, new sbyte[] {117}), /* NxS[ 63] */ new Table(0, 0, -1, null), /* NxS[ 64] */ new Table(0, 7, 64, new sbyte[] {-1, 64, 64, 64, 64, 64, -1}), @@ -1281,7 +1281,7 @@ public PT parsertools; /* NxS[ 70] */ new Table(0, 0, -1, null), /* NxS[ 71] */ new Table(0, 0, -1, null), /* NxS[ 72] */ new Table(1, 1, -1, new sbyte[] {75}), -/* NxS[ 73] */ new Table(4, 1, -1, new sbyte[] {124}), +/* NxS[ 73] */ new Table(4, 1, -1, new sbyte[] {123}), /* NxS[ 74] */ new Table(0, 0, -1, null), /* NxS[ 75] */ new Table(0, 7, 75, new sbyte[] {-1, 75, 75, 75, 75, 75, -1}), @@ -1335,20 +1335,17 @@ public PT parsertools; -1, -1, -1, -1, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, -1, -1, 28, -1, 28, 28, 28, 28}), /* NxS[ 115] */ new Table(52, 14, -1, new sbyte[] {56, 56, -1, -1, -1, -1, - -1, 56, -1, -1, -1, -1, 117, 56}), -/* NxS[ 116] */ new Table(21, 30, -1, new sbyte[] {54, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, - -1, -1, 54, -1, 54, 54, 54, 54}), -/* NxS[ 117] */ new Table(52, 14, -1, new sbyte[] {57, 57, -1, -1, -1, -1, + -1, 56, -1, -1, -1, -1, 116, 56}), +/* NxS[ 116] */ new Table(52, 14, -1, new sbyte[] {57, 57, -1, -1, -1, -1, -1, 57, -1, -1, -1, -1, -1, 57}), -/* NxS[ 118] */ new Table(51, 3, 118, new sbyte[] {62, 118, -1}), -/* NxS[ 119] */ new Table(0, 7, 119, new sbyte[] {-1, 119, 63, 119, 119, 119, +/* NxS[ 117] */ new Table(51, 3, 117, new sbyte[] {62, 117, -1}), +/* NxS[ 118] */ new Table(0, 7, 118, new sbyte[] {-1, 118, 63, 118, 118, 118, -1}), -/* NxS[ 120] */ new Table(2, 1, 66, new sbyte[] {67}), -/* NxS[ 121] */ new Table(8, 1, 68, new sbyte[] {69}), -/* NxS[ 122] */ new Table(0, 0, -1, null), -/* NxS[ 123] */ new Table(1, 3, 71, new sbyte[] {72, 71, 73}), -/* NxS[ 124] */ new Table(0, 7, 124, new sbyte[] {-1, 124, 74, 124, 124, 124, +/* NxS[ 119] */ new Table(2, 1, 66, new sbyte[] {67}), +/* NxS[ 120] */ new Table(8, 1, 68, new sbyte[] {69}), +/* NxS[ 121] */ new Table(0, 0, -1, null), +/* NxS[ 122] */ new Table(1, 3, 71, new sbyte[] {72, 71, 73}), +/* NxS[ 123] */ new Table(0, 7, 123, new sbyte[] {-1, 123, 74, 123, 123, 123, -1}), }; @@ -1863,8 +1860,8 @@ string cur_yytext = yytext; currentLexLocation = CurrentLexLocation; if (res == (int)Tokens.tkIdentifier) { - if (cur_yytext[0] == '`' && !HiddenIdents && !ExprMode) - parsertools.AddErrorFromResource("UNEXPECTED_SYMBOL{0}",CurrentLexLocation, "`"); + if (cur_yytext[0] == '!' && !HiddenIdents && !ExprMode) + parsertools.AddErrorFromResource("UNEXPECTED_SYMBOL{0}",CurrentLexLocation, ""+cur_yytext[0]); yylval = new Union(); yylval.id = parsertools.create_ident(cur_yytext,currentLexLocation); } diff --git a/Parsers/PascalABCParserNewSaushkin/ABCPascal.lex b/Parsers/PascalABCParserNewSaushkin/ABCPascal.lex index dad8e0fba..de13b9053 100644 --- a/Parsers/PascalABCParserNewSaushkin/ABCPascal.lex +++ b/Parsers/PascalABCParserNewSaushkin/ABCPascal.lex @@ -24,7 +24,7 @@ Letter [[:IsLetter:]_] Digit [0-9] Digit_ [0-9_] LetterDigit {Letter}|{Digit} -ID `?{Letter}{LetterDigit}* +ID {Letter}{LetterDigit}* HexDigit {Digit}|[abcdefABCDEF] HexDigit_ {Digit}|[abcdefABCDEF_] DotChr [^\r\n] @@ -255,14 +255,14 @@ UNICODEARROW \x890 \x01 { return (int)Tokens.INVISIBLE; } -[&]?{ID} { +[&]?[!]?{ID} { string cur_yytext = yytext; int res = Keywords.KeywordOrIDToken(cur_yytext); currentLexLocation = CurrentLexLocation; if (res == (int)Tokens.tkIdentifier) { - if (cur_yytext[0] == '`' && !HiddenIdents && !ExprMode) - parsertools.AddErrorFromResource("UNEXPECTED_SYMBOL{0}",CurrentLexLocation, "`"); + if (cur_yytext[0] == '!' && !HiddenIdents && !ExprMode) + parsertools.AddErrorFromResource("UNEXPECTED_SYMBOL{0}",CurrentLexLocation, ""+cur_yytext[0]); yylval = new Union(); yylval.id = parsertools.create_ident(cur_yytext,currentLexLocation); } diff --git a/Parsers/PascalABCParserNewSaushkin/ABCPascalYacc.cs b/Parsers/PascalABCParserNewSaushkin/ABCPascalYacc.cs index f86d5b34e..53e2acf00 100644 --- a/Parsers/PascalABCParserNewSaushkin/ABCPascalYacc.cs +++ b/Parsers/PascalABCParserNewSaushkin/ABCPascalYacc.cs @@ -1,9 +1,9 @@ // (see accompanying GPPGcopyright.rtf) // GPPG version 1.3.6 -// Machine: DESKTOP-2BJCJ7I -// DateTime: 07.04.2024 10:50:30 -// UserName: ibond +// Machine: DESKTOP-G8V08V4 +// DateTime: 07.04.2024 21:40:55 +// UserName: ????????? // Input file // options: no-lines gplex diff --git a/Parsers/PascalABCParserNewSaushkin/PABC.ymc b/Parsers/PascalABCParserNewSaushkin/PABC.ymc index 5a926bd4d..6bac188a0 100644 --- a/Parsers/PascalABCParserNewSaushkin/PABC.ymc +++ b/Parsers/PascalABCParserNewSaushkin/PABC.ymc @@ -373,6 +373,8 @@ script= + + diff --git a/Release/pabcversion.txt b/Release/pabcversion.txt index 3e472964a..05d7e0f0d 100644 --- a/Release/pabcversion.txt +++ b/Release/pabcversion.txt @@ -1 +1 @@ -3.9.0.3452 +3.9.0.3453 diff --git a/ReleaseGenerators/PascalABCNET_version.nsh b/ReleaseGenerators/PascalABCNET_version.nsh index 5b1b46e40..860221604 100644 --- a/ReleaseGenerators/PascalABCNET_version.nsh +++ b/ReleaseGenerators/PascalABCNET_version.nsh @@ -1 +1 @@ -!define VERSION '3.9.0.3452' +!define VERSION '3.9.0.3453'