nerdcruft/libcruft-util
1
0
Fork 0
Code Issues Releases Activity

pascal: make size/data private

Browse Source
This commit is contained in:
Danny Robson 2016-03-17 18:10:46 +11:00
parent 61e1d6a303
commit b263bbef0a
2 changed files with 110 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

150
pascal.cpp
View File

@ -11,7 +11,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
* *
* Copyright 2010 Danny Robson <danny@nerdcruft.net> * Copyright 2010-2016 Danny Robson <danny@nerdcruft.net>
*/ */
#include "pascal.hpp" #include "pascal.hpp"
@ -21,44 +21,38 @@
using util::parray; using util::parray;
//----------------------------------------------------------------------------- ///////////////////////////////////////////////////////////////////////////////
template <typename T> template <typename T>
parray<T>::parray (size_t _size, T *_data): parray<T>::parray (size_t _size, T *_data):
size (_size), m_size (_size),
data (_data) m_data (_data)
{ ; } { ; }
//----------------------------------------------------------------------------- ///////////////////////////////////////////////////////////////////////////////
template <typename T> template <typename T>
T& T&
parray<T>::operator[] (size_t idx) { parray<T>::operator[] (size_t idx)
return data[idx]; {
} return data ()[idx];
template <typename T>
const T&
parray<T>::operator[] (size_t idx) const {
return data[idx];
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
template <typename T> template <typename T>
T& const T&
parray<T>::at (size_t idx) { parray<T>::operator[] (size_t idx) const
if (idx >= size) {
throw std::out_of_range ("invalid index for parray"); return data ()[idx];
return (*this)[idx];
} }
///////////////////////////////////////////////////////////////////////////////
template <typename T> template <typename T>
const T& T&
parray<T>::at (size_t idx) const { parray<T>::at (size_t idx)
if (idx >= size) {
if (idx >= size ())
throw std::out_of_range ("invalid index for parray"); throw std::out_of_range ("invalid index for parray");
return (*this)[idx]; return (*this)[idx];
@ -67,43 +61,90 @@ parray<T>::at (size_t idx) const {
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
template <typename T> template <typename T>
T* const T&
parray<T>::begin (void) const { parray<T>::at (size_t idx) const
return data; {
if (idx >= size ())
throw std::out_of_range ("invalid index for parray");
return (*this)[idx];
} }
///////////////////////////////////////////////////////////////////////////////
template <typename T> template <typename T>
T* T*
parray<T>::end (void) const { parray<T>::begin (void)
return data + size; {
return data ();
}
//-----------------------------------------------------------------------------
template <typename T>
T*
parray<T>::end (void)
{
return data () + size ();
}
///////////////////////////////////////////////////////////////////////////////
template <typename T>
const T*
parray<T>::cbegin (void) const
{
return data ();
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
template <typename T> template <typename T>
const T* const T*
parray<T>::cbegin (void) const { parray<T>::cend (void) const
return data; {
return data () + size ();
} }
///////////////////////////////////////////////////////////////////////////////
template <typename T> template <typename T>
const T* const T*
parray<T>::cend (void) const { parray<T>::data (void) const
return data + size; {
return m_data;
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
template <typename T> template <typename T>
T*
parray<T>::data (void)
{
return m_data;
}
//-----------------------------------------------------------------------------
template <typename T>
size_t
parray<T>::size (void) const
{
return m_size;
}
///////////////////////////////////////////////////////////////////////////////
template <typename T>
std::ostream& std::ostream&
util::operator<< (std::ostream &os, parray<T> p) { util::operator<< (std::ostream &os, parray<T> p)
os << "[" << p.size << ", " << std::hex << p.data << std::dec << "]"; {
os << "[" << p.size () << ", " << std::hex << p.data () << std::dec << "]";
return os; return os;
} }
//-----------------------------------------------------------------------------
template std::ostream& util::operator<< (std::ostream&, parray<uint16_t>); template std::ostream& util::operator<< (std::ostream&, parray<uint16_t>);
template std::ostream& util::operator<< (std::ostream&, parray<uint32_t>); template std::ostream& util::operator<< (std::ostream&, parray<uint32_t>);
template std::ostream& util::operator<< (std::ostream&, parray<uint64_t>); template std::ostream& util::operator<< (std::ostream&, parray<uint64_t>);
@ -112,28 +153,27 @@ template std::ostream& util::operator<< (std::ostream&, parray<const uint16_t>);
template std::ostream& util::operator<< (std::ostream&, parray<const uint32_t>); template std::ostream& util::operator<< (std::ostream&, parray<const uint32_t>);
template std::ostream& util::operator<< (std::ostream&, parray<const uint64_t>); template std::ostream& util::operator<< (std::ostream&, parray<const uint64_t>);
//-----------------------------------------------------------------------------
namespace util {
template struct parray<char>;
template struct parray<const char>;
template struct parray<int8_t>; ///////////////////////////////////////////////////////////////////////////////
template struct parray<int16_t>; template class util::parray<char>;
template struct parray<int32_t>; template class util::parray<const char>;
template struct parray<int64_t>;
template struct parray<uint8_t>; template class util::parray<int8_t>;
template struct parray<uint16_t>; template class util::parray<int16_t>;
template struct parray<uint32_t>; template class util::parray<int32_t>;
template struct parray<uint64_t>; template class util::parray<int64_t>;
template struct parray<const int8_t>; template class util::parray<uint8_t>;
template struct parray<const int16_t>; template class util::parray<uint16_t>;
template struct parray<const int32_t>; template class util::parray<uint32_t>;
template struct parray<const int64_t>; template class util::parray<uint64_t>;
template struct parray<const uint8_t>; template class util::parray<const int8_t>;
template struct parray<const uint16_t>; template class util::parray<const int16_t>;
template struct parray<const uint32_t>; template class util::parray<const int32_t>;
template struct parray<const uint64_t>; template class util::parray<const int64_t>;
}
template class util::parray<const uint8_t>;
template class util::parray<const uint16_t>;
template class util::parray<const uint32_t>;
template class util::parray<const uint64_t>;

23
pascal.hpp
View File

@ -11,7 +11,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
* *
* Copyright 2010 Danny Robson <danny@nerdcruft.net> * Copyright 2010-2016 Danny Robson <danny@nerdcruft.net>
*/ */
#ifndef __UTIL_PASCAL_HPP #ifndef __UTIL_PASCAL_HPP
@ -22,27 +22,34 @@
namespace util { namespace util {
template <typename T> template <typename T>
struct parray { class parray {
public:
parray (size_t size, T *data); parray (size_t size, T *data);
size_t size;
T *data;
T& operator[] (size_t idx); T& operator[] (size_t idx);
const T& operator[] (size_t idx) const; const T& operator[] (size_t idx) const;
T& at (size_t idx); T& at (size_t idx);
const T& at (size_t idx) const; const T& at (size_t idx) const;
T* begin (void) const; T* begin (void);
T* end (void) const; T* end (void);
const T* cbegin (void) const; const T* cbegin (void) const;
const T* cend (void) const; const T* cend (void) const;
const T* data (void) const;
T* data (void);
size_t size (void) const;
private:
size_t m_size;
T *m_data;
}; };
template <typename T> template <typename T>
std::ostream& operator<< (std::ostream&, util::parray<T>); std::ostream&
operator<< (std::ostream&, util::parray<T>);
} }