Skip to content

Commit 3273f75

Browse files
bakwcbakwc
committed
Removed tsl, renamed serializer
1 parent 24518e0 commit 3273f75

24 files changed

+78
-5947
lines changed

‎contrib/CMakeLists.txt

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11

2-
add_subdirectory(saveload)
3-
add_subdirectory(tsl)
2+
add_subdirectory(handypack)
43
add_subdirectory(phf)
54
add_subdirectory(cityhash)
65
add_subdirectory(bloom)

‎contrib/handypack/CMakeLists.txt

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
add_library(handypack handypack.cpp handypack.hpp)
2+

‎contrib/handypack/handypack.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#include "handypack.hpp"

‎contrib/saveload/saveload.hpp ‎contrib/handypack/handypack.hpp

+44-44
Original file line numberDiff line numberDiff line change
@@ -12,21 +12,21 @@
1212
#include <streambuf>
1313
#include <tuple>
1414

15-
namespace NSaveLoad {
15+
namespace NHandyPack {
1616

1717
template<class T, typename E = void>
1818
class TSerializer {
1919
public:
20-
static void Save(std::ostream& out, const T& object) {
21-
object.Save(out);
20+
static void Dump(std::ostream& out, const T& object) {
21+
object.Dump(out);
2222
}
2323
static void Load(std::istream& in, T& object) {
2424
object.Load(in);
2525
}
2626
};
2727

2828
template <class T>
29-
static inline void Save(std::ostream& out, const T& t);
29+
static inline void Dump(std::ostream& out, const T& t);
3030

3131
template <class T>
3232
static inline void Load(std::istream& in, T& t);
@@ -35,45 +35,45 @@ static inline void Load(std::istream& in, T& t);
3535
template <class A, class B>
3636
class TSerializer<std::pair<A, B> > {
3737
public:
38-
static void Save(std::ostream& out, const std::pair<A, B>& object) {
39-
NSaveLoad::Save(out, object.first);
40-
NSaveLoad::Save(out, object.second);
38+
static void Dump(std::ostream& out, const std::pair<A, B>& object) {
39+
NHandyPack::Dump(out, object.first);
40+
NHandyPack::Dump(out, object.second);
4141
}
4242
static void Load(std::istream& in, std::pair<A, B>& object) {
43-
NSaveLoad::Load(in, object.first);
44-
NSaveLoad::Load(in, object.second);
43+
NHandyPack::Load(in, object.first);
44+
NHandyPack::Load(in, object.second);
4545
}
4646
};
4747

4848
template<std::size_t> struct int_{};
4949

5050
template <class Tuple, size_t Pos>
51-
void SaveTuple(std::ostream& out, const Tuple& tuple, int_<Pos>) {
52-
SaveTuple(out, tuple, int_<Pos-1>());
53-
NSaveLoad::Save(out, std::get<std::tuple_size<Tuple>::value-Pos>(tuple));
51+
void DumpTuple(std::ostream& out, const Tuple& tuple, int_<Pos>) {
52+
DumpTuple(out, tuple, int_<Pos-1>());
53+
NHandyPack::Dump(out, std::get<std::tuple_size<Tuple>::value-Pos>(tuple));
5454
}
5555

5656
template <class Tuple>
57-
void SaveTuple(std::ostream& out, const Tuple& tuple, int_<1>) {
58-
NSaveLoad::Save(out, std::get<std::tuple_size<Tuple>::value-1>(tuple));
57+
void DumpTuple(std::ostream& out, const Tuple& tuple, int_<1>) {
58+
NHandyPack::Dump(out, std::get<std::tuple_size<Tuple>::value-1>(tuple));
5959
}
6060

6161
template <class Tuple, size_t Pos>
6262
void LoadTuple(std::istream& in, Tuple& tuple, int_<Pos>) {
6363
LoadTuple(in, tuple, int_<Pos-1>());
64-
NSaveLoad::Load(in, std::get<std::tuple_size<Tuple>::value-Pos>(tuple));
64+
NHandyPack::Load(in, std::get<std::tuple_size<Tuple>::value-Pos>(tuple));
6565
}
6666

6767
template <class Tuple>
6868
void LoadTuple(std::istream& in, Tuple& tuple, int_<1>) {
69-
NSaveLoad::Load(in, std::get<std::tuple_size<Tuple>::value-1>(tuple));
69+
NHandyPack::Load(in, std::get<std::tuple_size<Tuple>::value-1>(tuple));
7070
}
7171

7272
template <class... Args>
7373
class TSerializer<std::tuple<Args...>> {
7474
public:
75-
static void Save(std::ostream& out, const std::tuple<Args...>& object) {
76-
SaveTuple(out, object, int_<sizeof...(Args)>());
75+
static void Dump(std::ostream& out, const std::tuple<Args...>& object) {
76+
DumpTuple(out, object, int_<sizeof...(Args)>());
7777
}
7878
static void Load(std::istream& in, std::tuple<Args...>& object) {
7979
LoadTuple(in, object, int_<sizeof...(Args)>());
@@ -83,11 +83,11 @@ class TSerializer<std::tuple<Args...>> {
8383
template<class TVec, class TObj>
8484
class TVectorSerializer {
8585
public:
86-
static inline void Save(std::ostream& out, const TVec& object) {
86+
static inline void Dump(std::ostream& out, const TVec& object) {
8787
uint32_t size = object.size();
8888
out.write((const char*)(&size), sizeof(size));
8989
for (const auto& obj: object) {
90-
NSaveLoad::Save(out, obj);
90+
NHandyPack::Dump(out, obj);
9191
}
9292
}
9393

@@ -98,7 +98,7 @@ class TVectorSerializer {
9898
object.reserve(size);
9999
for (size_t i = 0; i < size; ++i) {
100100
TObj obj;
101-
NSaveLoad::Load(in, obj);
101+
NHandyPack::Load(in, obj);
102102
object.push_back(std::move(obj));
103103
}
104104
}
@@ -107,11 +107,11 @@ class TVectorSerializer {
107107
template<class TVec, class TKey, class TValue>
108108
class TMapSerializer {
109109
public:
110-
static inline void Save(std::ostream& out, const TVec& object) {
110+
static inline void Dump(std::ostream& out, const TVec& object) {
111111
uint32_t size = object.size();
112112
out.write((const char*)(&size), sizeof(size));
113113
for (const auto& obj: object) {
114-
NSaveLoad::Save(out, obj);
114+
NHandyPack::Dump(out, obj);
115115
}
116116
}
117117

@@ -121,7 +121,7 @@ class TMapSerializer {
121121
object.clear();
122122
for (size_t i = 0; i < size; ++i) {
123123
std::pair<TKey, TValue> obj;
124-
NSaveLoad::Load(in, obj);
124+
NHandyPack::Load(in, obj);
125125
object.insert(std::move(obj));
126126
}
127127
}
@@ -130,11 +130,11 @@ class TMapSerializer {
130130
template<class TVec, class TKey, class TValue>
131131
class TUnorderedMapSerializer {
132132
public:
133-
static inline void Save(std::ostream& out, const TVec& object) {
133+
static inline void Dump(std::ostream& out, const TVec& object) {
134134
uint32_t size = object.size();
135135
out.write((const char*)(&size), sizeof(size));
136136
for (const auto& obj: object) {
137-
NSaveLoad::Save(out, obj);
137+
NHandyPack::Dump(out, obj);
138138
}
139139
}
140140

@@ -145,7 +145,7 @@ class TUnorderedMapSerializer {
145145
object.reserve(size);
146146
for (size_t i = 0; i < size; ++i) {
147147
std::pair<TKey, TValue> obj;
148-
NSaveLoad::Load(in, obj);
148+
NHandyPack::Load(in, obj);
149149
object.insert(std::move(obj));
150150
}
151151
}
@@ -154,11 +154,11 @@ class TUnorderedMapSerializer {
154154
template<class TVec, class TObj>
155155
class TSetSerializer {
156156
public:
157-
static inline void Save(std::ostream& out, const TVec& object) {
157+
static inline void Dump(std::ostream& out, const TVec& object) {
158158
uint32_t size = object.size();
159159
out.write((const char*)(&size), sizeof(size));
160160
for (const auto& obj: object) {
161-
NSaveLoad::Save(out, obj);
161+
NHandyPack::Dump(out, obj);
162162
}
163163
}
164164

@@ -168,7 +168,7 @@ class TSetSerializer {
168168
object.clear();
169169
for (size_t i = 0; i < size; ++i) {
170170
TObj obj;
171-
NSaveLoad::Load(in, obj);
171+
NHandyPack::Load(in, obj);
172172
object.insert(std::move(obj));
173173
}
174174
}
@@ -186,7 +186,7 @@ template <class T> class TSerializer<std::unordered_set<T> >: public TSetSeriali
186186
template <class T>
187187
class TPodSerializer {
188188
public:
189-
static inline void Save(std::ostream& out, const T& object) {
189+
static inline void Dump(std::ostream& out, const T& object) {
190190
out.write((const char*)(&object), sizeof(T));
191191
}
192192
static inline void Load(std::istream& in, T& object) {
@@ -198,14 +198,14 @@ template<class T>
198198
class TSerializer<T, typename std::enable_if<!std::is_class<T>::value>::type>: public TPodSerializer<T> {};
199199

200200
template <class T>
201-
static inline void Save(std::ostream& out, const T& t) {
202-
TSerializer<T>::Save(out, t);
201+
static inline void Dump(std::ostream& out, const T& t) {
202+
TSerializer<T>::Dump(out, t);
203203
}
204204

205205
template<class T, class... Args>
206-
static inline void Save(std::ostream& out, const T& first, const Args&... args) {
207-
NSaveLoad::Save(out, first);
208-
NSaveLoad::Save(out, args...);
206+
static inline void Dump(std::ostream& out, const T& first, const Args&... args) {
207+
NHandyPack::Dump(out, first);
208+
NHandyPack::Dump(out, args...);
209209
}
210210

211211
template <class T>
@@ -215,17 +215,17 @@ static inline void Load(std::istream& in, T& t) {
215215

216216
template <class T, class... Args>
217217
static inline void Load(std::istream& in, T& first, Args&... args) {
218-
NSaveLoad::Load(in, first);
219-
NSaveLoad::Load(in, args...);
218+
NHandyPack::Load(in, first);
219+
NHandyPack::Load(in, args...);
220220
}
221221

222-
#define SAVELOAD(...) \
223-
inline virtual void Save(std::ostream& out) const { \
224-
NSaveLoad::Save(out, __VA_ARGS__); \
222+
#define HANDYPACK(...) \
223+
inline virtual void Dump(std::ostream& out) const { \
224+
NHandyPack::Dump(out, __VA_ARGS__); \
225225
} \
226226
\
227227
inline virtual void Load(std::istream& in) { \
228-
NSaveLoad::Load(in, __VA_ARGS__); \
228+
NHandyPack::Load(in, __VA_ARGS__); \
229229
}
230230

231231

@@ -242,6 +242,6 @@ struct imemstream: virtual membuf, std::istream {
242242
}
243243
};
244244

245-
#define SAVELOAD_POD(TypeName) template <> class TSerializer<TypeName>: public TPodSerializer<TypeName> {};
245+
#define HANDYPACK_POD(TypeName) template <> class TSerializer<TypeName>: public TPodSerializer<TypeName> {};
246246

247-
} // NSaveLoad
247+
} // NHandyPack

‎contrib/saveload/CMakeLists.txt

-2
This file was deleted.

‎contrib/saveload/saveload.cpp

-1
This file was deleted.

‎contrib/tsl/CMakeLists.txt

-1
This file was deleted.

‎contrib/tsl/LICENSE

-21
This file was deleted.

‎contrib/tsl/array-hash/LICENSE

-21
This file was deleted.

0 commit comments

Comments
 (0)