StarMirror/xlnt
1
0
Fork 0
mirror of https://github.com/tfussell/xlnt.git synced 2024-03-22 13:11:17 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #51 from xpol/refactor-index-types

Browse Source 
Refactor index types
This commit is contained in:
Thomas Fussell 2016-06-15 08:23:35 -04:00 committed by GitHub
commit fbbd984779
2 changed files with 19 additions and 160 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
include/xlnt/cell/index_types.hpp
View File

@ -231,27 +231,27 @@ public:
/// <summary>
/// Return the result of adding rhs to this column.
/// </summary>
column_t operator+(const column_t &rhs);
friend column_t operator+(column_t lhs, const column_t& rhs);
/// <summary>
/// Return the result of adding rhs to this column.
/// Return the result of subtracing lhs by rhs column.
/// </summary>
column_t operator-(const column_t &rhs);
friend column_t operator-(column_t lhs, const column_t& rhs);
/// <summary>
/// Return the result of adding rhs to this column.
/// Return the result of multiply lhs by rhs column.
/// </summary>
column_t operator*(const column_t &rhs);
friend column_t operator*(column_t lhs, const column_t& rhs);
/// <summary>
/// Return the result of adding rhs to this column.
/// Return the result of divide lhs by rhs column.
/// </summary>
column_t operator/(const column_t &rhs);
friend column_t operator/(column_t lhs, const column_t& rhs);
/// <summary>
/// Return the result of adding rhs to this column.
/// Return the result of mod lhs by rhs column.
/// </summary>
column_t operator%(const column_t &rhs);
friend column_t operator%(column_t lhs, const column_t& rhs);
/// <summary>
/// Add rhs to this column and return a reference to this column.

161
source/cell/index_types.cpp
View File

@ -92,239 +92,98 @@ std::string column_t::column_string_from_index(column_t::index_t column_index)
}
/// <summary>
/// Default column_t is the first (left-most) column.
/// </summary>
column_t::column_t() : index(1) {}
/// <summary>
/// Construct a column from a number.
/// </summary>
column_t::column_t(index_t column_index) : index(column_index) {}
/// <summary>
/// Construct a column from a string.
/// </summary>
column_t::column_t(const std::string &column_string) : index(column_index_from_string(column_string)) {}
/// <summary>
/// Construct a column from a string.
/// </summary>
column_t::column_t(const char *column_string) : column_t(std::string(column_string)) {}
/// <summary>
/// Copy constructor
/// </summary>
column_t::column_t(const column_t &other) : column_t(other.index) {}
/// <summary>
/// Move constructor
/// </summary>
column_t::column_t(column_t &&other) { swap(*this, other); }
/// <summary>
/// Return a string representation of this column index.
/// </summary>
std::string column_t::column_string() const { return column_string_from_index(index); }
/// <summary>
/// Set this column to be the same as rhs's and return reference to self.
/// </summary>
column_t &column_t::operator=(column_t rhs) { swap(*this, rhs); return *this; }
/// <summary>
/// Set this column to be equal to rhs and return reference to self.
/// </summary>
column_t &column_t::operator=(const std::string &rhs) { return *this = column_t(rhs); }
/// <summary>
/// Set this column to be equal to rhs and return reference to self.
/// </summary>
column_t &column_t::operator=(const char *rhs) { return *this = column_t(rhs); }
/// <summary>
/// Return true if this column refers to the same column as other.
/// </summary>
bool column_t::operator==(const column_t &other) const { return index == other.index; }
/// <summary>
/// Return true if this column doesn't refer to the same column as other.
/// </summary>
bool column_t::operator!=(const column_t &other) const { return !(*this == other); }
/// <summary>
/// Return true if this column refers to the same column as other.
/// </summary>
bool column_t::operator==(int other) const { return *this == column_t(other); }
/// <summary>
/// Return true if this column refers to the same column as other.
/// </summary>
bool column_t::operator==(index_t other) const { return *this == column_t(other); }
/// <summary>
/// Return true if this column refers to the same column as other.
/// </summary>
bool column_t::operator==(const std::string &other) const { return *this == column_t(other); }
/// <summary>
/// Return true if this column refers to the same column as other.
/// </summary>
bool column_t::operator==(const char *other) const { return *this == column_t(other); }
/// <summary>
/// Return true if this column doesn't refer to the same column as other.
/// </summary>
bool column_t::operator!=(int other) const { return !(*this == other); }
/// <summary>
/// Return true if this column doesn't refer to the same column as other.
/// </summary>
bool column_t::operator!=(index_t other) const { return !(*this == other); }
/// <summary>
/// Return true if this column doesn't refer to the same column as other.
/// </summary>
bool column_t::operator!=(const std::string &other) const { return !(*this == other); }
/// <summary>
/// Return true if this column doesn't refer to the same column as other.
/// </summary>
bool column_t::operator!=(const char *other) const { return !(*this == other); }
/// <summary>
/// Return true if other is to the right of this column.
/// </summary>
bool column_t::operator>(const column_t &other) const { return index > other.index; }
/// <summary>
/// Return true if other is to the right of or equal to this column.
/// </summary>
bool column_t::operator>=(const column_t &other) const { return index >= other.index; }
/// <summary>
/// Return true if other is to the left of this column.
/// </summary>
bool column_t::operator<(const column_t &other) const { return index < other.index; }
/// <summary>
/// Return true if other is to the left of or equal to this column.
/// </summary>
bool column_t::operator<=(const column_t &other) const { return index <= other.index; }
/// <summary>
/// Return true if other is to the right of this column.
/// </summary>
bool column_t::operator>(const column_t::index_t &other) const { return index > other; }
/// <summary>
/// Return true if other is to the right of or equal to this column.
/// </summary>
bool column_t::operator>=(const column_t::index_t &other) const { return index >= other; }
/// <summary>
/// Return true if other is to the left of this column.
/// </summary>
bool column_t::operator<(const column_t::index_t &other) const { return index < other; }
/// <summary>
/// Return true if other is to the left of or equal to this column.
/// </summary>
bool column_t::operator<=(const column_t::index_t &other) const { return index <= other; }
/// <summary>
/// Pre-increment this column, making it point to the column one to the right.
/// </summary>
column_t &column_t::operator++() { index++; return *this; }
/// <summary>
/// Pre-deccrement this column, making it point to the column one to the left.
/// </summary>
column_t &column_t::operator--() { index--; return *this; }
/// <summary>
/// Post-increment this column, making it point to the column one to the right and returning the old column.
/// </summary>
column_t column_t::operator++(int) { column_t copy(index); ++(*this); return copy; }
/// <summary>
/// Post-decrement this column, making it point to the column one to the left and returning the old column.
/// </summary>
column_t column_t::operator--(int) { column_t copy(index); --(*this); return copy; }
/// <summary>
/// Return the result of adding rhs to this column.
/// </summary>
column_t column_t::operator+(const column_t &rhs) { column_t copy(*this); copy.index += rhs.index; return copy; }
column_t operator+(column_t lhs, const column_t& rhs) { lhs += rhs; return lhs; }
/// <summary>
/// Return the result of adding rhs to this column.
/// </summary>
column_t column_t::operator-(const column_t &rhs) { column_t copy(*this); copy.index -= rhs.index; return copy; }
column_t operator-(column_t lhs, const column_t& rhs) { lhs -= rhs; return lhs; }
/// <summary>
/// Return the result of adding rhs to this column.
/// </summary>
column_t column_t::operator*(const column_t &rhs) { column_t copy(*this); copy.index *= rhs.index; return copy; }
column_t operator*(column_t lhs, const column_t& rhs) { lhs *= rhs; return lhs; }
/// <summary>
/// Return the result of adding rhs to this column.
/// </summary>
column_t column_t::operator/(const column_t &rhs) { column_t copy(*this); copy.index /= rhs.index; return copy; }
column_t operator/(column_t lhs, const column_t& rhs) { lhs /= rhs; return lhs; }
/// <summary>
/// Return the result of adding rhs to this column.
/// </summary>
column_t column_t::operator%(const column_t &rhs) { column_t copy(*this); copy.index %= rhs.index; return copy; }
column_t operator%(column_t lhs, const column_t& rhs) { lhs %= rhs; return lhs; }
/// <summary>
/// Add rhs to this column and return a reference to this column.
/// </summary>
column_t &column_t::operator+=(const column_t &rhs) { return *this = (*this + rhs); }
column_t &column_t::operator+=(const column_t &rhs) { index += rhs.index; return *this; }
/// <summary>
/// Subtrac rhs from this column and return a reference to this column.
/// </summary>
column_t &column_t::operator-=(const column_t &rhs) { return *this = (*this - rhs); }
column_t &column_t::operator-=(const column_t &rhs) { index -= rhs.index; return *this; }
/// <summary>
/// Multiply this column by rhs and return a reference to this column.
/// </summary>
column_t &column_t::operator*=(const column_t &rhs) { return *this = (*this * rhs); }
column_t &column_t::operator*=(const column_t &rhs) { index *= rhs.index; return *this; }
/// <summary>
/// Divide this column by rhs and return a reference to this column.
/// </summary>
column_t &column_t::operator/=(const column_t &rhs) { return *this = (*this / rhs); }
column_t &column_t::operator/=(const column_t &rhs) { index /= rhs.index; return *this; }
/// <summary>
/// Mod this column by rhs and return a reference to this column.
/// </summary>
column_t &column_t::operator%=(const column_t &rhs) { return *this = (*this % rhs); }
column_t &column_t::operator%=(const column_t &rhs) { index %= rhs.index; return *this; }
/// <summary>
/// Return true if other is to the right of this column.
/// </summary>
bool operator>(const column_t::index_t &left, const column_t &right) { return column_t(left) > right; }
/// <summary>
/// Return true if other is to the right of or equal to this column.
/// </summary>
bool operator>=(const column_t::index_t &left, const column_t &right) { return column_t(left) >= right; }
/// <summary>
/// Return true if other is to the left of this column.
/// </summary>
bool operator<(const column_t::index_t &left, const column_t &right) { return column_t(left) < right; }
/// <summary>
/// Return true if other is to the left of or equal to this column.
/// </summary>
bool operator<=(const column_t::index_t &left, const column_t &right) { return column_t(left) <= right; }
/// <summary>
/// Swap the columns that left and right refer to.
/// </summary>
void swap(column_t &left, column_t &right)
{
using std::swap;