xenia/kakoune
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make LineAndColumn an aggregate as well

Browse Source
This commit is contained in:
Maxime Coste 2017-09-01 17:21:50 +07:00
parent 64183b1e4c
commit 5c5491405e
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/coord.hh
View File

@ -10,12 +10,8 @@ namespace Kakoune
template<typename EffectiveType, typename LineType, typename ColumnType> template<typename EffectiveType, typename LineType, typename ColumnType>
struct LineAndColumn struct LineAndColumn
{ {
LineType line; LineType line = 0;
ColumnType column; ColumnType column = 0;
[[gnu::always_inline]]
constexpr LineAndColumn(LineType line = 0, ColumnType column = 0)
: line(line), column(column) {}
[[gnu::always_inline]] [[gnu::always_inline]]
constexpr EffectiveType operator+(EffectiveType other) const constexpr EffectiveType operator+(EffectiveType other) const
@ -95,14 +91,14 @@ struct BufferCoord : LineAndColumn<BufferCoord, LineCount, ByteCount>
{ {
[[gnu::always_inline]] [[gnu::always_inline]]
constexpr BufferCoord(LineCount line = 0, ByteCount column = 0) constexpr BufferCoord(LineCount line = 0, ByteCount column = 0)
: LineAndColumn(line, column) {} : LineAndColumn{line, column} {}
}; };
struct DisplayCoord : LineAndColumn<DisplayCoord, LineCount, ColumnCount> struct DisplayCoord : LineAndColumn<DisplayCoord, LineCount, ColumnCount>
{ {
[[gnu::always_inline]] [[gnu::always_inline]]
constexpr DisplayCoord(LineCount line = 0, ColumnCount column = 0) constexpr DisplayCoord(LineCount line = 0, ColumnCount column = 0)
: LineAndColumn(line, column) {} : LineAndColumn{line, column} {}
static constexpr const char* option_type_name = "coord"; static constexpr const char* option_type_name = "coord";
}; };
@ -111,11 +107,11 @@ struct BufferCoordAndTarget : BufferCoord
{ {
[[gnu::always_inline]] [[gnu::always_inline]]
constexpr BufferCoordAndTarget(LineCount line = 0, ByteCount column = 0, ColumnCount target = -1) constexpr BufferCoordAndTarget(LineCount line = 0, ByteCount column = 0, ColumnCount target = -1)
: BufferCoord(line, column), target(target) {} : BufferCoord{line, column}, target{target} {}
[[gnu::always_inline]] [[gnu::always_inline]]
constexpr BufferCoordAndTarget(BufferCoord coord, ColumnCount target = -1) constexpr BufferCoordAndTarget(BufferCoord coord, ColumnCount target = -1)
: BufferCoord(coord), target(target) {} : BufferCoord{coord}, target{target} {}
ColumnCount target; ColumnCount target;
}; };