Справка в Unicode
This commit is contained in:
parent
1f3dd8af07
commit
f30fd3e63a
|
|
@ -15,7 +15,7 @@ internal static class RevisionClass
|
|||
public const string Major = "2";
|
||||
public const string Minor = "2";
|
||||
public const string Build = "0";
|
||||
public const string Revision = "957";
|
||||
public const string Revision = "958";
|
||||
|
||||
public const string MainVersion = Major + "." + Minor;
|
||||
public const string FullVersion = Major + "." + Minor + "." + Build + "." + Revision;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
%MINOR%=2
|
||||
%REVISION%=958
|
||||
%MAJOR%=2
|
||||
%COREVERSION%=0
|
||||
%MINOR%=2
|
||||
%REVISION%=957
|
||||
|
|
|
|||
|
|
@ -1354,7 +1354,7 @@ proc_type_decl
|
|||
{
|
||||
$$ = new modern_proc_type(null,$2 as enumerator_list,$5,@$);
|
||||
}
|
||||
| simple_type_identifier tkArrow tkRoundOpen tkRoundClose
|
||||
| simple_type_identifier tkArrow tkRoundOpen tkRoundClose // эти 2 правила нельзя объединять в одно template_param - будет конфликт
|
||||
{
|
||||
$$ = new modern_proc_type($1,null,null,@$);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
!define VERSION '2.2.0.957'
|
||||
!define VERSION '2.2.0.958'
|
||||
Binary file not shown.
|
|
@ -2239,7 +2239,6 @@ end;
|
|||
procedure TypedSet.AssignSetFrom(s: TypedSet);
|
||||
begin
|
||||
ht := s.ht.Clone() as Hashtable;
|
||||
//copy_ht := s.ht;
|
||||
Clip;
|
||||
end;
|
||||
|
||||
|
|
@ -2279,12 +2278,10 @@ begin
|
|||
while i.MoveNext do
|
||||
if not (i.Current is IComparable) then
|
||||
begin
|
||||
//if IsInDiapason(i.Current) then
|
||||
result := (added ? result + ',' : '') + FormatStr(i.Current);
|
||||
added := true;
|
||||
end
|
||||
else
|
||||
//if IsInDiapason(i.Current) then
|
||||
begin
|
||||
if (t <> nil) and (t <> i.Current.GetType) then
|
||||
begin
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -2239,7 +2239,6 @@ end;
|
|||
procedure TypedSet.AssignSetFrom(s: TypedSet);
|
||||
begin
|
||||
ht := s.ht.Clone() as Hashtable;
|
||||
//copy_ht := s.ht;
|
||||
Clip;
|
||||
end;
|
||||
|
||||
|
|
@ -2279,12 +2278,10 @@ begin
|
|||
while i.MoveNext do
|
||||
if not (i.Current is IComparable) then
|
||||
begin
|
||||
//if IsInDiapason(i.Current) then
|
||||
result := (added ? result + ',' : '') + FormatStr(i.Current);
|
||||
added := true;
|
||||
end
|
||||
else
|
||||
//if IsInDiapason(i.Current) then
|
||||
begin
|
||||
if (t <> nil) and (t <> i.Current.GetType) then
|
||||
begin
|
||||
|
|
|
|||
Binary file not shown.
Loading…
Reference in a new issue