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

fix #2670

Browse source
This commit is contained in:
Mikhalkovich Stanislav 2022-05-23 08:21:56 +03:00
parent 75425d6d2e
commit c50caf192c
12 changed files with 22 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Configuration/GlobalAssemblyInfo.cs
View file

@ -15,7 +15,7 @@ internal static class RevisionClass
public const string Major = "3";
public const string Minor = "8";
public const string Build = "3";
public const string Revision = "3123";
public const string Revision = "3126";
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%=8
%REVISION%=3123
%COREVERSION%=3
%REVISION%=3126
%MINOR%=8
%MAJOR%=3

BIN
Localization/DefaultLang.resources
View file

Binary file not shown.

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: DESKTOP-G8V08V4
// DateTime: 10.05.2022 19:00:28
// DateTime: 23.05.2022 8:03:08
// UserName: ?????????
// GPLEX input file <ABCPascal.lex>
// GPLEX frame file <embedded resource>

4
Parsers/PascalABCParserNewSaushkin/ABCPascal.y
View file

@ -4060,10 +4060,10 @@ tuple
foreach (var ex in ($4 as expression_list).expressions)
if (ex is unpacked_list_of_ident_or_list)
parsertools.AddErrorFromResource("EXPRESSION_EXPECTED",ex.source_context);
/*if ($5 != null)
if (!($5 is lambda_inferred_type))
parsertools.AddErrorFromResource("BAD_TUPLE",@5);
if ($6 != null)
parsertools.AddErrorFromResource("BAD_TUPLE",@6);*/
parsertools.AddErrorFromResource("BAD_TUPLE",@6);
if (($4 as expression_list).Count>6)
parsertools.AddErrorFromResource("TUPLE_ELEMENTS_COUNT_MUST_BE_LESSEQUAL_7",@$);

10
Parsers/PascalABCParserNewSaushkin/ABCPascalYacc.cs
View file

@ -2,7 +2,7 @@
// GPPG version 1.3.6
// Machine: DESKTOP-G8V08V4
// DateTime: 10.05.2022 19:00:28
// DateTime: 23.05.2022 8:03:08
// UserName: ?????????
// Input file <ABCPascal.y>
@ -6514,10 +6514,10 @@ public partial class GPPGParser: ShiftReduceParser<PascalABCSavParser.Union, Lex
foreach (var ex in (ValueStack[ValueStack.Depth-4].stn as expression_list).expressions)
if (ex is unpacked_list_of_ident_or_list)
parsertools.AddErrorFromResource("EXPRESSION_EXPECTED",ex.source_context);
/*if ($5 != null)
parsertools.AddErrorFromResource("BAD_TUPLE",@5);
if ($6 != null)
parsertools.AddErrorFromResource("BAD_TUPLE",@6);*/
if (!(ValueStack[ValueStack.Depth-3].td is lambda_inferred_type))
parsertools.AddErrorFromResource("BAD_TUPLE",LocationStack[LocationStack.Depth-3]);
if (ValueStack[ValueStack.Depth-2].stn != null)
parsertools.AddErrorFromResource("BAD_TUPLE",LocationStack[LocationStack.Depth-2]);
if ((ValueStack[ValueStack.Depth-4].stn as expression_list).Count>6)
parsertools.AddErrorFromResource("TUPLE_ELEMENTS_COUNT_MUST_BE_LESSEQUAL_7",CurrentLocationSpan);

1
Parsers/PascalABCParserNewSaushkin/PABC.ymc
View file

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

1
PluginsSupport/Classes.cs
View file

@ -43,6 +43,7 @@ namespace VisualPascalABCPlugins
public string Hint
{
get { return hint; }
set { hint = value; }
}
public Image Image
{

2
Release/pabcversion.txt
View file

@ -1 +1 @@
3.8.3.3123
3.8.3.3126

2
ReleaseGenerators/PascalABCNET_version.nsh
View file

@ -1 +1 @@
!define VERSION '3.8.3.3123'
!define VERSION '3.8.3.3126'

4
TestSuite/errors/err0450.pas Normal file
View file

@ -0,0 +1,4 @@
//!Нельзя присвоить левой части
begin
(^integer) := 2;
end.

3
TestSuite/errors/err0507.pas Normal file
View file

@ -0,0 +1,3 @@
begin
var t := (1, a : owrgfhowrhg);
end.