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

fix #2240

Browse source
This commit is contained in:
Mikhalkovich Stanislav 2020-05-28 22:09:01 +03:00
parent 82deb54798
commit 21a2675b0a
8 changed files with 19 additions and 8 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 Major = "3";
public const string Minor = "6"; public const string Minor = "6";
public const string Build = "3"; public const string Build = "3";
public const string Revision = "2490"; public const string Revision = "2491";
public const string MainVersion = Major + "." + Minor; public const string MainVersion = Major + "." + Minor;
public const string FullVersion = Major + "." + Minor + "." + Build + "." + Revision; public const string FullVersion = Major + "." + Minor + "." + Build + "." + Revision;

4
Configuration/Version.defs
View file

@ -1,4 +1,4 @@
%COREVERSION%=3
%REVISION%=2490
%MINOR%=6 %MINOR%=6
%REVISION%=2491
%COREVERSION%=3
%MAJOR%=3 %MAJOR%=3

2
Release/pabcversion.txt
View file

@ -1 +1 @@
3.6.3.2490 3.6.3.2491

2
ReleaseGenerators/PascalABCNET_version.nsh
View file

@ -1 +1 @@
!define VERSION '3.6.3.2490' !define VERSION '3.6.3.2491'

4
TestSuite/CompilationSamples/GraphWPF.pas
View file

@ -42,9 +42,11 @@ type
GPen = System.Windows.Media.Pen; GPen = System.Windows.Media.Pen;
/// Тип точки /// Тип точки
Point = System.Windows.Point; Point = System.Windows.Point;
/// Тип вектора /// Тип точки
GPoint = System.Windows.Point; GPoint = System.Windows.Point;
/// Тип вектора
Vector = System.Windows.Vector; Vector = System.Windows.Vector;
/// Тип кисти
GBrush = System.Windows.Media.Brush; GBrush = System.Windows.Media.Brush;
/// Тип стиля шрифта /// Тип стиля шрифта
FontStyle = (Normal,Bold,Italic,BoldItalic); FontStyle = (Normal,Bold,Italic,BoldItalic);

2
TestSuite/CompilationSamples/PABCSystem.pas
View file

@ -10699,7 +10699,7 @@ begin
Result := a; Result := a;
end; end;
/// Возвращает массив строк двумерного массива /// Возвращает массив столбцов двумерного массива
function Cols<T>(Self: array [,] of T): array of array of T; extensionmethod; function Cols<T>(Self: array [,] of T): array of array of T; extensionmethod;
type ArrT = array of T; type ArrT = array of T;
begin begin

9
TestSuite/ToMatrixArrOfArrT.pas Normal file
View file

@ -0,0 +1,9 @@
procedure ToMatrix<T>(Self: array of array of T); extensionmethod;
begin
Assert(2=2)
end;
begin
var a: array of array of integer;
a.ToMatrix;
end.

2
TreeConverter/TreeConversion/syntax_tree_visitor.cs
View file

@ -13841,7 +13841,7 @@ namespace PascalABCCompiler.TreeConverter
SymbolInfo si = new SymbolInfo(context.top_function); SymbolInfo si = new SymbolInfo(context.top_function);
si.symbol_kind = symbol_kind.sk_overload_function; si.symbol_kind = symbol_kind.sk_overload_function;
top_function.ConnectedToType.Scope.AddSymbol(top_function.name, si); top_function.ConnectedToType.Scope.AddSymbol(top_function.name, si);
if (top_function.ConnectedToType.type_special_kind == SemanticTree.type_special_kind.array_kind && top_function.ConnectedToType.element_type.is_generic_parameter) if (top_function.ConnectedToType.type_special_kind == SemanticTree.type_special_kind.array_kind /*&& top_function.ConnectedToType.element_type.is_generic_parameter*/)
top_function.ConnectedToType.base_type.Scope.AddSymbol(top_function.name, new SymbolInfo(context.top_function)); top_function.ConnectedToType.base_type.Scope.AddSymbol(top_function.name, new SymbolInfo(context.top_function));
else if (top_function.ConnectedToType.is_generic_parameter) else if (top_function.ConnectedToType.is_generic_parameter)
top_function.ConnectedToType.base_type.Scope.AddSymbol(top_function.name, new SymbolInfo(context.top_function)); top_function.ConnectedToType.base_type.Scope.AddSymbol(top_function.name, new SymbolInfo(context.top_function));