Skip to content

Commit 3723834

Browse files
[linalg] Index defined-in-class functions and related class members
Affected classes: - `layout_blas_packed` - `layout_blas_packed::mapping` - `scaled_accessor` - `layout_transpose` - `layout_transpose::mapping` Drive-by fix: - add a missing close brace `}` to the end of `layout_transpose::mapping::required_span_size`
1 parent ebd315d commit 3723834

File tree

1 file changed

+42
-42
lines changed

1 file changed

+42
-42
lines changed

source/numerics.tex

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -12051,17 +12051,17 @@
1205112051
template<class Triangle, class StorageOrder>
1205212052
class @\libglobal{layout_blas_packed}@ {
1205312053
public:
12054-
using triangle_type = Triangle;
12055-
using storage_order_type = StorageOrder;
12054+
using @\libmember{triangle_type}{layout_blas_packed}@ = Triangle;
12055+
using @\libmember{storage_order_type}{layout_blas_packed}@ = StorageOrder;
1205612056

1205712057
template<class Extents>
12058-
struct mapping {
12058+
struct @\libmember{mapping}{layout_blas_packed}@ {
1205912059
public:
12060-
using extents_type = Extents;
12061-
using index_type = extents_type::index_type;
12062-
using size_type = extents_type::size_type;
12063-
using rank_type = extents_type::rank_type;
12064-
using layout_type = layout_blas_packed;
12060+
using @\libmember{extents_type}{layout_blas_packed::mapping}@ = Extents;
12061+
using @\libmember{index_type}{layout_blas_packed::mapping}@ = extents_type::index_type;
12062+
using @\libmember{size_type}{layout_blas_packed::mapping}@ = extents_type::size_type;
12063+
using @\libmember{rank_type}{layout_blas_packed::mapping}@ = extents_type::rank_type;
12064+
using @\libmember{layout_type}{layout_blas_packed::mapping}@ = layout_blas_packed;
1206512065

1206612066
// \ref{linalg.layout.packed.cons}, constructors
1206712067
constexpr mapping() noexcept = default;
@@ -12074,28 +12074,28 @@
1207412074
constexpr mapping& operator=(const mapping&) noexcept = default;
1207512075

1207612076
// \ref{linalg.layout.packed.obs}, observers
12077-
constexpr const extents_type& extents() const noexcept { return @\exposid{extents_}@; }
12077+
constexpr const extents_type& @\libmember{extents}{layout_blas_packed::mapping}@() const noexcept { return @\exposid{extents_}@; }
1207812078

1207912079
constexpr index_type required_span_size() const noexcept;
1208012080

1208112081
template<class Index0, class Index1>
1208212082
constexpr index_type operator() (Index0 ind0, Index1 ind1) const noexcept;
1208312083

12084-
static constexpr bool is_always_unique() noexcept {
12084+
static constexpr bool @\libmember{is_always_unique}{layout_blas_packed::mapping}@() noexcept {
1208512085
return (extents_type::static_extent(0) != dynamic_extent &&
1208612086
extents_type::static_extent(0) < 2) ||
1208712087
(extents_type::static_extent(1) != dynamic_extent &&
1208812088
extents_type::static_extent(1) < 2);
1208912089
}
12090-
static constexpr bool is_always_exhaustive() noexcept { return true; }
12091-
static constexpr bool is_always_strided() noexcept
12090+
static constexpr bool @\libmember{is_always_exhaustive}{layout_blas_packed::mapping}@() noexcept { return true; }
12091+
static constexpr bool @\libmember{is_always_strided}{layout_blas_packed::mapping}@() noexcept
1209212092
{ return is_always_unique(); }
1209312093

12094-
constexpr bool is_unique() const noexcept {
12094+
constexpr bool @\libmember{is_unique}{layout_blas_packed::mapping}@() const noexcept {
1209512095
return @\exposid{extents_}@.extent(0) < 2;
1209612096
}
12097-
constexpr bool is_exhaustive() const noexcept { return true; }
12098-
constexpr bool is_strided() const noexcept {
12097+
constexpr bool @\libmember{is_exhaustive}{layout_blas_packed::mapping}@() const noexcept { return true; }
12098+
constexpr bool @\libmember{is_strided}{layout_blas_packed::mapping}@() const noexcept {
1209912099
return @\exposid{extents_}@.extent(0) < 2;
1210012100
}
1210112101

@@ -12604,11 +12604,11 @@
1260412604
template<class ScalingFactor, class NestedAccessor>
1260512605
class @\libglobal{scaled_accessor}@ {
1260612606
public:
12607-
using element_type =
12607+
using @\libmember{element_type}{scaled_accessor}@ =
1260812608
const decltype(declval<ScalingFactor>() * declval<NestedAccessor::element_type>());
12609-
using reference = remove_const_t<element_type>;
12610-
using data_handle_type = NestedAccessor::data_handle_type;
12611-
using offset_policy = scaled_accessor<ScalingFactor, NestedAccessor::offset_policy>;
12609+
using @\libmember{reference}{scaled_accessor}@ = remove_const_t<element_type>;
12610+
using @\libmember{data_handle_type}{scaled_accessor}@ = NestedAccessor::data_handle_type;
12611+
using @\libmember{offset_policy}{scaled_accessor}@ = scaled_accessor<ScalingFactor, NestedAccessor::offset_policy>;
1261212612

1261312613
constexpr scaled_accessor() = default;
1261412614
template<class OtherNestedAccessor>
@@ -12776,11 +12776,11 @@
1277612776
template<class NestedAccessor>
1277712777
class @\libglobal{conjugated_accessor}@ {
1277812778
public:
12779-
using element_type =
12779+
using @\libmember{element_type}{conjugated_accessor}@ =
1278012780
const decltype(@\exposid{conj-if-needed}@(declval<NestedAccessor::element_type>()));
12781-
using reference = remove_const_t<element_type>;
12782-
using data_handle_type = NestedAccessor::data_handle_type;
12783-
using offset_policy = conjugated_accessor<NestedAccessor::offset_policy>;
12781+
using @\libmember{reference}{conjugated_accessor}@ = remove_const_t<element_type>;
12782+
using @\libmember{data_handle_type}{conjugated_accessor}@ = NestedAccessor::data_handle_type;
12783+
using @\libmember{offset_policy}{conjugated_accessor}@ = conjugated_accessor<NestedAccessor::offset_policy>;
1278412784

1278512785
constexpr conjugated_accessor() = default;
1278612786
constexpr conjugated_accessor(const NestedAccessor& acc);
@@ -12793,7 +12793,7 @@
1279312793
constexpr typename offset_policy::data_handle_type
1279412794
offset(data_handle_type p, size_t i) const;
1279512795

12796-
constexpr const NestedAccessor& nested_accessor() const noexcept { return @\exposid{nested-accessor_}@; }
12796+
constexpr const NestedAccessor& @\libmember{nested_accessor}{conjugated_accessor}@() const noexcept { return @\exposid{nested-accessor_}@; }
1279712797

1279812798
private:
1279912799
NestedAccessor @\exposid{nested-accessor_}@{}; // \expos
@@ -12996,45 +12996,45 @@
1299612996
template<class Layout>
1299712997
class @\libglobal{layout_transpose}@ {
1299812998
public:
12999-
using nested_layout_type = Layout;
12999+
using @\libmember{nested_layout_type}{layout_transpose}@ = Layout;
1300013000

1300113001
template<class Extents>
13002-
struct mapping {
13002+
struct @\libmember{mapping}{layout_transpose}@ {
1300313003
private:
1300413004
using @\exposid{nested-mapping-type}@ =
1300513005
Layout::template mapping<@\exposid{transpose-extents-t}@<Extents>>; // \expos
1300613006

1300713007
public:
13008-
using extents_type = Extents;
13009-
using index_type = extents_type::index_type;
13010-
using size_type = extents_type::size_type;
13011-
using rank_type = extents_type::rank_type;
13012-
using layout_type = layout_transpose;
13008+
using @\libmember{extents_type}{layout_transpose::mapping}@ = Extents;
13009+
using @\libmember{index_type}{layout_transpose::mapping}@ = extents_type::index_type;
13010+
using @\libmember{size_type}{layout_transpose::mapping}@ = extents_type::size_type;
13011+
using @\libmember{rank_type}{layout_transpose::mapping}@ = extents_type::rank_type;
13012+
using @\libmember{layout_type}{layout_transpose::mapping}@ = layout_transpose;
1301313013

1301413014
constexpr explicit mapping(const @\exposid{nested-mapping-type}@&);
1301513015

13016-
constexpr const extents_type& extents() const noexcept { return @\exposid{extents_}@; }
13016+
constexpr const extents_type& @\libmember{extents}{layout_transpose::mapping}@() const noexcept { return @\exposid{extents_}@; }
1301713017

13018-
constexpr index_type required_span_size() const
13019-
{ return @\exposid{nested-mapping_}@.required_span_size();
13018+
constexpr index_type @\libmember{required_span_size}{layout_transpose::mapping}@() const
13019+
{ return @\exposid{nested-mapping_}@.required_span_size(); }
1302013020

1302113021
template<class Index0, class Index1>
13022-
constexpr index_type operator()(Index0 ind0, Index1 ind1) const
13022+
constexpr index_type @\libmember{operator()}{layout_transpose::mapping}@(Index0 ind0, Index1 ind1) const
1302313023
{ return @\exposid{nested-mapping_}@(ind1, ind0); }
1302413024

13025-
constexpr const @\exposid{nested-mapping-type}@& nested_mapping() const noexcept
13025+
constexpr const @\exposid{nested-mapping-type}@& @\libmember{nested_mapping}{layout_transpose::mapping}@() const noexcept
1302613026
{ return @\exposid{nested-mapping_}@; }
1302713027

13028-
static constexpr bool is_always_unique() noexcept
13028+
static constexpr bool @\libmember{is_always_unique}{layout_transpose::mapping}@() noexcept
1302913029
{ return @\exposid{nested-mapping-type}@::is_always_unique(); }
13030-
static constexpr bool is_always_exhaustive() noexcept
13030+
static constexpr bool @\libmember{is_always_exhaustive}{layout_transpose::mapping}@() noexcept
1303113031
{ return @\exposid{nested-mapping-type}@::is_always_exhaustive(); }
13032-
static constexpr bool is_always_strided() noexcept
13032+
static constexpr bool @\libmember{is_always_strided}{layout_transpose::mapping}@() noexcept
1303313033
{ return @\exposid{nested-mapping-type}@::is_always_strided(); }
1303413034

13035-
constexpr bool is_unique() const { return @\exposid{nested-mapping_}@.is_unique(); }
13036-
constexpr bool is_exhaustive() const { return @\exposid{nested-mapping_}@.is_exhaustive(); }
13037-
constexpr bool is_strided() const { return @\exposid{nested-mapping_}@.is_strided(); }
13035+
constexpr bool @\libmember{is_unique}{layout_transpose::mapping}@() const { return @\exposid{nested-mapping_}@.is_unique(); }
13036+
constexpr bool @\libmember{is_exhaustive}{layout_transpose::mapping}@() const { return @\exposid{nested-mapping_}@.is_exhaustive(); }
13037+
constexpr bool @\libmember{is_strided}{layout_transpose::mapping}@() const { return @\exposid{nested-mapping_}@.is_strided(); }
1303813038

1303913039
constexpr index_type stride(size_t r) const;
1304013040

0 commit comments

Comments
 (0)