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

Мелочи

Browse source
This commit is contained in:
miks1965 2018-09-28 15:52:47 +03:00
parent 50d3c255ec
commit aa453fb155
8 changed files with 11 additions and 44 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 = "1799";
public const string Revision = "1803";
public const string MainVersion = Major + "." + Minor;
public const string FullVersion = Major + "." + Minor + "." + Build + "." + Revision;

2
Configuration/Version.defs
View file

@ -1,4 +1,4 @@
%COREVERSION%=2
%REVISION%=1799
%REVISION%=1803
%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.1799'
!define VERSION '3.4.2.1803'

2
TestSuite/CompilationSamples/MonteCarlo.pas
View file

@ -2,6 +2,6 @@
begin
var n := 10000000;
var pp := Range(1,n).Select(x->Rec(Random(),Random())).Where(p->sqr(p.Item1)+sqr(p.Item2)<1).Count/n*4;
var pp := Range(1,n).Select(x->(Random(),Random())).Where(p->sqr(p.Item1)+sqr(p.Item2)<1).Count/n*4;
Print(pp);
end.

33
TestSuite/CompilationSamples/PABCSystem.pas
View file

@ -1836,24 +1836,6 @@ function ReadMatrInteger(m, n: integer): array [,] of integer;
/// Возвращает матрицу m на n вещественных, введенных с клавиатуры
function ReadMatrReal(m, n: integer): array [,] of real;
// -----------------------------------------------------
//>> Подпрограммы для создания кортежей # Subroutines for tuple generation
// -----------------------------------------------------
///- function Rec(x1: T1, x2: T2,...): (T1,T2,...);
/// Возвращает кортеж из элементов разных типов
function Rec<T1, T2>(x1: T1; x2: T2): System.Tuple<T1, T2>;
///--
function Rec<T1, T2, T3>(x1: T1; x2: T2; x3: T3): (T1, T2, T3);
///--
function Rec<T1, T2, T3, T4>(x1: T1; x2: T2; x3: T3; x4: T4): (T1, T2, T3, T4);
///--
function Rec<T1, T2, T3, T4, T5>(x1: T1; x2: T2; x3: T3; x4: T4; x5: T5): (T1, T2, T3, T4, T5);
///--
function Rec<T1, T2, T3, T4, T5, T6>(x1: T1; x2: T2; x3: T3; x4: T4; x5: T5; x6: T6): (T1, T2, T3, T4, T5, T6);
///--
function Rec<T1, T2, T3, T4, T5, T6, T7>(x1: T1; x2: T2; x3: T3; x4: T4; x5: T5; x6: T6; x7: T7): (T1, T2, T3, T4, T5, T6, T7);
// -----------------------------------------------------
//>> Короткие функции Lst, LLst, HSet, SSet, Dict, KV # Short functions Lst, HSet, SSet, Dict, KV
// -----------------------------------------------------
@ -4278,21 +4260,6 @@ begin
Result := ReadSeqStringWhile(cond);
end;
// -----------------------------------------------------------------------------
// Функции Rec для создания кортежей
// -----------------------------------------------------------------------------
function Rec<T1, T2>(x1: T1; x2: T2) := Tuple.Create(x1, x2);
function Rec<T1, T2, T3>(x1: T1; x2: T2; x3: T3) := Tuple.Create(x1, x2, x3);
function Rec<T1, T2, T3, T4>(x1: T1; x2: T2; x3: T3; x4: T4) := Tuple.Create(x1, x2, x3, x4);
function Rec<T1, T2, T3, T4, T5>(x1: T1; x2: T2; x3: T3; x4: T4; x5: T5) := Tuple.Create(x1, x2, x3, x4, x5);
function Rec<T1, T2, T3, T4, T5, T6>(x1: T1; x2: T2; x3: T3; x4: T4; x5: T5; x6: T6) := Tuple.Create(x1, x2, x3, x4, x5, x6);
function Rec<T1, T2, T3, T4, T5, T6, T7>(x1: T1; x2: T2; x3: T3; x4: T4; x5: T5; x6: T6; x7: T7) := Tuple.Create(x1, x2, x3, x4, x5, x6, x7);
// -----------------------------------------------------------------------------
// Функции Lst, LLst, Dict, KV, HSet, SSet
// -----------------------------------------------------------------------------

2
TestSuite/extensionmethods13.pas
View file

@ -1,5 +1,5 @@
begin
var res := Seq('234 456','222 333').Select(s->s.ToWords).Select(ss->Rec(ss[0],ss[1].ToInteger));
var res := Seq('234 456','222 333').Select(s->s.ToWords).Select(ss->(ss[0],ss[1].ToInteger));
var ind := 0;
foreach tup: System.Tuple<string, integer> in res do
begin

12
TestSuite/generics22.pas
View file

@ -1,10 +1,10 @@
begin
var r1 := Rec&<byte, byte>(1, 1);
var r2 := Rec&<byte, byte, byte>(1, 1, 1);
var r3 := Rec&<byte, byte, byte, byte>(1, 1, 1, 1);
var r4 := Rec&<byte, byte, byte, byte, byte>(1, 1, 1, 1, 1);
var r5 := Rec&<byte, byte, byte, byte, byte, byte>(1, 1, 1, 1, 1, 1);
var r6 := Rec&<byte, byte, byte, byte, byte, byte, byte>(1, 1, 1, 1, 1, 1, 1);
var r1 := (1, 1);
var r2 := (1, 1, 1);
var r3 := (1, 1, 1, 1);
var r4 := (1, 1, 1, 1, 1);
var r5 := (1, 1, 1, 1, 1, 1);
var r6 := (1, 1, 1, 1, 1, 1, 1);
assert(r1.Item1 = 1);
assert(r2.Item1 = 1);
assert(r3.Item1 = 1);