catboost 1.25.1 → 1.26.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/DEPLOYMENT.md +22 -15
- package/README.md +37 -27
- package/binding.gyp +5 -7
- package/build_scripts/bootstrap.js +2 -1
- package/build_scripts/out/build.js +46 -68
- package/build_scripts/out/build_model.js +1 -1
- package/build_scripts/out/{build_ya.js → build_native.js} +1 -1
- package/build_scripts/out/ci.js +5 -5
- package/build_scripts/out/config.js +32 -18
- package/build_scripts/out/install.js +5 -3
- package/build_scripts/out/package_prepublish.js +1 -1
- package/build_scripts/out/packaging.js +1 -19
- package/build_scripts/out/run_tests.js +1 -1
- package/build_scripts/out/test.js +8 -3
- package/config.json +18 -11
- package/inc/catboost/libs/model_interface/c_api.h +349 -3
- package/lib/catboost.d.ts +65 -21
- package/package.json +4 -4
- package/src/api_helpers.cpp +100 -24
- package/src/api_helpers.h +8 -7
- package/src/api_module.cpp +1 -2
- package/src/model.cpp +483 -83
- package/src/model.h +24 -9
- package/inc/contrib/libs/cxxsupp/system_stl/include/stlfwd +0 -14
- package/inc/util/charset/recode_result.h +0 -9
- package/inc/util/charset/unicode_table.h +0 -123
- package/inc/util/charset/unidata.h +0 -421
- package/inc/util/charset/utf8.h +0 -384
- package/inc/util/charset/wide.h +0 -843
- package/inc/util/charset/wide_specific.h +0 -22
- package/inc/util/datetime/base.h +0 -669
- package/inc/util/datetime/constants.h +0 -7
- package/inc/util/datetime/cputimer.h +0 -124
- package/inc/util/datetime/parser.h +0 -292
- package/inc/util/datetime/systime.h +0 -47
- package/inc/util/datetime/uptime.h +0 -8
- package/inc/util/digest/city.h +0 -88
- package/inc/util/digest/fnv.h +0 -73
- package/inc/util/digest/multi.h +0 -14
- package/inc/util/digest/murmur.h +0 -57
- package/inc/util/digest/numeric.h +0 -86
- package/inc/util/digest/sequence.h +0 -48
- package/inc/util/draft/date.h +0 -129
- package/inc/util/draft/datetime.h +0 -184
- package/inc/util/draft/enum.h +0 -136
- package/inc/util/draft/holder_vector.h +0 -102
- package/inc/util/draft/ip.h +0 -131
- package/inc/util/draft/matrix.h +0 -108
- package/inc/util/draft/memory.h +0 -40
- package/inc/util/folder/dirent_win.h +0 -46
- package/inc/util/folder/dirut.h +0 -121
- package/inc/util/folder/filelist.h +0 -81
- package/inc/util/folder/fts.h +0 -108
- package/inc/util/folder/iterator.h +0 -109
- package/inc/util/folder/lstat_win.h +0 -20
- package/inc/util/folder/path.h +0 -225
- package/inc/util/folder/pathsplit.h +0 -113
- package/inc/util/folder/tempdir.h +0 -42
- package/inc/util/generic/adaptor.h +0 -134
- package/inc/util/generic/algorithm.h +0 -765
- package/inc/util/generic/array_ref.h +0 -282
- package/inc/util/generic/array_size.h +0 -24
- package/inc/util/generic/benchmark/vector_count_ctor/f.h +0 -9
- package/inc/util/generic/bitmap.h +0 -1115
- package/inc/util/generic/bitops.h +0 -459
- package/inc/util/generic/bt_exception.h +0 -24
- package/inc/util/generic/buffer.h +0 -232
- package/inc/util/generic/cast.h +0 -176
- package/inc/util/generic/deque.h +0 -24
- package/inc/util/generic/explicit_type.h +0 -42
- package/inc/util/generic/fastqueue.h +0 -55
- package/inc/util/generic/flags.h +0 -244
- package/inc/util/generic/function.h +0 -103
- package/inc/util/generic/fwd.h +0 -171
- package/inc/util/generic/guid.h +0 -61
- package/inc/util/generic/hash.h +0 -2032
- package/inc/util/generic/hash_primes.h +0 -140
- package/inc/util/generic/hash_set.h +0 -490
- package/inc/util/generic/hide_ptr.h +0 -3
- package/inc/util/generic/intrlist.h +0 -876
- package/inc/util/generic/is_in.h +0 -53
- package/inc/util/generic/iterator.h +0 -137
- package/inc/util/generic/iterator_range.h +0 -105
- package/inc/util/generic/lazy_value.h +0 -66
- package/inc/util/generic/list.h +0 -22
- package/inc/util/generic/map.h +0 -44
- package/inc/util/generic/mapfindptr.h +0 -60
- package/inc/util/generic/maybe.h +0 -713
- package/inc/util/generic/maybe_traits.h +0 -164
- package/inc/util/generic/mem_copy.h +0 -55
- package/inc/util/generic/noncopyable.h +0 -38
- package/inc/util/generic/object_counter.h +0 -53
- package/inc/util/generic/ptr.h +0 -1113
- package/inc/util/generic/queue.h +0 -57
- package/inc/util/generic/refcount.h +0 -162
- package/inc/util/generic/reserve.h +0 -11
- package/inc/util/generic/scope.h +0 -65
- package/inc/util/generic/serialized_enum.h +0 -406
- package/inc/util/generic/set.h +0 -42
- package/inc/util/generic/singleton.h +0 -136
- package/inc/util/generic/size_literals.h +0 -65
- package/inc/util/generic/stack.h +0 -18
- package/inc/util/generic/store_policy.h +0 -120
- package/inc/util/generic/strbase.h +0 -612
- package/inc/util/generic/strbuf.h +0 -552
- package/inc/util/generic/strfcpy.h +0 -17
- package/inc/util/generic/string.h +0 -1572
- package/inc/util/generic/string_hash.h +0 -21
- package/inc/util/generic/string_ut.h +0 -1175
- package/inc/util/generic/type_name.h +0 -34
- package/inc/util/generic/typelist.h +0 -114
- package/inc/util/generic/typetraits.h +0 -325
- package/inc/util/generic/utility.h +0 -132
- package/inc/util/generic/va_args.h +0 -400
- package/inc/util/generic/variant.h +0 -631
- package/inc/util/generic/variant_traits.h +0 -171
- package/inc/util/generic/vector.h +0 -119
- package/inc/util/generic/xrange.h +0 -258
- package/inc/util/generic/yexception.h +0 -212
- package/inc/util/generic/yexception_ut.h +0 -14
- package/inc/util/generic/ylimits.h +0 -92
- package/inc/util/generic/ymath.h +0 -206
- package/inc/util/memory/addstorage.h +0 -93
- package/inc/util/memory/alloc.h +0 -27
- package/inc/util/memory/blob.h +0 -296
- package/inc/util/memory/mmapalloc.h +0 -8
- package/inc/util/memory/pool.h +0 -432
- package/inc/util/memory/segmented_string_pool.h +0 -194
- package/inc/util/memory/segpool_alloc.h +0 -118
- package/inc/util/memory/smallobj.h +0 -141
- package/inc/util/memory/tempbuf.h +0 -111
- package/inc/util/network/address.h +0 -136
- package/inc/util/network/endpoint.h +0 -61
- package/inc/util/network/hostip.h +0 -16
- package/inc/util/network/init.h +0 -60
- package/inc/util/network/interface.h +0 -17
- package/inc/util/network/iovec.h +0 -65
- package/inc/util/network/ip.h +0 -116
- package/inc/util/network/nonblock.h +0 -8
- package/inc/util/network/pair.h +0 -9
- package/inc/util/network/poller.h +0 -58
- package/inc/util/network/pollerimpl.h +0 -707
- package/inc/util/network/sock.h +0 -608
- package/inc/util/network/socket.h +0 -421
- package/inc/util/random/common_ops.h +0 -130
- package/inc/util/random/easy.h +0 -47
- package/inc/util/random/entropy.h +0 -21
- package/inc/util/random/fast.h +0 -101
- package/inc/util/random/init_atfork.h +0 -3
- package/inc/util/random/lcg_engine.h +0 -66
- package/inc/util/random/mersenne.h +0 -46
- package/inc/util/random/mersenne32.h +0 -50
- package/inc/util/random/mersenne64.h +0 -50
- package/inc/util/random/normal.h +0 -38
- package/inc/util/random/random.h +0 -30
- package/inc/util/random/shuffle.h +0 -39
- package/inc/util/str_stl.h +0 -266
- package/inc/util/stream/aligned.h +0 -99
- package/inc/util/stream/buffer.h +0 -119
- package/inc/util/stream/buffered.h +0 -225
- package/inc/util/stream/debug.h +0 -53
- package/inc/util/stream/direct_io.h +0 -43
- package/inc/util/stream/file.h +0 -108
- package/inc/util/stream/format.h +0 -444
- package/inc/util/stream/fwd.h +0 -100
- package/inc/util/stream/hex.h +0 -8
- package/inc/util/stream/holder.h +0 -44
- package/inc/util/stream/input.h +0 -273
- package/inc/util/stream/labeled.h +0 -19
- package/inc/util/stream/length.h +0 -100
- package/inc/util/stream/mem.h +0 -255
- package/inc/util/stream/multi.h +0 -32
- package/inc/util/stream/null.h +0 -61
- package/inc/util/stream/output.h +0 -304
- package/inc/util/stream/pipe.h +0 -112
- package/inc/util/stream/printf.h +0 -25
- package/inc/util/stream/str.h +0 -207
- package/inc/util/stream/tee.h +0 -28
- package/inc/util/stream/tempbuf.h +0 -21
- package/inc/util/stream/tokenizer.h +0 -214
- package/inc/util/stream/trace.h +0 -60
- package/inc/util/stream/walk.h +0 -35
- package/inc/util/stream/zerocopy.h +0 -91
- package/inc/util/stream/zerocopy_output.h +0 -57
- package/inc/util/stream/zlib.h +0 -173
- package/inc/util/string/ascii.h +0 -236
- package/inc/util/string/builder.h +0 -39
- package/inc/util/string/cast.h +0 -347
- package/inc/util/string/cstriter.h +0 -14
- package/inc/util/string/escape.h +0 -70
- package/inc/util/string/hex.h +0 -59
- package/inc/util/string/join.h +0 -194
- package/inc/util/string/printf.h +0 -13
- package/inc/util/string/reverse.h +0 -16
- package/inc/util/string/split.h +0 -1080
- package/inc/util/string/strip.h +0 -257
- package/inc/util/string/strspn.h +0 -65
- package/inc/util/string/subst.h +0 -56
- package/inc/util/string/type.h +0 -50
- package/inc/util/string/util.h +0 -195
- package/inc/util/string/vector.h +0 -132
- package/inc/util/system/align.h +0 -50
- package/inc/util/system/atexit.h +0 -22
- package/inc/util/system/atomic.h +0 -51
- package/inc/util/system/atomic_gcc.h +0 -90
- package/inc/util/system/atomic_ops.h +0 -189
- package/inc/util/system/atomic_win.h +0 -114
- package/inc/util/system/backtrace.h +0 -39
- package/inc/util/system/byteorder.h +0 -186
- package/inc/util/system/compat.h +0 -84
- package/inc/util/system/compiler.h +0 -620
- package/inc/util/system/condvar.h +0 -71
- package/inc/util/system/context.h +0 -181
- package/inc/util/system/context_aarch64.h +0 -8
- package/inc/util/system/context_i686.h +0 -9
- package/inc/util/system/context_x86.h +0 -12
- package/inc/util/system/context_x86_64.h +0 -7
- package/inc/util/system/cpu_id.h +0 -159
- package/inc/util/system/daemon.h +0 -28
- package/inc/util/system/datetime.h +0 -98
- package/inc/util/system/defaults.h +0 -149
- package/inc/util/system/demangle.h +0 -5
- package/inc/util/system/demangle_impl.h +0 -23
- package/inc/util/system/direct_io.h +0 -71
- package/inc/util/system/dynlib.h +0 -119
- package/inc/util/system/env.h +0 -32
- package/inc/util/system/error.h +0 -95
- package/inc/util/system/event.h +0 -122
- package/inc/util/system/execpath.h +0 -17
- package/inc/util/system/fasttime.h +0 -6
- package/inc/util/system/fhandle.h +0 -27
- package/inc/util/system/file.h +0 -210
- package/inc/util/system/file_lock.h +0 -34
- package/inc/util/system/filemap.h +0 -383
- package/inc/util/system/flock.h +0 -35
- package/inc/util/system/fs.h +0 -156
- package/inc/util/system/fs_win.h +0 -29
- package/inc/util/system/fstat.h +0 -46
- package/inc/util/system/getpid.h +0 -12
- package/inc/util/system/guard.h +0 -179
- package/inc/util/system/hi_lo.h +0 -139
- package/inc/util/system/hostname.h +0 -10
- package/inc/util/system/hp_timer.h +0 -36
- package/inc/util/system/info.h +0 -12
- package/inc/util/system/interrupt_signals.h +0 -22
- package/inc/util/system/madvise.h +0 -30
- package/inc/util/system/maxlen.h +0 -32
- package/inc/util/system/mem_info.h +0 -18
- package/inc/util/system/mincore.h +0 -38
- package/inc/util/system/mktemp.h +0 -11
- package/inc/util/system/mlock.h +0 -43
- package/inc/util/system/mutex.h +0 -67
- package/inc/util/system/nice.h +0 -3
- package/inc/util/system/pipe.h +0 -90
- package/inc/util/system/platform.h +0 -246
- package/inc/util/system/progname.h +0 -13
- package/inc/util/system/protect.h +0 -25
- package/inc/util/system/rusage.h +0 -26
- package/inc/util/system/rwlock.h +0 -78
- package/inc/util/system/sanitizers.h +0 -122
- package/inc/util/system/sem.h +0 -41
- package/inc/util/system/shellcommand.h +0 -472
- package/inc/util/system/shmat.h +0 -32
- package/inc/util/system/sigset.h +0 -78
- package/inc/util/system/spin_wait.h +0 -10
- package/inc/util/system/spinlock.h +0 -121
- package/inc/util/system/src_location.h +0 -25
- package/inc/util/system/src_root.h +0 -68
- package/inc/util/system/sys_alloc.h +0 -43
- package/inc/util/system/sysstat.h +0 -52
- package/inc/util/system/tempfile.h +0 -34
- package/inc/util/system/thread.h +0 -167
- package/inc/util/system/tls.h +0 -307
- package/inc/util/system/types.h +0 -119
- package/inc/util/system/unaligned_mem.h +0 -67
- package/inc/util/system/user.h +0 -5
- package/inc/util/system/utime.h +0 -6
- package/inc/util/system/valgrind.h +0 -48
- package/inc/util/system/winint.h +0 -43
- package/inc/util/system/yassert.h +0 -121
- package/inc/util/system/yield.h +0 -4
- package/inc/util/thread/factory.h +0 -65
- package/inc/util/thread/fwd.h +0 -30
- package/inc/util/thread/lfqueue.h +0 -406
- package/inc/util/thread/lfstack.h +0 -188
- package/inc/util/thread/pool.h +0 -388
- package/inc/util/thread/singleton.h +0 -42
- package/inc/util/ysafeptr.h +0 -427
- package/inc/util/ysaveload.h +0 -700
package/inc/util/string/strip.h
DELETED
|
@@ -1,257 +0,0 @@
|
|
|
1
|
-
#pragma once
|
|
2
|
-
|
|
3
|
-
#include "ascii.h"
|
|
4
|
-
|
|
5
|
-
#include <util/generic/string.h>
|
|
6
|
-
#include <util/generic/strbuf.h>
|
|
7
|
-
#include <utility>
|
|
8
|
-
|
|
9
|
-
template <class It>
|
|
10
|
-
struct TIsAsciiSpaceAdapter {
|
|
11
|
-
bool operator()(const It& it) const noexcept {
|
|
12
|
-
return IsAsciiSpace(*it);
|
|
13
|
-
}
|
|
14
|
-
};
|
|
15
|
-
|
|
16
|
-
template <class It>
|
|
17
|
-
TIsAsciiSpaceAdapter<It> IsAsciiSpaceAdapter(It) {
|
|
18
|
-
return {};
|
|
19
|
-
}
|
|
20
|
-
|
|
21
|
-
template <class TChar>
|
|
22
|
-
struct TEqualsStripAdapter {
|
|
23
|
-
TEqualsStripAdapter(TChar ch)
|
|
24
|
-
: Ch(ch)
|
|
25
|
-
{
|
|
26
|
-
}
|
|
27
|
-
|
|
28
|
-
template <class It>
|
|
29
|
-
bool operator()(const It& it) const noexcept {
|
|
30
|
-
return *it == Ch;
|
|
31
|
-
}
|
|
32
|
-
|
|
33
|
-
const TChar Ch;
|
|
34
|
-
};
|
|
35
|
-
|
|
36
|
-
template <class TChar>
|
|
37
|
-
TEqualsStripAdapter<TChar> EqualsStripAdapter(TChar ch) {
|
|
38
|
-
return {ch};
|
|
39
|
-
}
|
|
40
|
-
|
|
41
|
-
template <class It, class TStripCriterion>
|
|
42
|
-
inline void StripRangeBegin(It& b, const It& e, TStripCriterion&& criterion) noexcept {
|
|
43
|
-
while (b < e && criterion(b)) {
|
|
44
|
-
++b;
|
|
45
|
-
}
|
|
46
|
-
}
|
|
47
|
-
|
|
48
|
-
template <class It>
|
|
49
|
-
inline void StripRangeBegin(It& b, const It& e) noexcept {
|
|
50
|
-
StripRangeBegin(b, e, IsAsciiSpaceAdapter(b));
|
|
51
|
-
}
|
|
52
|
-
|
|
53
|
-
template <class It, class TStripCriterion>
|
|
54
|
-
inline void StripRangeEnd(const It& b, It& e, TStripCriterion&& criterion) noexcept {
|
|
55
|
-
while (b < e && criterion(e - 1)) {
|
|
56
|
-
--e;
|
|
57
|
-
}
|
|
58
|
-
}
|
|
59
|
-
|
|
60
|
-
template <class It>
|
|
61
|
-
inline void StripRangeEnd(const It& b, It& e) noexcept {
|
|
62
|
-
StripRangeEnd(b, e, IsAsciiSpaceAdapter(b));
|
|
63
|
-
}
|
|
64
|
-
|
|
65
|
-
template <bool stripBeg, bool stripEnd>
|
|
66
|
-
struct TStripImpl {
|
|
67
|
-
template <class It, class TStripCriterion>
|
|
68
|
-
static inline bool StripRange(It& b, It& e, TStripCriterion&& criterion) noexcept {
|
|
69
|
-
const size_t oldLen = e - b;
|
|
70
|
-
|
|
71
|
-
if (stripBeg) {
|
|
72
|
-
StripRangeBegin(b, e, std::forward<TStripCriterion>(criterion));
|
|
73
|
-
}
|
|
74
|
-
|
|
75
|
-
if (stripEnd) {
|
|
76
|
-
StripRangeEnd(b, e, std::forward<TStripCriterion>(criterion));
|
|
77
|
-
}
|
|
78
|
-
|
|
79
|
-
const size_t newLen = e - b;
|
|
80
|
-
return newLen != oldLen;
|
|
81
|
-
}
|
|
82
|
-
|
|
83
|
-
template <class T, class TStripCriterion>
|
|
84
|
-
static inline bool StripString(const T& from, T& to, TStripCriterion&& criterion) {
|
|
85
|
-
auto b = from.begin();
|
|
86
|
-
auto e = from.end();
|
|
87
|
-
|
|
88
|
-
if (StripRange(b, e, std::forward<TStripCriterion>(criterion))) {
|
|
89
|
-
to = T(b, e - b);
|
|
90
|
-
|
|
91
|
-
return true;
|
|
92
|
-
}
|
|
93
|
-
|
|
94
|
-
to = from;
|
|
95
|
-
|
|
96
|
-
return false;
|
|
97
|
-
}
|
|
98
|
-
|
|
99
|
-
template <class T, class TStripCriterion>
|
|
100
|
-
static inline T StripString(const T& from, TStripCriterion&& criterion) {
|
|
101
|
-
T ret;
|
|
102
|
-
StripString(from, ret, std::forward<TStripCriterion>(criterion));
|
|
103
|
-
return ret;
|
|
104
|
-
}
|
|
105
|
-
|
|
106
|
-
template <class T>
|
|
107
|
-
static inline T StripString(const T& from) {
|
|
108
|
-
return StripString(from, IsAsciiSpaceAdapter(from.begin()));
|
|
109
|
-
}
|
|
110
|
-
};
|
|
111
|
-
|
|
112
|
-
template <class It, class TStripCriterion>
|
|
113
|
-
inline bool StripRange(It& b, It& e, TStripCriterion&& criterion) noexcept {
|
|
114
|
-
return TStripImpl<true, true>::StripRange(b, e, std::forward<TStripCriterion>(criterion));
|
|
115
|
-
}
|
|
116
|
-
|
|
117
|
-
template <class It>
|
|
118
|
-
inline bool StripRange(It& b, It& e) noexcept {
|
|
119
|
-
return StripRange(b, e, IsAsciiSpaceAdapter(b));
|
|
120
|
-
}
|
|
121
|
-
|
|
122
|
-
template <class It, class TStripCriterion>
|
|
123
|
-
inline bool Strip(It& b, size_t& len, TStripCriterion&& criterion) noexcept {
|
|
124
|
-
It e = b + len;
|
|
125
|
-
|
|
126
|
-
if (StripRange(b, e, std::forward<TStripCriterion>(criterion))) {
|
|
127
|
-
len = e - b;
|
|
128
|
-
|
|
129
|
-
return true;
|
|
130
|
-
}
|
|
131
|
-
|
|
132
|
-
return false;
|
|
133
|
-
}
|
|
134
|
-
|
|
135
|
-
template <class It>
|
|
136
|
-
inline bool Strip(It& b, size_t& len) noexcept {
|
|
137
|
-
return Strip(b, len, IsAsciiSpaceAdapter(b));
|
|
138
|
-
}
|
|
139
|
-
|
|
140
|
-
template <class T, class TStripCriterion>
|
|
141
|
-
static inline bool StripString(const T& from, T& to, TStripCriterion&& criterion) {
|
|
142
|
-
return TStripImpl<true, true>::StripString(from, to, std::forward<TStripCriterion>(criterion));
|
|
143
|
-
}
|
|
144
|
-
|
|
145
|
-
template <class T>
|
|
146
|
-
static inline bool StripString(const T& from, T& to) {
|
|
147
|
-
return StripString(from, to, IsAsciiSpaceAdapter(from.begin()));
|
|
148
|
-
}
|
|
149
|
-
|
|
150
|
-
template <class T, class TStripCriterion>
|
|
151
|
-
static inline T StripString(const T& from, TStripCriterion&& criterion) {
|
|
152
|
-
return TStripImpl<true, true>::StripString(from, std::forward<TStripCriterion>(criterion));
|
|
153
|
-
}
|
|
154
|
-
|
|
155
|
-
template <class T>
|
|
156
|
-
static inline T StripString(const T& from) {
|
|
157
|
-
return TStripImpl<true, true>::StripString(from);
|
|
158
|
-
}
|
|
159
|
-
|
|
160
|
-
template <class T>
|
|
161
|
-
static inline T StripStringLeft(const T& from) {
|
|
162
|
-
return TStripImpl<true, false>::StripString(from);
|
|
163
|
-
}
|
|
164
|
-
|
|
165
|
-
template <class T>
|
|
166
|
-
static inline T StripStringRight(const T& from) {
|
|
167
|
-
return TStripImpl<false, true>::StripString(from);
|
|
168
|
-
}
|
|
169
|
-
|
|
170
|
-
template <class T, class TStripCriterion>
|
|
171
|
-
static inline T StripStringLeft(const T& from, TStripCriterion&& criterion) {
|
|
172
|
-
return TStripImpl<true, false>::StripString(from, std::forward<TStripCriterion>(criterion));
|
|
173
|
-
}
|
|
174
|
-
|
|
175
|
-
template <class T, class TStripCriterion>
|
|
176
|
-
static inline T StripStringRight(const T& from, TStripCriterion&& criterion) {
|
|
177
|
-
return TStripImpl<false, true>::StripString(from, std::forward<TStripCriterion>(criterion));
|
|
178
|
-
}
|
|
179
|
-
|
|
180
|
-
/// Copies the given string removing leading and trailing spaces.
|
|
181
|
-
static inline bool Strip(const TString& from, TString& to) {
|
|
182
|
-
return StripString(from, to);
|
|
183
|
-
}
|
|
184
|
-
|
|
185
|
-
/// Removes leading and trailing spaces from the string.
|
|
186
|
-
inline TString& StripInPlace(TString& s) {
|
|
187
|
-
Strip(s, s);
|
|
188
|
-
return s;
|
|
189
|
-
}
|
|
190
|
-
|
|
191
|
-
/// Returns a copy of the given string with removed leading and trailing spaces.
|
|
192
|
-
inline TString Strip(const TString& s) Y_WARN_UNUSED_RESULT;
|
|
193
|
-
inline TString Strip(const TString& s) {
|
|
194
|
-
TString ret = s;
|
|
195
|
-
Strip(ret, ret);
|
|
196
|
-
return ret;
|
|
197
|
-
}
|
|
198
|
-
|
|
199
|
-
template <class TChar, class TWhitespaceFunc>
|
|
200
|
-
size_t CollapseImpl(TChar* s, size_t n, const TWhitespaceFunc& isWhitespace) {
|
|
201
|
-
size_t newLen = 0;
|
|
202
|
-
for (size_t i = 0; i < n; ++i, ++newLen) {
|
|
203
|
-
size_t nextNonSpace = i;
|
|
204
|
-
while (nextNonSpace < n && isWhitespace(s[nextNonSpace])) {
|
|
205
|
-
++nextNonSpace;
|
|
206
|
-
}
|
|
207
|
-
size_t numSpaces = nextNonSpace - i;
|
|
208
|
-
if (numSpaces > 1 || (numSpaces == 1 && s[i] != ' ')) {
|
|
209
|
-
s[newLen] = ' ';
|
|
210
|
-
i = nextNonSpace - 1;
|
|
211
|
-
} else {
|
|
212
|
-
s[newLen] = s[i];
|
|
213
|
-
}
|
|
214
|
-
}
|
|
215
|
-
return newLen;
|
|
216
|
-
}
|
|
217
|
-
|
|
218
|
-
template <class TStringType, class TWhitespaceFunc>
|
|
219
|
-
bool CollapseImpl(const TStringType& from, TStringType& to, size_t maxLen, const TWhitespaceFunc& isWhitespace) {
|
|
220
|
-
to = from;
|
|
221
|
-
maxLen = maxLen ? Min(maxLen, to.size()) : to.size();
|
|
222
|
-
for (size_t i = 0; i < maxLen; ++i) {
|
|
223
|
-
if (isWhitespace(to[i]) && (to[i] != ' ' || isWhitespace(to[i + 1]))) {
|
|
224
|
-
size_t tailSize = maxLen - i;
|
|
225
|
-
size_t newTailSize = CollapseImpl(to.begin() + i, tailSize, isWhitespace);
|
|
226
|
-
to.remove(i + newTailSize, tailSize - newTailSize);
|
|
227
|
-
return true;
|
|
228
|
-
}
|
|
229
|
-
}
|
|
230
|
-
return false;
|
|
231
|
-
}
|
|
232
|
-
|
|
233
|
-
bool Collapse(const TString& from, TString& to, size_t maxLen = 0);
|
|
234
|
-
|
|
235
|
-
/// Replaces several consequtive space symbols with one (processing is limited to maxLen bytes)
|
|
236
|
-
inline TString& CollapseInPlace(TString& s, size_t maxLen = 0) {
|
|
237
|
-
Collapse(s, s, maxLen);
|
|
238
|
-
return s;
|
|
239
|
-
}
|
|
240
|
-
|
|
241
|
-
/// Replaces several consequtive space symbols with one (processing is limited to maxLen bytes)
|
|
242
|
-
inline TString Collapse(const TString& s, size_t maxLen = 0) Y_WARN_UNUSED_RESULT;
|
|
243
|
-
inline TString Collapse(const TString& s, size_t maxLen) {
|
|
244
|
-
TString ret;
|
|
245
|
-
Collapse(s, ret, maxLen);
|
|
246
|
-
return ret;
|
|
247
|
-
}
|
|
248
|
-
|
|
249
|
-
void CollapseText(const TString& from, TString& to, size_t maxLen);
|
|
250
|
-
|
|
251
|
-
/// The same as Collapse() + truncates the string to maxLen.
|
|
252
|
-
/// @details An ellipsis is inserted at the end of the truncated line.
|
|
253
|
-
inline void CollapseText(TString& s, size_t maxLen) {
|
|
254
|
-
TString to;
|
|
255
|
-
CollapseText(s, to, maxLen);
|
|
256
|
-
s = to;
|
|
257
|
-
}
|
package/inc/util/string/strspn.h
DELETED
|
@@ -1,65 +0,0 @@
|
|
|
1
|
-
#pragma once
|
|
2
|
-
|
|
3
|
-
#include "cstriter.h"
|
|
4
|
-
|
|
5
|
-
#include <util/generic/bitmap.h>
|
|
6
|
-
|
|
7
|
-
template <class TSetType>
|
|
8
|
-
class TStrSpnImpl {
|
|
9
|
-
public:
|
|
10
|
-
inline TStrSpnImpl(const char* b, const char* e) {
|
|
11
|
-
Init(b, e);
|
|
12
|
-
}
|
|
13
|
-
|
|
14
|
-
inline TStrSpnImpl(const char* s) {
|
|
15
|
-
Init(s, TCStringEndIterator());
|
|
16
|
-
}
|
|
17
|
-
|
|
18
|
-
//FirstOf
|
|
19
|
-
template <class It>
|
|
20
|
-
inline It FindFirstOf(It b, const char* e) const noexcept {
|
|
21
|
-
return FindFirst<false>(b, e);
|
|
22
|
-
}
|
|
23
|
-
|
|
24
|
-
template <class It>
|
|
25
|
-
inline It FindFirstOf(It s) const noexcept {
|
|
26
|
-
return FindFirst<false>(s, TCStringEndIterator());
|
|
27
|
-
}
|
|
28
|
-
|
|
29
|
-
//FirstNotOf
|
|
30
|
-
template <class It>
|
|
31
|
-
inline It FindFirstNotOf(It b, const char* e) const noexcept {
|
|
32
|
-
return FindFirst<true>(b, e);
|
|
33
|
-
}
|
|
34
|
-
|
|
35
|
-
template <class It>
|
|
36
|
-
inline It FindFirstNotOf(It s) const noexcept {
|
|
37
|
-
return FindFirst<true>(s, TCStringEndIterator());
|
|
38
|
-
}
|
|
39
|
-
|
|
40
|
-
inline void Set(ui8 b) noexcept {
|
|
41
|
-
S_.Set(b);
|
|
42
|
-
}
|
|
43
|
-
|
|
44
|
-
private:
|
|
45
|
-
template <bool Result, class It1, class It2>
|
|
46
|
-
inline It1 FindFirst(It1 b, It2 e) const noexcept {
|
|
47
|
-
while (b != e && (S_.Get((ui8)*b) == Result)) {
|
|
48
|
-
++b;
|
|
49
|
-
}
|
|
50
|
-
|
|
51
|
-
return b;
|
|
52
|
-
}
|
|
53
|
-
|
|
54
|
-
template <class It1, class It2>
|
|
55
|
-
inline void Init(It1 b, It2 e) {
|
|
56
|
-
while (b != e) {
|
|
57
|
-
this->Set((ui8)*b++);
|
|
58
|
-
}
|
|
59
|
-
}
|
|
60
|
-
|
|
61
|
-
private:
|
|
62
|
-
TSetType S_;
|
|
63
|
-
};
|
|
64
|
-
|
|
65
|
-
using TCompactStrSpn = TStrSpnImpl<TBitMap<256>>;
|
package/inc/util/string/subst.h
DELETED
|
@@ -1,56 +0,0 @@
|
|
|
1
|
-
#pragma once
|
|
2
|
-
|
|
3
|
-
#include <util/generic/fwd.h>
|
|
4
|
-
|
|
5
|
-
#include <stlfwd>
|
|
6
|
-
|
|
7
|
-
/* Replace all occurences of substring `what` with string `with` starting from position `from`.
|
|
8
|
-
*
|
|
9
|
-
* @param text String to modify.
|
|
10
|
-
* @param what Substring to replace.
|
|
11
|
-
* @param with Substring to use as replacement.
|
|
12
|
-
* @param from Position at with to start replacement.
|
|
13
|
-
*
|
|
14
|
-
* @return Number of replacements occured.
|
|
15
|
-
*/
|
|
16
|
-
size_t SubstGlobal(TString& text, TStringBuf what, TStringBuf with, size_t from = 0);
|
|
17
|
-
size_t SubstGlobal(std::string& text, TStringBuf what, TStringBuf with, size_t from = 0);
|
|
18
|
-
size_t SubstGlobal(TUtf16String& text, TWtringBuf what, TWtringBuf with, size_t from = 0);
|
|
19
|
-
size_t SubstGlobal(std::u16string& text, TWtringBuf what, TWtringBuf with, size_t from = 0);
|
|
20
|
-
size_t SubstGlobal(TUtf32String& text, TUtf32StringBuf what, TUtf32StringBuf with, size_t from = 0);
|
|
21
|
-
|
|
22
|
-
/* Replace all occurences of character `what` with character `with` starting from position `from`.
|
|
23
|
-
*
|
|
24
|
-
* @param text String to modify.
|
|
25
|
-
* @param what Character to replace.
|
|
26
|
-
* @param with Character to use as replacement.
|
|
27
|
-
* @param from Position at with to start replacement.
|
|
28
|
-
*
|
|
29
|
-
* @return Number of replacements occured.
|
|
30
|
-
*/
|
|
31
|
-
size_t SubstGlobal(TString& text, char what, char with, size_t from = 0);
|
|
32
|
-
size_t SubstGlobal(std::string& text, char what, char with, size_t from = 0);
|
|
33
|
-
size_t SubstGlobal(TUtf16String& text, wchar16 what, wchar16 with, size_t from = 0);
|
|
34
|
-
size_t SubstGlobal(std::u16string& text, wchar16 what, wchar16 with, size_t from = 0);
|
|
35
|
-
size_t SubstGlobal(TUtf32String& text, wchar32 what, wchar32 with, size_t from = 0);
|
|
36
|
-
|
|
37
|
-
// TODO(yazevnul):
|
|
38
|
-
// - rename `SubstGlobal` to `ReplaceAll` for convenience
|
|
39
|
-
// - add `SubstGlobalCopy(TStringBuf)` for convenience
|
|
40
|
-
// - add `RemoveAll(text, what, from)` as a shortcut for `SubstGlobal(text, what, "", from)`
|
|
41
|
-
// - rename file to `replace.h`
|
|
42
|
-
|
|
43
|
-
/* Replace all occurences of substring or character `what` with string or character `with` starting from position `from`, and return result string.
|
|
44
|
-
*
|
|
45
|
-
* @param text String to modify.
|
|
46
|
-
* @param what Substring/character to replace.
|
|
47
|
-
* @param with Substring/character to use as replacement.
|
|
48
|
-
* @param from Position at with to start replacement.
|
|
49
|
-
*
|
|
50
|
-
* @return Result string
|
|
51
|
-
*/
|
|
52
|
-
template <class TStringType, class TPatternType>
|
|
53
|
-
Y_WARN_UNUSED_RESULT TStringType SubstGlobalCopy(TStringType result, TPatternType what, TPatternType with, size_t from = 0) {
|
|
54
|
-
SubstGlobal(result, what, with, from);
|
|
55
|
-
return result;
|
|
56
|
-
}
|
package/inc/util/string/type.h
DELETED
|
@@ -1,50 +0,0 @@
|
|
|
1
|
-
#pragma once
|
|
2
|
-
|
|
3
|
-
#include <util/generic/strbuf.h>
|
|
4
|
-
|
|
5
|
-
Y_PURE_FUNCTION
|
|
6
|
-
bool IsSpace(const char* s, size_t len) noexcept;
|
|
7
|
-
|
|
8
|
-
/// Checks if a string is a set of only space symbols.
|
|
9
|
-
Y_PURE_FUNCTION
|
|
10
|
-
static inline bool IsSpace(const TStringBuf s) noexcept {
|
|
11
|
-
return IsSpace(s.data(), s.size());
|
|
12
|
-
}
|
|
13
|
-
|
|
14
|
-
/// Returns "true" if the given string is an arabic number ([0-9]+)
|
|
15
|
-
Y_PURE_FUNCTION
|
|
16
|
-
bool IsNumber(const TStringBuf s) noexcept;
|
|
17
|
-
|
|
18
|
-
Y_PURE_FUNCTION
|
|
19
|
-
bool IsNumber(const TWtringBuf s) noexcept;
|
|
20
|
-
|
|
21
|
-
/// Returns "true" if the given string is a hex number ([0-9a-fA-F]+)
|
|
22
|
-
Y_PURE_FUNCTION
|
|
23
|
-
bool IsHexNumber(const TStringBuf s) noexcept;
|
|
24
|
-
|
|
25
|
-
Y_PURE_FUNCTION
|
|
26
|
-
bool IsHexNumber(const TWtringBuf s) noexcept;
|
|
27
|
-
|
|
28
|
-
/* Tests if the given string is case insensitive equal to one of:
|
|
29
|
-
* - "true",
|
|
30
|
-
* - "t",
|
|
31
|
-
* - "yes",
|
|
32
|
-
* - "y",
|
|
33
|
-
* - "on",
|
|
34
|
-
* - "1",
|
|
35
|
-
* - "da".
|
|
36
|
-
*/
|
|
37
|
-
Y_PURE_FUNCTION
|
|
38
|
-
bool IsTrue(const TStringBuf value) noexcept;
|
|
39
|
-
|
|
40
|
-
/* Tests if the given string is case insensitive equal to one of:
|
|
41
|
-
* - "false",
|
|
42
|
-
* - "f",
|
|
43
|
-
* - "no",
|
|
44
|
-
* - "n",
|
|
45
|
-
* - "off",
|
|
46
|
-
* - "0",
|
|
47
|
-
* - "net".
|
|
48
|
-
*/
|
|
49
|
-
Y_PURE_FUNCTION
|
|
50
|
-
bool IsFalse(const TStringBuf value) noexcept;
|
package/inc/util/string/util.h
DELETED
|
@@ -1,195 +0,0 @@
|
|
|
1
|
-
#pragma once
|
|
2
|
-
|
|
3
|
-
//THIS FILE A COMPAT STUB HEADER
|
|
4
|
-
|
|
5
|
-
#include <cstring>
|
|
6
|
-
#include <cstdarg>
|
|
7
|
-
#include <algorithm>
|
|
8
|
-
|
|
9
|
-
#include <util/system/defaults.h>
|
|
10
|
-
#include <util/generic/string.h>
|
|
11
|
-
#include <util/generic/strbuf.h>
|
|
12
|
-
|
|
13
|
-
/// @addtogroup Strings_Miscellaneous
|
|
14
|
-
/// @{
|
|
15
|
-
int a2i(const TString& s);
|
|
16
|
-
|
|
17
|
-
/// Removes the last character if it is equal to c.
|
|
18
|
-
template <class T>
|
|
19
|
-
inline void RemoveIfLast(T& s, int c) {
|
|
20
|
-
const size_t length = s.length();
|
|
21
|
-
if (length && s[length - 1] == c)
|
|
22
|
-
s.remove(length - 1);
|
|
23
|
-
}
|
|
24
|
-
|
|
25
|
-
/// Adds lastCh symbol to the the of the string if it is not already there.
|
|
26
|
-
inline void addIfNotLast(TString& s, int lastCh) {
|
|
27
|
-
size_t len = s.length();
|
|
28
|
-
if (!len || s[len - 1] != lastCh) {
|
|
29
|
-
s.append(char(lastCh));
|
|
30
|
-
}
|
|
31
|
-
}
|
|
32
|
-
|
|
33
|
-
/// @details Finishes the string with lastCh1 if lastCh2 is not present in the string and lastCh1 is not already at the end of the string.
|
|
34
|
-
/// Else, if lastCh2 is not equal to the symbol before the last, it finishes the string with lastCh2.
|
|
35
|
-
/// @todo ?? Define, when to apply the function. Is in use several times for URLs parsing.
|
|
36
|
-
inline void addIfAbsent(TString& s, char lastCh1, char lastCh2) {
|
|
37
|
-
size_t pos = s.find(lastCh2);
|
|
38
|
-
if (pos == TString::npos) {
|
|
39
|
-
//s.append((char)lastCh1);
|
|
40
|
-
addIfNotLast(s, lastCh1);
|
|
41
|
-
} else if (pos < s.length() - 1) {
|
|
42
|
-
addIfNotLast(s, lastCh2);
|
|
43
|
-
}
|
|
44
|
-
}
|
|
45
|
-
|
|
46
|
-
/// @}
|
|
47
|
-
|
|
48
|
-
/*
|
|
49
|
-
* ------------------------------------------------------------------
|
|
50
|
-
*
|
|
51
|
-
* A fast implementation of glibc's functions;
|
|
52
|
-
* strspn, strcspn and strpbrk.
|
|
53
|
-
*
|
|
54
|
-
* ------------------------------------------------------------------
|
|
55
|
-
*/
|
|
56
|
-
struct ui8_256 {
|
|
57
|
-
// forward chars table
|
|
58
|
-
ui8 chars_table[256];
|
|
59
|
-
// reverse (for c* functions) chars table
|
|
60
|
-
ui8 c_chars_table[256];
|
|
61
|
-
};
|
|
62
|
-
|
|
63
|
-
class str_spn: public ui8_256 {
|
|
64
|
-
public:
|
|
65
|
-
explicit str_spn(const char* charset, bool extended = false) {
|
|
66
|
-
// exteneded: if true, treat charset string more like
|
|
67
|
-
// interior of brackets [ ], e.g. "a-z0-9"
|
|
68
|
-
init(charset, extended);
|
|
69
|
-
}
|
|
70
|
-
|
|
71
|
-
/// Return first character in table, like strpbrk()
|
|
72
|
-
/// That is, skip all characters not in table
|
|
73
|
-
/// [DIFFERENCE FOR NOT_FOUND CASE: Returns end of string, not NULL]
|
|
74
|
-
const char* brk(const char* s) const {
|
|
75
|
-
while (c_chars_table[(ui8)*s])
|
|
76
|
-
++s;
|
|
77
|
-
return s;
|
|
78
|
-
}
|
|
79
|
-
|
|
80
|
-
const char* brk(const char* s, const char* e) const {
|
|
81
|
-
while (s < e && c_chars_table[(ui8)*s])
|
|
82
|
-
++s;
|
|
83
|
-
return s;
|
|
84
|
-
}
|
|
85
|
-
|
|
86
|
-
/// Return first character not in table, like strpbrk() for inverted table.
|
|
87
|
-
/// That is, skip all characters in table
|
|
88
|
-
const char* cbrk(const char* s) const {
|
|
89
|
-
while (chars_table[(ui8)*s])
|
|
90
|
-
++s;
|
|
91
|
-
return s;
|
|
92
|
-
}
|
|
93
|
-
|
|
94
|
-
const char* cbrk(const char* s, const char* e) const {
|
|
95
|
-
while (s < e && chars_table[(ui8)*s])
|
|
96
|
-
++s;
|
|
97
|
-
return s;
|
|
98
|
-
}
|
|
99
|
-
|
|
100
|
-
/// Offset of the first character not in table, like strspn().
|
|
101
|
-
size_t spn(const char* s) const {
|
|
102
|
-
return cbrk(s) - s;
|
|
103
|
-
}
|
|
104
|
-
|
|
105
|
-
size_t spn(const char* s, const char* e) const {
|
|
106
|
-
return cbrk(s, e) - s;
|
|
107
|
-
}
|
|
108
|
-
|
|
109
|
-
/// Offset of the first character in table, like strcspn().
|
|
110
|
-
size_t cspn(const char* s) const {
|
|
111
|
-
return brk(s) - s;
|
|
112
|
-
}
|
|
113
|
-
|
|
114
|
-
size_t cspn(const char* s, const char* e) const {
|
|
115
|
-
return brk(s, e) - s;
|
|
116
|
-
}
|
|
117
|
-
|
|
118
|
-
char* brk(char* s) const {
|
|
119
|
-
return const_cast<char*>(brk((const char*)s));
|
|
120
|
-
}
|
|
121
|
-
|
|
122
|
-
char* cbrk(char* s) const {
|
|
123
|
-
return const_cast<char*>(cbrk((const char*)s));
|
|
124
|
-
}
|
|
125
|
-
|
|
126
|
-
/// See strsep [BUT argument is *&, not **]
|
|
127
|
-
char* sep(char*& s) const {
|
|
128
|
-
char sep_char; // unused;
|
|
129
|
-
return sep(s, sep_char);
|
|
130
|
-
}
|
|
131
|
-
|
|
132
|
-
/// strsep + remember character that was destroyed
|
|
133
|
-
char* sep(char*& s, char& sep_char) const {
|
|
134
|
-
if (!s)
|
|
135
|
-
return nullptr;
|
|
136
|
-
char* ret = s;
|
|
137
|
-
char* next = brk(ret);
|
|
138
|
-
if (*next) {
|
|
139
|
-
sep_char = *next;
|
|
140
|
-
*next = 0;
|
|
141
|
-
s = next + 1;
|
|
142
|
-
} else {
|
|
143
|
-
sep_char = 0;
|
|
144
|
-
s = nullptr;
|
|
145
|
-
}
|
|
146
|
-
return ret;
|
|
147
|
-
}
|
|
148
|
-
|
|
149
|
-
protected:
|
|
150
|
-
void init(const char* charset, bool extended);
|
|
151
|
-
str_spn() = default;
|
|
152
|
-
};
|
|
153
|
-
|
|
154
|
-
// an analogue of tr/$from/$to/
|
|
155
|
-
class Tr {
|
|
156
|
-
public:
|
|
157
|
-
Tr(const char* from, const char* to);
|
|
158
|
-
|
|
159
|
-
char ConvertChar(char ch) const {
|
|
160
|
-
return Map[(ui8)ch];
|
|
161
|
-
}
|
|
162
|
-
|
|
163
|
-
void Do(char* s) const {
|
|
164
|
-
for (; *s; s++)
|
|
165
|
-
*s = ConvertChar(*s);
|
|
166
|
-
}
|
|
167
|
-
void Do(const char* src, char* dst) const {
|
|
168
|
-
for (; *src; src++)
|
|
169
|
-
*dst++ = ConvertChar(*src);
|
|
170
|
-
*dst = 0;
|
|
171
|
-
}
|
|
172
|
-
void Do(char* s, size_t l) const {
|
|
173
|
-
for (size_t i = 0; i < l && s[i]; i++)
|
|
174
|
-
s[i] = ConvertChar(s[i]);
|
|
175
|
-
}
|
|
176
|
-
void Do(TString& str) const;
|
|
177
|
-
|
|
178
|
-
private:
|
|
179
|
-
char Map[256];
|
|
180
|
-
|
|
181
|
-
size_t FindFirstChangePosition(const TString& str) const;
|
|
182
|
-
};
|
|
183
|
-
|
|
184
|
-
// Removes all occurrences of given character from string
|
|
185
|
-
template <typename TStringType>
|
|
186
|
-
void RemoveAll(TStringType& str, typename TStringType::char_type ch) {
|
|
187
|
-
size_t pos = str.find(ch); // 'find' to avoid cloning of string in 'TString.begin()'
|
|
188
|
-
if (pos == TStringType::npos)
|
|
189
|
-
return;
|
|
190
|
-
|
|
191
|
-
typename TStringType::iterator begin = str.begin();
|
|
192
|
-
typename TStringType::iterator end = begin + str.length();
|
|
193
|
-
typename TStringType::iterator it = std::remove(begin + pos, end, ch);
|
|
194
|
-
str.erase(it, end);
|
|
195
|
-
}
|