THRIFT-5618 More consistent naming of container classes
Client: delphi
Patch: Jens Geyer
diff --git a/compiler/cpp/src/thrift/generate/t_delphi_generator.cc b/compiler/cpp/src/thrift/generate/t_delphi_generator.cc
index 8383cea..4dfddc0 100644
--- a/compiler/cpp/src/thrift/generate/t_delphi_generator.cc
+++ b/compiler/cpp/src/thrift/generate/t_delphi_generator.cc
@@ -3138,9 +3138,9 @@
} else if (ttype->is_set()) {
t_set* tset = (t_set*)ttype;
if (b_cls) {
- typ_nm = "THashSetImpl";
+ typ_nm = "TThriftHashSetImpl";
} else {
- typ_nm = "IHashSet";
+ typ_nm = "IThriftHashSet";
}
return typ_nm + "<" + type_name(tset->get_elem_type()) + ">";
} else if (ttype->is_list()) {
diff --git a/lib/delphi/src/Thrift.Collections.pas b/lib/delphi/src/Thrift.Collections.pas
index ad852ac..36a8d96 100644
--- a/lib/delphi/src/Thrift.Collections.pas
+++ b/lib/delphi/src/Thrift.Collections.pas
@@ -190,7 +190,7 @@
function ToString : string; override;
end;
- IHashSet<TValue> = interface(IThriftContainer)
+ IThriftHashSet<TValue> = interface(IThriftContainer)
['{0923A3B5-D4D4-48A8-91AD-40238E2EAD66}']
function GetEnumerator: TEnumerator<TValue>;
function GetIsReadOnly: Boolean;
@@ -204,7 +204,15 @@
function Remove( const item: TValue ): Boolean;
end;
- THashSetImpl<TValue> = class( TInterfacedObject, IHashSet<TValue>, IThriftContainer, ISupportsToString)
+ // compatibility
+ IHashSet<TValue> = interface( IThriftHashSet<TValue>)
+ ['{C3CF557F-21D9-4524-B899-D3145B0389BB}']
+ end deprecated 'use IThriftHashSet<T>';
+
+
+ {$WARN SYMBOL_DEPRECATED OFF}
+ TThriftHashSetImpl<TValue> = class( TInterfacedObject, IHashSet<TValue>, IThriftHashSet<TValue>, IThriftContainer, ISupportsToString)
+ {$WARN SYMBOL_DEPRECATED DEFAULT}
strict private
FDictionary : IThriftDictionary<TValue,Integer>;
FIsReadOnly: Boolean;
@@ -224,11 +232,15 @@
function ToString : string; override;
end;
+ // compatibility
+ THashSetImpl<TValue> = class( TThriftHashSetImpl<TValue>)
+ end deprecated 'use TThriftHashSetImpl<T>';
+
implementation
-{ THashSetImpl<TValue> }
+{ TThriftHashSetImpl<TValue>. }
-procedure THashSetImpl<TValue>.Add( const item: TValue);
+procedure TThriftHashSetImpl<TValue>.Add( const item: TValue);
begin
if not FDictionary.ContainsKey(item) then
begin
@@ -236,17 +248,17 @@
end;
end;
-procedure THashSetImpl<TValue>.Clear;
+procedure TThriftHashSetImpl<TValue>.Clear;
begin
FDictionary.Clear;
end;
-function THashSetImpl<TValue>.Contains( const item: TValue): Boolean;
+function TThriftHashSetImpl<TValue>.Contains( const item: TValue): Boolean;
begin
Result := FDictionary.ContainsKey(item);
end;
-procedure THashSetImpl<TValue>.CopyTo(var A: TArray<TValue>; arrayIndex: Integer);
+procedure TThriftHashSetImpl<TValue>.CopyTo(var A: TArray<TValue>; arrayIndex: Integer);
var
i : Integer;
Enumlator : TEnumerator<TValue>;
@@ -259,28 +271,28 @@
end;
end;
-constructor THashSetImpl<TValue>.Create;
+constructor TThriftHashSetImpl<TValue>.Create;
begin
inherited;
FDictionary := TThriftDictionaryImpl<TValue,Integer>.Create;
end;
-function THashSetImpl<TValue>.GetCount: Integer;
+function TThriftHashSetImpl<TValue>.GetCount: Integer;
begin
Result := FDictionary.Count;
end;
-function THashSetImpl<TValue>.GetEnumerator: TEnumerator<TValue>;
+function TThriftHashSetImpl<TValue>.GetEnumerator: TEnumerator<TValue>;
begin
Result := FDictionary.Keys.GetEnumerator;
end;
-function THashSetImpl<TValue>.GetIsReadOnly: Boolean;
+function TThriftHashSetImpl<TValue>.GetIsReadOnly: Boolean;
begin
Result := FIsReadOnly;
end;
-function THashSetImpl<TValue>.Remove( const item: TValue): Boolean;
+function TThriftHashSetImpl<TValue>.Remove( const item: TValue): Boolean;
begin
Result := False;
if FDictionary.ContainsKey( item ) then
@@ -290,7 +302,7 @@
end;
end;
-function THashSetImpl<TValue>.ToString : string;
+function TThriftHashSetImpl<TValue>.ToString : string;
var elm : TValue;
sb : TThriftStringBuilder;
first : Boolean;
diff --git a/lib/delphi/test/serializer/TestSerializer.Data.pas b/lib/delphi/test/serializer/TestSerializer.Data.pas
index a90d650..af366fd 100644
--- a/lib/delphi/test/serializer/TestSerializer.Data.pas
+++ b/lib/delphi/test/serializer/TestSerializer.Data.pas
@@ -230,7 +230,7 @@
result.Big[0].setA_bite( $22);
result.Big[0].setA_bite( $23);
- result.Contain := THashSetImpl< IThriftList<string>>.Create;
+ result.Contain := TThriftHashSetImpl< IThriftList<string>>.Create;
stage1 := TThriftListImpl<String>.Create;
stage1.add( 'and a one');
stage1.add( 'and a two');