Skip to content

Commit 9d205c6

Browse files
burblebeetkoeppe
burblebee
authored and
tkoeppe
committed
[ranges.syn] Colapse freestanding entities to fit on a single line
1 parent 3c1527f commit 9d205c6

File tree

1 file changed

+26
-64
lines changed

1 file changed

+26
-64
lines changed

‎source/ranges.tex

Lines changed: 26 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -167,9 +167,7 @@
167167
requires is_object_v<T>
168168
class single_view; // freestanding
169169

170-
namespace views {
171-
inline constexpr @\unspec@ single = @\unspec@; // freestanding
172-
}
170+
namespace views { inline constexpr @\unspecnc@ single = @\unspecnc@; } // freestanding
173171

174172
template<bool Const, class T>
175173
using @\exposidnc{maybe-const}@ = conditional_t<Const, const T, T>; // \expos
@@ -182,9 +180,7 @@
182180
template<class W, class Bound>
183181
inline constexpr bool enable_borrowed_range<iota_view<W, Bound>> = true; // freestanding
184182

185-
namespace views {
186-
inline constexpr @\unspec@ iota = @\unspec@; // freestanding
187-
}
183+
namespace views { inline constexpr @\unspecnc@ iota = @\unspecnc@; } // freestanding
188184

189185
// \ref{range.istream}, istream view
190186
template<@\libconcept{movable}@ Val, class CharT, class Traits = char_traits<CharT>>
@@ -195,7 +191,7 @@
195191
template<class Val>
196192
using wistream_view = basic_istream_view<Val, wchar_t>;
197193

198-
namespace views { template<class T> inline constexpr @\unspec@ istream = @\unspec@; }
194+
namespace views { template<class T> inline constexpr @\unspecnc@ istream = @\unspecnc@; }
199195

200196
// \ref{range.adaptor.object}, range adaptor objects
201197
template<class D>
@@ -204,7 +200,7 @@
204200

205201
// \ref{range.all}, all view
206202
namespace views {
207-
inline constexpr @\unspec@ all = @\unspec@; // freestanding
203+
inline constexpr @\unspecnc@ all = @\unspecnc@; // freestanding
208204

209205
template<@\libconcept{viewable_range}@ R>
210206
using all_t = decltype(all(declval<R>())); // freestanding
@@ -232,9 +228,7 @@
232228
requires @\libconcept{view}@<V> && is_object_v<Pred>
233229
class filter_view; // freestanding
234230

235-
namespace views {
236-
inline constexpr @\unspec@ filter = @\unspec@; // freestanding
237-
}
231+
namespace views { inline constexpr @\unspecnc@ filter = @\unspecnc@; } // freestanding
238232

239233
// \ref{range.transform}, transform view
240234
template<@\libconcept{input_range}@ V, @\libconcept{copy_constructible}@ F>
@@ -243,9 +237,7 @@
243237
@\exposconcept{can-reference}@<invoke_result_t<F&, range_reference_t<V>>>
244238
class transform_view; // freestanding
245239

246-
namespace views {
247-
inline constexpr @\unspec@ transform = @\unspec@; // freestanding
248-
}
240+
namespace views { inline constexpr @\unspecnc@ transform = @\unspecnc@; } // freestanding
249241

250242
// \ref{range.take}, take view
251243
template<@\libconcept{view}@> class take_view; // freestanding
@@ -254,19 +246,15 @@
254246
inline constexpr bool enable_borrowed_range<take_view<T>> = // freestanding
255247
enable_borrowed_range<T>;
256248

257-
namespace views {
258-
inline constexpr @\unspec@ take = @\unspec@; // freestanding
259-
}
249+
namespace views { inline constexpr @\unspecnc@ take = @\unspecnc@; } // freestanding
260250

261251
// \ref{range.take.while}, take while view
262252
template<@\libconcept{view}@ V, class Pred>
263253
requires @\libconcept{input_range}@<V> && is_object_v<Pred> &&
264254
@\libconcept{indirect_unary_predicate}@<const Pred, iterator_t<V>>
265255
class take_while_view; // freestanding
266256

267-
namespace views {
268-
inline constexpr @\unspec@ take_while = @\unspec@; // freestanding
269-
}
257+
namespace views { inline constexpr @\unspecnc@ take_while = @\unspecnc@; } // freestanding
270258

271259
// \ref{range.drop}, drop view
272260
template<@\libconcept{view}@ V>
@@ -276,9 +264,7 @@
276264
inline constexpr bool enable_borrowed_range<drop_view<T>> = // freestanding
277265
enable_borrowed_range<T>;
278266

279-
namespace views {
280-
inline constexpr @\unspec@ drop = @\unspec@; // freestanding
281-
}
267+
namespace views { inline constexpr @\unspecnc@ drop = @\unspecnc@; } // freestanding
282268

283269
// \ref{range.drop.while}, drop while view
284270
template<@\libconcept{view}@ V, class Pred>
@@ -290,18 +276,14 @@
290276
inline constexpr bool enable_borrowed_range<drop_while_view<T, Pred>> = // freestanding
291277
enable_borrowed_range<T>;
292278

293-
namespace views {
294-
inline constexpr @\unspec@ drop_while = @\unspec@; // freestanding
295-
}
279+
namespace views { inline constexpr @\unspecnc@ drop_while = @\unspecnc@; } // freestanding
296280

297281
// \ref{range.join}, join view
298282
template<@\libconcept{input_range}@ V>
299283
requires @\libconcept{view}@<V> && @\libconcept{input_range}@<range_reference_t<V>>
300284
class join_view; // freestanding
301285

302-
namespace views {
303-
inline constexpr @\unspec@ join = @\unspec@; // freestanding
304-
}
286+
namespace views { inline constexpr @\unspecnc@ join = @\unspecnc@; } // freestanding
305287

306288
// \ref{range.join.with}, join with view
307289
template<class R, class P>
@@ -313,9 +295,7 @@
313295
&& @\exposconcept{compatible-joinable-ranges}@<range_reference_t<V>, Pattern>
314296
class join_with_view; // freestanding
315297

316-
namespace views {
317-
inline constexpr @\unspec@ join_with = @\unspec@; // freestanding
318-
}
298+
namespace views { inline constexpr @\unspecnc@ join_with = @\unspecnc@; } // freestanding
319299

320300
// \ref{range.lazy.split}, lazy split view
321301
template<class R>
@@ -334,14 +314,12 @@
334314
class split_view; // freestanding
335315

336316
namespace views {
337-
inline constexpr @\unspec@ lazy_split = @\unspec@; // freestanding
338-
inline constexpr @\unspec@ split = @\unspec@; // freestanding
317+
inline constexpr @\unspecnc@ lazy_split = @\unspecnc@; // freestanding
318+
inline constexpr @\unspecnc@ split = @\unspecnc@; // freestanding
339319
}
340320

341321
// \ref{range.counted}, counted view
342-
namespace views {
343-
inline constexpr @\unspec@ counted = @\unspec@; // freestanding
344-
}
322+
namespace views { inline constexpr @\unspecnc@ counted = @\unspecnc@; } // freestanding
345323

346324
// \ref{range.common}, common view
347325
template<@\libconcept{view}@ V>
@@ -352,9 +330,7 @@
352330
inline constexpr bool enable_borrowed_range<common_view<T>> = // freestanding
353331
enable_borrowed_range<T>;
354332

355-
namespace views {
356-
inline constexpr @\unspec@ common = @\unspec@; // freestanding
357-
}
333+
namespace views { inline constexpr @\unspecnc@ common = @\unspecnc@; } // freestanding
358334

359335
// \ref{range.reverse}, reverse view
360336
template<@\libconcept{view}@ V>
@@ -365,9 +341,7 @@
365341
inline constexpr bool enable_borrowed_range<reverse_view<T>> = // freestanding
366342
enable_borrowed_range<T>;
367343

368-
namespace views {
369-
inline constexpr @\unspec@ reverse = @\unspec@; // freestanding
370-
}
344+
namespace views { inline constexpr @\unspecnc@ reverse = @\unspecnc@; } // freestanding
371345

372346
// \ref{range.elements}, elements view
373347
template<@\libconcept{input_range}@ V, size_t N>
@@ -385,7 +359,7 @@
385359

386360
namespace views {
387361
template<size_t N>
388-
inline constexpr @\unspec@ elements = @\unspec@; // freestanding
362+
inline constexpr @\unspecnc@ elements = @\unspecnc@; // freestanding
389363
inline constexpr auto @\libmember{keys}{views}@ = elements<0>; // freestanding
390364
inline constexpr auto @\libmember{values}{views}@ = elements<1>; // freestanding
391365
}
@@ -399,9 +373,7 @@
399373
inline constexpr bool enable_borrowed_range<zip_view<Views...>> = // freestanding
400374
(enable_borrowed_range<Views> && ...);
401375

402-
namespace views {
403-
inline constexpr @\unspec@ zip = @\unspec@; // freestanding
404-
}
376+
namespace views { inline constexpr @\unspecnc@ zip = @\unspecnc@; } // freestanding
405377

406378
// \ref{range.zip.transform}, zip transform view
407379
template<@\libconcept{copy_constructible}@ F, @\libconcept{input_range}@... Views>
@@ -410,9 +382,7 @@
410382
@\exposconcept{can-reference}@<invoke_result_t<F&, range_reference_t<Views>...>>
411383
class zip_transform_view; // freestanding
412384

413-
namespace views {
414-
inline constexpr @\unspec@ zip_transform = @\unspec@; // freestanding
415-
}
385+
namespace views { inline constexpr @\unspecnc@ zip_transform = @\unspecnc@; } // freestanding
416386

417387
// \ref{range.adjacent}, adjacent view
418388
template<@\libconcept{forward_range}@ V, size_t N>
@@ -425,7 +395,7 @@
425395

426396
namespace views {
427397
template<size_t N>
428-
inline constexpr @\unspec@ adjacent = @\unspec@ ; // freestanding
398+
inline constexpr @\unspecnc@ adjacent = @\unspecnc@; // freestanding
429399
inline constexpr auto @\libmember{pairwise}{views}@ = adjacent<2>; // freestanding
430400
}
431401

@@ -436,7 +406,7 @@
436406

437407
namespace views {
438408
template<size_t N>
439-
inline constexpr @\unspec@ adjacent_transform = @\unspec@; // freestanding
409+
inline constexpr @\unspecnc@ adjacent_transform = @\unspecnc@; // freestanding
440410
inline constexpr auto @\libmember{pairwise_transform}{views}@ = adjacent_transform<2>; // freestanding
441411
}
442412

@@ -453,9 +423,7 @@
453423
inline constexpr bool enable_borrowed_range<chunk_view<V>> = // freestanding
454424
@\libconcept{forward_range}@<V> && enable_borrowed_range<V>;
455425

456-
namespace views {
457-
inline constexpr @\unspec@ chunk = @\unspec@; // freestanding
458-
}
426+
namespace views { inline constexpr @\unspecnc@ chunk = @\unspecnc@; } // freestanding
459427

460428
// \ref{range.slide}, slide view
461429
template<@\libconcept{forward_range}@ V>
@@ -466,18 +434,14 @@
466434
inline constexpr bool enable_borrowed_range<slide_view<V>> =
467435
enable_borrowed_range<V>; // freestanding
468436

469-
namespace views {
470-
inline constexpr @\unspec@ slide = @\unspec@; // freestanding
471-
}
437+
namespace views { inline constexpr @\unspecnc@ slide = @\unspecnc@; } // freestanding
472438

473439
// \ref{range.chunk.by}, chunk by view
474440
template<@\libconcept{forward_range}@ V, @\libconcept{indirect_binary_predicate}@<iterator_t<V>, iterator_t<V>> Pred>
475441
requires @\libconcept{view}@<V> && is_object_v<Pred>
476442
class chunk_by_view; // freestanding
477443

478-
namespace views { // freestanding
479-
inline constexpr @\unspec@ chunk_by = @\unspec@; // freestanding
480-
}
444+
namespace views { inline constexpr @\unspecnc@ chunk_by = @\unspecnc@; } // freestanding
481445
}
482446

483447
namespace std {
@@ -506,9 +470,7 @@
506470
using type = S; // freestanding
507471
};
508472

509-
struct from_range_t { // freestanding
510-
explicit from_range_t() = default; // freestanding
511-
};
473+
struct from_range_t { explicit from_range_t() = default; }; // freestanding
512474
inline constexpr from_range_t from_range{}; // freestanding
513475
}
514476
\end{codeblock}

0 commit comments

Comments
 (0)