From 5e529b3bfa7b3ca09cde7237134acd47e47ca48c Mon Sep 17 00:00:00 2001 From: Zoom Date: Wed, 21 Jun 2023 06:52:33 +0000 Subject: `strutils.split/rsplit` now return src on an empty sep (#22136) This is a rebase of an earlier rejected PR. Following the discussion around it, this commit provides a valid output for and edge case of an empty separator for `split` and `rsplit` routines. The empty separator is interpreted as "split by no separators" and the initial string is returned. This is consistent with the behaviour of the `set[char]` version of `split`/`rsplit` routines and unifies them all. Compared to a commit merged earlier, this one has a benefit of not using assertions that will be removed in release builds and thus still not preventing possible infinite loops (which was the earlier behaviour for this edge case for separator of type `string`). Co-authored-by: Andreas Rumpf --- tests/stdlib/tstrutils.nim | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'tests/stdlib/tstrutils.nim') diff --git a/tests/stdlib/tstrutils.nim b/tests/stdlib/tstrutils.nim index d53e9d8b4..847e22656 100644 --- a/tests/stdlib/tstrutils.nim +++ b/tests/stdlib/tstrutils.nim @@ -58,8 +58,10 @@ template main() = doAssert "".split(" ") == @[""] doAssert "".split({' '}) == @[""] # Empty separators: - doAssertRaises(AssertionDefect): discard s.split({}) - doAssertRaises(AssertionDefect): discard s.split("") + doAssert "".split({}) == @[""] + doAssert "".split("") == @[""] + doAssert s.split({}) == @[s] + doAssert s.split("") == @[s] block: # splitLines let fixture = "a\nb\rc\r\nd" @@ -70,8 +72,7 @@ template main() = block: # rsplit doAssert rsplit("foo bar", seps = Whitespace) == @["foo", "bar"] doAssert rsplit(" foo bar", seps = Whitespace, maxsplit = 1) == @[" foo", "bar"] - doAssert rsplit(" foo bar ", seps = Whitespace, maxsplit = 1) == @[ - " foo bar", ""] + doAssert rsplit(" foo bar ", seps = Whitespace, maxsplit = 1) == @[" foo bar", ""] doAssert rsplit(":foo:bar", sep = ':') == @["", "foo", "bar"] doAssert rsplit(":foo:bar", sep = ':', maxsplit = 2) == @["", "foo", "bar"] doAssert rsplit(":foo:bar", sep = ':', maxsplit = 3) == @["", "foo", "bar"] @@ -81,8 +82,11 @@ template main() = doAssert "".rsplit(" ") == @[""] doAssert "".rsplit({' '}) == @[""] # Empty separators: - doAssertRaises(AssertionDefect): discard "".rsplit({}) - doAssertRaises(AssertionDefect): discard "".rsplit("") + let s = " this is an example " + doAssert "".rsplit({}) == @[""] + doAssert "".rsplit("") == @[""] + doAssert s.rsplit({}) == @[s] + doAssert s.rsplit("") == @[s] block: # splitWhitespace let s = " this is an example " -- cgit 1.4.1-2-gfad0 u/tree/040brace.cc?h=hlt&id=1193171f64f6b65d3ec714aa2d1d22b4e1d05832'>tree) 
decaddb4 ^


9a81d746 ^

decaddb4 ^










9ea76483 ^

d3c120c1 ^


decaddb4 ^





8c9e97ae ^

88be3dbc ^

1ead3562 ^

decaddb4 ^


192d59d3 ^

decaddb4 ^


dd2e01e4 ^



decaddb4 ^

215365d4 ^

b2e4056d ^

decaddb4 ^


363be37f ^

decaddb4 ^

6f8f9fb5 ^

b24eb476 ^

795f5244 ^

6c96a437 ^

795f5244 ^

decaddb4 ^

795f5244 ^

b24eb476 ^

decaddb4 ^


dd2e01e4 ^

b24eb476 ^

decaddb4 ^


b24eb476 ^

6c96a437 ^

795f5244 ^

4c879fa1 ^



decaddb4 ^

4c879fa1 ^

356c966d ^

ba1fb981 ^

356c966d ^


4c879fa1 ^


decaddb4 ^

4c879fa1 ^

95f2fe96 ^







4c879fa1 ^

c062697c ^

e85cb85b ^

95f2fe96 ^

e85cb85b ^

e62aa7e3 ^

e85cb85b ^



4c879fa1 ^

95f2fe96 ^


e6692482 ^

436b2b2e ^


95f2fe96 ^

e6692482 ^

436b2b2e ^



e6692482 ^

436b2b2e ^


4c879fa1 ^

95f2fe96 ^

4c879fa1 ^

ab6ed192 ^

f1692871 ^

4c879fa1 ^

32f6079f ^


decaddb4 ^

4c879fa1 ^


f1692871 ^

4c879fa1 ^


decaddb4 ^

4c879fa1 ^


32597844 ^

4c879fa1 ^


e62aa7e3 ^

95f2fe96 ^

4c879fa1 ^


4ce90b39 ^

4c879fa1 ^


e6692482 ^

f1692871 ^

e6692482 ^

f1692871 ^

decaddb4 ^



6f8f9fb5 ^


b24eb476 ^

1fba5d5d ^

6c96a437 ^

7ac221e4 ^

decaddb4 ^

7ac221e4 ^

decaddb4 ^

1b76245c ^

795f5244 ^

decaddb4 ^


88be3dbc ^

1ead3562 ^

192d59d3 ^


decaddb4 ^

192d59d3 ^

decaddb4 ^



dd2e01e4 ^





3d45bf38 ^

88be3dbc ^

1ead3562 ^

192d59d3 ^

3d45bf38 ^




dd2e01e4 ^



3d45bf38 ^

88be3dbc ^

1ead3562 ^

192d59d3 ^

3d45bf38 ^







dd2e01e4 ^




3d45bf38 ^

051c4738 ^

1ead3562 ^

192d59d3 ^


3d45bf38 ^


192d59d3 ^

3d45bf38 ^





dd2e01e4 ^






c062697c ^

88be3dbc ^

1ead3562 ^

192d59d3 ^


c062697c ^

192d59d3 ^


c062697c ^





dd2e01e4 ^






c062697c ^

88be3dbc ^

1ead3562 ^

192d59d3 ^

c062697c ^

192d59d3 ^

c062697c ^


192d59d3 ^

c062697c ^

192d59d3 ^

c062697c ^


dd2e01e4 ^

c062697c ^

88be3dbc ^

1ead3562 ^

192d59d3 ^

c062697c ^

192d59d3 ^

c062697c ^



192d59d3 ^

c062697c ^


dd2e01e4 ^

c062697c ^

051c4738 ^

1ead3562 ^

192d59d3 ^

c062697c ^

192d59d3 ^

c062697c ^





dd2e01e4 ^

c062697c ^

88be3dbc ^

5f98a10c ^

1ead3562 ^

192d59d3 ^

c062697c ^

3ba63579 ^

c062697c ^


dd2e01e4 ^

32f6079f ^

88be3dbc ^

1ead3562 ^

192d59d3 ^


32f6079f ^

192d59d3 ^


32f6079f ^


dd2e01e4 ^





32f6079f ^

88be3dbc ^

1ead3562 ^

192d59d3 ^


32f6079f ^

192d59d3 ^


32f6079f ^


dd2e01e4 ^





15ab959d ^

88be3dbc ^

1ead3562 ^

192d59d3 ^

15ab959d ^

192d59d3 ^

15ab959d ^

192d59d3 ^

15ab959d ^

d52406cc ^

192d59d3 ^

15ab959d ^


dd2e01e4 ^


15ab959d ^

88be3dbc ^

1ead3562 ^

192d59d3 ^

15ab959d ^

192d59d3 ^

15ab959d ^

dd2e01e4 ^



15ab959d ^



88be3dbc ^

1ead3562 ^

192d59d3 ^


15ab959d ^

d52406cc ^


192d59d3 ^



15ab959d ^


192d59d3 ^

15ab959d ^

827898fc ^

4c879fa1 ^

5f98a10c ^


1ead3562 ^

4c879fa1 ^


e62aa7e3 ^

e85cb85b ^

5f98a10c ^


1ead3562 ^

e85cb85b ^




e62aa7e3 ^

436b2b2e ^

5109e78f ^

e765f9e7 ^

5109e78f ^

e765f9e7 ^

192d59d3 ^

e765f9e7 ^







5109e78f ^

e765f9e7 ^

192d59d3 ^

e765f9e7 ^








7d07cd1d ^

e765f9e7 ^



5109e78f ^

e765f9e7 ^


5109e78f ^

e765f9e7 ^

c8f2ff13 ^

e765f9e7 ^






7d07cd1d ^

e765f9e7 ^



5109e78f ^

e765f9e7 ^


5109e78f ^

e765f9e7 ^

c8f2ff13 ^

e765f9e7 ^








c8f2ff13 ^


3473c63a ^

5109e78f ^


e765f9e7 ^








95f2fe96 ^

e765f9e7 ^



5109e78f ^





c8f2ff13 ^

5109e78f ^

e765f9e7 ^






436b2b2e ^












795f5244 ^






436b2b2e ^







1
2

3

4
5
6
7
8
9
10
11
12
13

14

15
16

17
18
19
20
21

22

23

24

25
26

27

28
29

30
31
32

33

34

35

36
37

38

39

40

41

42

43

44

45

46

47

48
49

50

51

52
53

54

55

56

57
58
59

60

61

62

63

64
65

66
67

68

69

70
71
72
73
74
75
76

77

78

79

80

81

82

83
84
85

86

87
88

89

90
91

92

93

94
95
96

97

98
99

100

101

102

103

104

105

106
107

108

109
110

111

112
113

114

115
116

117

118
119

120

121

122
123

124

125
126

127

128

129

130

131
132
133

134
135

136

137

138

139

140

141

142

143

144

145
146

147

148

149
150

151

152

153
154
155

156
157
158
159
160

161

162

163

164

165
166
167
168

169
170
171

172

173

174

175

176
177
178
179
180
181
182

183
184
185
186

187

188

189

190
191

192
193

194

195
196
197
198
199

200
201
202
203
204
205

206

207

208

209
210

211

212
213

214
215
216
217
218

219
220
221
222
223
224

225

226

227

228

229

230

231
232

233

234

235

236
237

238

239

240

241

242

243

244

245
246
247

248

249
250

251

252

253

254

255

256

257

258
259
260
261
262

263

264

265

266

267

268

269

270

271
272

273

274

275

276

277
278

279

280
281

282
283

284
285
286
287
288

289

290

291

292
293

294

295
296

297
298

299
300
301
302
303

304

305

306

307

308

309

310

311

312

313

314

315
316

317
318

319

320

321

322

323

324

325

326
327
328

329
330
331

332

333

334
335

336

337
338

339
340
341

342
343

344

345

346

347

348
349

350

351
352

353

354

355
356

357

358
359
360
361

362

363

364

365

366

367

368

369
370
371
372
373
374
375

376

377

378

379
380
381
382
383
384
385
386

387

388
389
390

391

392
393

394

395

396

397
398
399
400
401
402

403

404
405
406

407

408
409

410

411

412

413
414
415
416
417
418
419
420

421
422

423

424
425

426
427
428
429
430
431
432
433

434

435
436
437

438
439
440
441
442

443

444

445
446
447
448
449
450

451
452
453
454
455
456
457
458
459
460
461
462

463
464
465
466
467
468

469
470
471
472
473
474
475