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

fix #2863

Browse source
This commit is contained in:
Mikhalkovich Stanislav 2023-05-25 14:03:05 +03:00
parent 41d9e2ab1b
commit ebc86578d3
9 changed files with 33 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 = "9";
public const string Build = "0";
public const string Revision = "3282";
public const string Revision = "3287";
public const string MainVersion = Major + "." + Minor;
public const string FullVersion = Major + "." + Minor + "." + Build + "." + Revision;

4
Configuration/Version.defs
View file

@ -1,4 +1,4 @@
%COREVERSION%=0
%REVISION%=3282
%MINOR%=9
%REVISION%=3287
%COREVERSION%=0
%MAJOR%=3

2
Release/pabcversion.txt
View file

@ -1 +1 @@
3.9.0.3282
3.9.0.3287

2
ReleaseGenerators/PascalABCNET_version.nsh
View file

@ -1 +1 @@
!define VERSION '3.9.0.3282'
!define VERSION '3.9.0.3287'

2
SyntaxVisitors/SugarVisitors/TupleVisitor.cs
View file

@ -119,7 +119,7 @@ namespace SyntaxVisitors.SugarVisitors
}
//for (var i = 0; i < n; i++)
for (var i = n-1; i >=0; i--)
for (var i = n-1; i >= 0; i--)
{
var a = new assign(asstup.vars.variables[i],
(sl[i] as var_statement).var_def.vars.idents[0],

15
TestSuite/errors/err0522_namedargs1.pas Normal file
View file

@ -0,0 +1,15 @@
//!Неизвестный именованный аргумент Вася
procedure p(s: string; z: string := ''; x: integer := 2);
begin
Print(x);
end;
procedure p(x: real := 2);
begin
end;
// Должно быть - не могу найти подходящую функцию
begin
p('dsfh', Вася := 3);
end.

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

@ -0,0 +1,3 @@
begin
var a := (0).div(1,2)
end.

6
TreeConverter/TreeConversion/syntax_tree_visitor.cs
View file

@ -5522,7 +5522,11 @@ namespace PascalABCCompiler.TreeConverter
}
else
{
sil = exp.type.find_in_type(id_right.name, context.CurrentScope);
sil = exp.type.find_in_type(id_right.name, context.CurrentScope); // SSM 25.05.23 тут находится div в 1.div(2,3), а не должен
// в этом случае sil.sym_info = basic_function_node
sil = sil?.FindAll(si => !(si.sym_info is basic_function_node)); // убираю все такие операторы. Может, убираю лишнее
if (sil != null && sil.Count == 0)
sil = null;
sil = sil?.Distinct(new SymInfoComparer()).ToList(); // SSM 16/06/20 - удалил дубли для порядка
if (sil != null && sil.FirstOrDefault().sym_info != null && sil.FirstOrDefault().sym_info.semantic_node_type == semantic_node_type.wrap_def)
{

4
bin/Lib/log.txt
View file

@ -402,3 +402,7 @@
в CodeCompletion.SymScope.GetExtensionMethods(TypeScope ts, String name) в D:\PABC_Git\CodeCompletion\SymTable.cs:строка 482
в CodeCompletion.SymScope.GetExtensionMethods(String name, TypeScope ts) в D:\PABC_Git\CodeCompletion\SymTable.cs:строка 367
в CodeCompletion.DomSyntaxTreeVisitor.visit(bin_expr _bin_expr) в D:\PABC_Git\CodeCompletion\DomSyntaxTreeVisitor.cs:строка 560
Ссылка на объект не указывает на экземпляр объекта.
в CodeCompletion.DomSyntaxTreeVisitor.visit(program_module _program_module) в D:\PABC_Git\CodeCompletion\DomSyntaxTreeVisitor.cs:строка 3019
в PascalABCCompiler.SyntaxTree.program_module.visit(IVisitor visitor) в D:\PABC_Git\SyntaxTree\tree\Tree.cs:строка 13211
в CodeCompletion.DomSyntaxTreeVisitor.Convert(compilation_unit cu) в D:\PABC_Git\CodeCompletion\DomSyntaxTreeVisitor.cs:строка 63