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

bug fix #1463

Browse source
This commit is contained in:
miks1965 2018-11-05 16:08:31 +03:00
parent 088599c8d3
commit a65c2a0017
8 changed files with 21 additions and 7 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 = "4";
public const string Build = "2";
public const string Revision = "1854";
public const string Revision = "1857";
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%=4
%REVISION%=1854
%COREVERSION%=2
%REVISION%=1857
%MINOR%=4
%MAJOR%=3

BIN
Localization/DefaultLang.resources
View file

Binary file not shown.

2
ReleaseGenerators/PascalABCNET_version.nsh
View file

@ -1 +1 @@
!define VERSION '3.4.2.1854'
!define VERSION '3.4.2.1857'

2
TestSuite/CompilationSamples/PABCSystem.pas
View file

@ -1948,8 +1948,8 @@ var
///--
PrintDelimDefault: string := ' ';
///--
var
///--
__CONFIG__: Dictionary<string, object> := new Dictionary<string, object>;
// Вспомогательные подпрограммы. Из раздела интерфейса не убирать!!!

12
TreeConverter/TreeConversion/syntax_tree_visitor.cs
View file

@ -15830,6 +15830,18 @@ namespace PascalABCCompiler.TreeConverter
public override void visit(SyntaxTree.var_def_statement _var_def_statement)
{
if (_var_def_statement.vars_type != null && _var_def_statement.vars_type is procedure_header)
{
var ph = _var_def_statement.vars_type as procedure_header;
if (ph.parameters != null)
foreach (var x in ph.parameters.params_list)
{
if (x.inital_value != null)
AddError(get_location(x.inital_value), "DEFAULT_PARAMS_IN_DELEGATE_TYPE"); // SSM bug fix #1463
}
}
if (_var_def_statement.vars_type == null && _var_def_statement.inital_value is SyntaxTree.function_lambda_definition)
AddError(get_location(_var_def_statement.inital_value), "IMPOSSIBLE_TO_INFER_TYPES_IN_LAMBDA"); //lroman//

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

@ -15,4 +15,5 @@ NAME_IN_PROPERTY_READ_SECTION_MUST_BE_FIELD_OR_METHOD_NAME=Name in property read
NAME_IN_PROPERTY_WRITE_SECTION_MUST_BE_FIELD_OR_METHOD_NAME=Name in property write section must be field name or method name of this class
STATIC_PROPERTY_MUST_HAVE_STATIC_ACCESSOR=Static property accessor must be static
ENUMS_CANNOT_BE_GENERIC=Enumerator type cannot be generic
PROGRAM_NAME_FOR_TYPE_NAME_IS_PROHIBITED=The name 'program' is prohibited as type name
PROGRAM_NAME_FOR_TYPE_NAME_IS_PROHIBITED=The name 'program' is prohibited as type name
DEFAULT_PARAMS_IN_DELEGATE_TYPE=Procedure type cannot have default parameters

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

@ -16,4 +16,5 @@ NAME_IN_PROPERTY_READ_SECTION_MUST_BE_FIELD_OR_METHOD_NAME=Имя в секци
NAME_IN_PROPERTY_WRITE_SECTION_MUST_BE_FIELD_OR_METHOD_NAME=Имя в секции write свойства должно быть именем поля или процедуры-метода этого класса
STATIC_PROPERTY_MUST_HAVE_STATIC_ACCESSOR=Акцессор статического свойства должен быть статическим
ENUMS_CANNOT_BE_GENERIC=Перечислимый тип не может быть обобщенным
PROGRAM_NAME_FOR_TYPE_NAME_IS_PROHIBITED=Имя 'program' запрещено в качестве имени типа
PROGRAM_NAME_FOR_TYPE_NAME_IS_PROHIBITED=Имя 'program' запрещено в качестве имени типа
DEFAULT_PARAMS_IN_DELEGATE_TYPE=В процедурном типе не могут быть параметры по умолчанию