Browse Source

Renamed "length" local variable to "len" to prevent potential naming conflicts.

release/0.19
JustinAJ 11 years ago
parent
commit
fd293f2bf8
  1. 31
      Jupiter/CString_Imp.h
  2. 14
      Jupiter/Shift_String_Imp.h

31
Jupiter/CString_Imp.h

@ -27,6 +27,17 @@
#include "Functions.h" #include "Functions.h"
#include "CString.h" #include "CString.h"
#if !defined va_copy
#if defined __INTEL_COMPILER
#pragma message("Warning: va_copy not properly defined. Assuming common implementation.")
#define va_copy(dst, src) ((void)((dst) = (src)))
#else
#error "va_copy not defined."
#endif // __INTEL_COMPILER
#endif // va_copy
/** /**
* IMPLEMENTATION: * IMPLEMENTATION:
* CString_Type * CString_Type
@ -247,9 +258,9 @@ template<typename T> Jupiter::CString_Strict<T> Jupiter::CString_Strict<T>::subs
return Jupiter::CString_Strict<T>::substring(*this, pos, Jupiter::String_Type<T>::length - pos); return Jupiter::CString_Strict<T>::substring(*this, pos, Jupiter::String_Type<T>::length - pos);
} }
template<typename T> Jupiter::CString_Strict<T> Jupiter::CString_Strict<T>::substring(size_t pos, size_t length) const template<typename T> Jupiter::CString_Strict<T> Jupiter::CString_Strict<T>::substring(size_t pos, size_t len) const
{ {
return Jupiter::CString_Strict<T>::substring(*this, pos, length); return Jupiter::CString_Strict<T>::substring(*this, pos, len);
} }
template<typename T> Jupiter::CString_Strict<T> Jupiter::CString_Strict<T>::substring(const Jupiter::String_Type<T> &in, size_t pos) template<typename T> Jupiter::CString_Strict<T> Jupiter::CString_Strict<T>::substring(const Jupiter::String_Type<T> &in, size_t pos)
@ -263,13 +274,13 @@ template<typename T> Jupiter::CString_Strict<T> Jupiter::CString_Strict<T>::subs
return r; return r;
} }
template<typename T> Jupiter::CString_Strict<T> Jupiter::CString_Strict<T>::substring(const Jupiter::String_Type<T> &in, size_t pos, size_t length) template<typename T> Jupiter::CString_Strict<T> Jupiter::CString_Strict<T>::substring(const Jupiter::String_Type<T> &in, size_t pos, size_t len)
{ {
if (pos > in.size()) return Jupiter::CString_Strict<T>(); if (pos > in.size()) return Jupiter::CString_Strict<T>();
if (length > in.size() - pos) length = in.size() - pos; if (len > in.size() - pos) len = in.size() - pos;
Jupiter::CString_Strict<T> r = Jupiter::CString_Strict<T>(length); Jupiter::CString_Strict<T> r = Jupiter::CString_Strict<T>(len);
size_t index; size_t index;
for (index = 0; index != length && in.get(index + pos) != 0; index++) r.str[index] = in.get(index + pos); for (index = 0; index != len && in.get(index + pos) != 0; index++) r.str[index] = in.get(index + pos);
r.str[index] = 0; r.str[index] = 0;
r.length = index; r.length = index;
return r; return r;
@ -724,13 +735,13 @@ template<typename T> Jupiter::CString_Loose<T> Jupiter::CString_Loose<T>::substr
return r; return r;
} }
template<typename T> Jupiter::CString_Loose<T> Jupiter::CString_Loose<T>::substring(const Jupiter::String_Type<T> &in, size_t pos, size_t length) template<typename T> Jupiter::CString_Loose<T> Jupiter::CString_Loose<T>::substring(const Jupiter::String_Type<T> &in, size_t pos, size_t len)
{ {
if (pos > in.size()) return Jupiter::CString_Loose<T>(); if (pos > in.size()) return Jupiter::CString_Loose<T>();
if (length > in.size() - pos) length = in.size() - pos; if (len > in.size() - pos) len = in.size() - pos;
Jupiter::CString_Loose<T> r = Jupiter::CString_Loose<T>(length); Jupiter::CString_Loose<T> r = Jupiter::CString_Loose<T>(len);
size_t index; size_t index;
for (index = 0; index != length && in.get(index + pos) != 0; index++) r.str[index] = in.get(index + pos); for (index = 0; index != len && in.get(index + pos) != 0; index++) r.str[index] = in.get(index + pos);
r.str[index] = 0; r.str[index] = 0;
r.length = index; r.length = index;
return r; return r;

14
Jupiter/Shift_String_Imp.h

@ -24,21 +24,21 @@
* Note: Modification of this file is not supported in any way. * Note: Modification of this file is not supported in any way.
*/ */
template<typename T> size_t Jupiter::Shift_String_Type<T>::shiftLeft(size_t length) template<typename T> size_t Jupiter::Shift_String_Type<T>::shiftLeft(size_t len)
{ {
size_t offset = Jupiter::String_Type<T>::str - Jupiter::Shift_String_Type<T>::base; size_t offset = Jupiter::String_Type<T>::str - Jupiter::Shift_String_Type<T>::base;
if (length > offset) length = offset; if (length > offset) length = offset;
Jupiter::String_Type<T>::str -= length; Jupiter::String_Type<T>::str -= len;
Jupiter::String_Type<T>::length += length; Jupiter::String_Type<T>::length += len;
return length; return length;
} }
template<typename T> size_t Jupiter::Shift_String_Type<T>::shiftRight(size_t length) template<typename T> size_t Jupiter::Shift_String_Type<T>::shiftRight(size_t len)
{ {
if (length > Jupiter::String_Type<T>::length) length = Jupiter::String_Type<T>::length; if (length > Jupiter::String_Type<T>::length) length = Jupiter::String_Type<T>::length;
Jupiter::String_Type<T>::str += length; Jupiter::String_Type<T>::str += len;
Jupiter::String_Type<T>::length -= length; Jupiter::String_Type<T>::length -= len;
return length; return len;
} }
#endif // _SHIFT_STRING_IMP_H_HEADER #endif // _SHIFT_STRING_IMP_H_HEADER
Loading…
Cancel
Save