This commit is contained in:
Mikhalkovich Stanislav 2025-10-07 11:16:35 +03:00
parent 69c46d2edb
commit b4a77bfbbb
9 changed files with 3487 additions and 3449 deletions

View file

@ -15,7 +15,7 @@ internal static class RevisionClass
public const string Major = "3";
public const string Minor = "11";
public const string Build = "0";
public const string Revision = "3665";
public const string Revision = "3666";
public const string MainVersion = Major + "." + Minor;
public const string FullVersion = Major + "." + Minor + "." + Build + "." + Revision;

View file

@ -1,4 +1,4 @@
%MINOR%=11
%REVISION%=3665
%COREVERSION%=0
%REVISION%=3666
%MINOR%=11
%MAJOR%=3

View file

@ -1,9 +1,9 @@
//
// This CSharp output file generated by Gardens Point LEX
// Version: 1.1.3.301
// Machine: LAPTOP-TE3HP881
// DateTime: 04.01.2025 22:10:06
// UserName: miks
// Machine: DESKTOP-L2INHKG
// DateTime: 07.10.2025 10:49:02
// UserName: user
// GPLEX input file <ABCPascal.lex>
// GPLEX frame file <embedded resource>
//

View file

@ -820,7 +820,10 @@ const_relop_expr
}
| const_relop_expr const_relop const_simple_expr
{
$$ = new bin_expr($1, $3, $2.type, @$);
if ($2.type == Operators.NotIn)
$$ = new un_expr(new bin_expr($1, $3, Operators.In, @$),Operators.LogicalNOT,@$);
else
$$ = new bin_expr($1, $3, $2.type, @$);
}
;
@ -857,6 +860,16 @@ const_relop
{ $$ = $1; }
| tkIn
{ $$ = $1; }
| tkNot tkIn
{
if (parserTools.buildTreeForFormatter)
$$ = $2;
else
{
$$ = $2;
$$.type = Operators.NotIn;
}
}
;
const_simple_expr

File diff suppressed because it is too large Load diff

View file

@ -4,6 +4,7 @@ lexGen=D:\PABC_GIT\pascalabcnet\Parsers\PascalABCParserNewSaushkin\GPLex_GPPG\Gp
yaccGen=D:\PABC_GIT\pascalabcnet\Parsers\PascalABCParserNewSaushkin\GPLex_GPPG\gppg.exe
lexGenOpt=/unicode
yaccGenOpt=/gplex
useCustomScript
script=
"D:\PABC_GIT\pascalabcnet\Parsers\PascalABCParserNewSaushkin\GPLex_GPPG\gplex.exe" /unicode "D:\PABC_Git\Parsers\PascalABCParserNewSaushkin\ABCPascal.lex"
@ -391,6 +392,8 @@ script=

View file

@ -1 +1 @@
3.11.0.3665
3.11.0.3666

View file

@ -1 +1 @@
!define VERSION '3.11.0.3665'
!define VERSION '3.11.0.3666'

View file

@ -0,0 +1,5 @@
begin
var a := [1,2,3];
var x: boolean := (5 not in a) and (4 not in a);
Print(x);
end.