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

Вернул назад неверное исправление if then else

Browse source
This commit is contained in:
Mikhalkovich Stanislav 2019-07-25 13:16:10 +03:00
parent 5eec60e885
commit e6d19d0d5d
11 changed files with 1882 additions and 1895 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 = "5";
public const string Build = "0";
public const string Revision = "2205";
public const string Revision = "2206";
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%=5
%REVISION%=2205
%COREVERSION%=0
%REVISION%=2206
%MINOR%=5
%MAJOR%=3

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: 24.07.2019 22:10:45
// DateTime: 25.07.2019 12:28:32
// UserName: ?????????
// GPLEX input file <ABCPascal.lex>
// GPLEX frame file <embedded resource>

4
Parsers/PascalABCParserNewSaushkin/ABCPascal.y
View file

@ -2776,10 +2776,6 @@ if_stmt
{
$$ = new if_node($2, $4 as statement, $6 as statement, @$);
}
| tkIf expr_l1 tkThen unlabelled_stmt tkSemiColon tkElse unlabelled_stmt
{
parsertools.AddErrorFromResource("SEMICOLON_BEFORE_ELSE",@5);
}
;
match_with

3750
Parsers/PascalABCParserNewSaushkin/ABCPascalYacc.cs
View file

File diff suppressed because it is too large Load diff

1
Parsers/PascalABCParserNewSaushkin/PABC.ymc
View file

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

2
Release/pabcversion.txt
View file

@ -1 +1 @@
3.5.0.2205
3.5.0.2206

2
ReleaseGenerators/PascalABCNET_version.nsh
View file

@ -1 +1 @@
!define VERSION '3.5.0.2205'
!define VERSION '3.5.0.2206'

4
TestSuite/IfThenSemicolumn.pas Normal file
View file

@ -0,0 +1,4 @@
begin
if true then ;
Assert(1=1);
end.

3
bin/Lng/Eng/PascalABCParser.dat
View file

@ -73,5 +73,4 @@ STATIC_PROPERTIES_CANNOT_HAVE_ATTRBUTE_{0}=Static properties cannot have attribu
RESULT_IDENT_NOT_EXPECTED_IN_THIS_CONTEXT=Result identifier is not allowed in this context
NESTED_RECORD_DEFINITIONS_ARE_ARE_FORBIDDEN=Nested record definitions are forbidden
NIL_IN_UNNAMED_OBJECT=Anonymous class field cannot be initialized by nil constant
YIELD_STATEMENT_CANNOT_BE_USED_IN_LAMBDA_BODY=yield statement cannot be used in lambda body
SEMICOLON_BEFORE_ELSE=You cannot put semicolon before 'else'
YIELD_STATEMENT_CANNOT_BE_USED_IN_LAMBDA_BODY=yield statement cannot be used in lambda body

3
bin/Lng/Rus/PascalABCParser.dat
View file

@ -74,5 +74,4 @@ STATIC_PROPERTIES_CANNOT_HAVE_ATTRBUTE_{0}=Статические свойств
RESULT_IDENT_NOT_EXPECTED_IN_THIS_CONTEXT=Имя Result недопустимо в этом контексте
NESTED_RECORD_DEFINITIONS_ARE_FORBIDDEN=Вложенные описания записей запрещены
NIL_IN_UNNAMED_OBJECT=Поле анонимного класса не может инициализироваться константой nil
YIELD_STATEMENT_CANNOT_BE_USED_IN_LAMBDA_BODY=Оператор yield нельзя использовать в теле лямбда-выражения
SEMICOLON_BEFORE_ELSE=Перед else нельзя ставить точку с запятой
YIELD_STATEMENT_CANNOT_BE_USED_IN_LAMBDA_BODY=Оператор yield нельзя использовать в теле лямбда-выражения