Improve CellArray.
This commit is contained in:
Arkshine
parent
0b7bc23a30
commit
42fa547cb4
|
|
@ -147,8 +147,8 @@ void UTIL_ShowMenu(edict_t* pEntity, int slots, int time, char *menu, int mlen);
|
|||
void UTIL_ClientSayText(edict_t *pEntity, int sender, char *msg);
|
||||
void UTIL_TeamInfo(edict_t *pEntity, int playerIndex, const char *pszTeamName);
|
||||
|
||||
template <typename D>
|
||||
int UTIL_CheckValidChar(D *c);
|
||||
template <typename D> int UTIL_CheckValidChar(D *c);
|
||||
template <typename D> unsigned int strncopy(D *dest, const char *src, size_t count);
|
||||
unsigned int UTIL_GetUTF8CharBytes(const char *stream);
|
||||
unsigned int UTIL_ReplaceAll(char *subject, size_t maxlength, const char *search, const char *replace, bool caseSensitive);
|
||||
char *UTIL_ReplaceEx(char *subject, size_t maxLen, const char *search, size_t searchLen, const char *replace, size_t replaceLen, bool caseSensitive);
|
||||
|
|
@ -300,7 +300,7 @@ int amxstring_len(cell* cstr);
|
|||
int load_amxscript(AMX* amx, void** program, const char* path, char error[64], int debug);
|
||||
int set_amxnatives(AMX* amx, char error[64]);
|
||||
int set_amxstring(AMX *amx, cell amx_addr, const char *source, int max);
|
||||
int set_amxstring_utf8(AMX *amx, cell amx_addr, const char *source, size_t sourcelen, size_t maxlen);
|
||||
template <typename T> int set_amxstring_utf8(AMX *amx, cell amx_addr, const T *source, size_t sourcelen, size_t maxlen);
|
||||
int unload_amxscript(AMX* amx, void** program);
|
||||
|
||||
void copy_amxmemory(cell* dest, cell* src, int len);
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -31,352 +31,193 @@
|
|||
#ifndef DATASTRUCTS_H
|
||||
#define DATASTRUCTS_H
|
||||
|
||||
class CellVector
|
||||
{
|
||||
private:
|
||||
cell* data; // allocated with malloc
|
||||
size_t cellcount; // how many cells per element
|
||||
size_t cursize; // current size of the vector (maximum elements)
|
||||
size_t count; // how many units of the vector are in use
|
||||
#include <am-vector.h>
|
||||
|
||||
bool GrowIfNeeded(size_t howmany)
|
||||
class CellArray
|
||||
{
|
||||
/* Shortcut out if we can store this */
|
||||
if (count + howmany <= cursize)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
/* Set a base allocation size of 8 items */
|
||||
if (!cursize)
|
||||
{
|
||||
cursize = 8;
|
||||
}
|
||||
|
||||
/* If it's not enough, keep doubling */
|
||||
while (count + howmany > cursize)
|
||||
{
|
||||
cursize *= 2;
|
||||
}
|
||||
|
||||
if (data)
|
||||
{
|
||||
data = (cell*)realloc(data, (sizeof(cell)* cellcount) * cursize);
|
||||
}
|
||||
else
|
||||
{
|
||||
data = (cell*)malloc((sizeof(cell)* cellcount) * cursize);
|
||||
}
|
||||
|
||||
return (data != NULL);
|
||||
};
|
||||
|
||||
public:
|
||||
CellVector(): data(NULL), cellcount(0), cursize(0), count(0)
|
||||
CellArray(size_t blocksize) : m_Data(NULL), m_BlockSize(blocksize), m_AllocSize(0), m_Size(0)
|
||||
{
|
||||
};
|
||||
CellVector(int cellsize): data(NULL), cellcount(cellsize), cursize(0), count(0)
|
||||
{
|
||||
};
|
||||
~CellVector()
|
||||
{
|
||||
if (data)
|
||||
{
|
||||
free(data);
|
||||
}
|
||||
};
|
||||
size_t GetCellCount()
|
||||
{
|
||||
return cellcount;
|
||||
};
|
||||
void Grow(size_t howmany)
|
||||
{
|
||||
cursize+=howmany;
|
||||
if (data)
|
||||
{
|
||||
data=(cell*)realloc(data, (sizeof(cell) * cellcount) * cursize);
|
||||
}
|
||||
else
|
||||
{
|
||||
data=(cell*)malloc((sizeof(cell) * cellcount) * cursize);
|
||||
}
|
||||
};
|
||||
void FreeUnused(void)
|
||||
{
|
||||
if (cursize != count &&
|
||||
data != NULL)
|
||||
{
|
||||
cursize=count;
|
||||
data=(cell*)realloc(data, cursize * (sizeof(cell) * cellcount));
|
||||
}
|
||||
};
|
||||
// Returns 1 on success
|
||||
// 0 on out of bounds.
|
||||
int GetArray(size_t which, cell* output)
|
||||
{
|
||||
// make sure it is in bounds.
|
||||
if (which >= count)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
// align output data
|
||||
cell* out=data + (cellcount * which);
|
||||
|
||||
memcpy(output, out, sizeof(cell) * cellcount);
|
||||
|
||||
return 1;
|
||||
};
|
||||
// Returns 1 on success
|
||||
// 0 on out of bounds
|
||||
int GetCell(size_t which, cell* output)
|
||||
{
|
||||
// check bounds
|
||||
if (which >= count)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
*output=*(data + (cellcount * which));
|
||||
|
||||
return 1;
|
||||
}
|
||||
// Returns 1 on success
|
||||
// 0 on out of bounds
|
||||
int GetString(size_t which, cell* output, size_t size)
|
||||
{
|
||||
// check bounds
|
||||
if (which >= count)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
cell* out=data + (cellcount * which);
|
||||
|
||||
size_t count=cellcount;
|
||||
|
||||
while (size-- &&
|
||||
count-- &&
|
||||
(*output++=*out++)!='\0')
|
||||
/* do nothing */ ;
|
||||
|
||||
// If size is zero here, then the string was never null terminated.
|
||||
if (size==0)
|
||||
{
|
||||
*out='\0';
|
||||
}
|
||||
|
||||
/* Don't truncate a multi-byte character */
|
||||
if (*(output - 1) & 1 << 7)
|
||||
~CellArray()
|
||||
{
|
||||
size = UTIL_CheckValidChar(output - 1);
|
||||
*(output - size) = '\0';
|
||||
free(m_Data);
|
||||
}
|
||||
|
||||
return 1;
|
||||
}
|
||||
// Returns 1 on success
|
||||
// 0 on out of bounds
|
||||
int SetArray(size_t which, cell* output)
|
||||
size_t size() const
|
||||
{
|
||||
if (which >= count)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
// align output
|
||||
cell* out=data + (cellcount * which);
|
||||
|
||||
memcpy(out, output, sizeof(cell) * cellcount);
|
||||
|
||||
return 1;
|
||||
};
|
||||
// Returns 1 on success
|
||||
// 0 on out of bounds
|
||||
int SetCell(size_t which, cell output)
|
||||
{
|
||||
if (which >= count)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
// align output
|
||||
*(data + (cellcount * which))=output;
|
||||
|
||||
return 1;
|
||||
};
|
||||
// Returns 1 on success
|
||||
// 0 on out of bounds
|
||||
int SetString(size_t which, cell* output)
|
||||
{
|
||||
if (which >= count)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
// align output
|
||||
cell* out=data + (cellcount * which);
|
||||
|
||||
memcpy(out, output, sizeof(cell) * cellcount);
|
||||
|
||||
// now force a null terminator on the last entry.
|
||||
out+=(cellcount - 1);
|
||||
*out='\0';
|
||||
|
||||
return 1;
|
||||
};
|
||||
int Push()
|
||||
{
|
||||
if (count >= cursize)
|
||||
{
|
||||
// Grow in 8s to cause less reallocation
|
||||
this->Grow(8);
|
||||
};
|
||||
|
||||
this->count++;
|
||||
|
||||
return this->count-1;
|
||||
};
|
||||
int Size()
|
||||
{
|
||||
return this->count;
|
||||
};
|
||||
|
||||
bool Resize(size_t newsize)
|
||||
{
|
||||
if (newsize <= count)
|
||||
{
|
||||
count = newsize;
|
||||
return true;
|
||||
return m_Size;
|
||||
}
|
||||
|
||||
if (!GrowIfNeeded(newsize - count))
|
||||
cell *push()
|
||||
{
|
||||
if (!GrowIfNeeded(1))
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
cell *arr = &m_Data[m_Size * m_BlockSize];
|
||||
m_Size++;
|
||||
return arr;
|
||||
}
|
||||
|
||||
cell *at(size_t b) const
|
||||
{
|
||||
return &m_Data[b * m_BlockSize];
|
||||
}
|
||||
|
||||
size_t blocksize() const
|
||||
{
|
||||
return m_BlockSize;
|
||||
}
|
||||
|
||||
void clear()
|
||||
{
|
||||
m_Size = 0;
|
||||
}
|
||||
|
||||
bool swap(size_t item1, size_t item2)
|
||||
{
|
||||
/* Make sure there is extra space available */
|
||||
if (!GrowIfNeeded(1))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
count = newsize;
|
||||
cell *pri = at(item1);
|
||||
cell *alt = at(item2);
|
||||
|
||||
/* Get our temporary array 1 after the limit */
|
||||
cell *temp = &m_Data[m_Size * m_BlockSize];
|
||||
|
||||
memcpy(temp, pri, sizeof(cell)* m_BlockSize);
|
||||
memcpy(pri, alt, sizeof(cell)* m_BlockSize);
|
||||
memcpy(alt, temp, sizeof(cell)* m_BlockSize);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
CellVector *Clone()
|
||||
void remove(size_t index)
|
||||
{
|
||||
CellVector *array = new CellVector(cellcount);
|
||||
array->count = count;
|
||||
array->cursize = cursize;
|
||||
array->data = (cell *)malloc((sizeof(cell)* cellcount) * cursize);
|
||||
memcpy(array->data, data, (sizeof(cell)* cellcount) * count);
|
||||
return array;
|
||||
/* If we're at the end, take the easy way out */
|
||||
if (index == m_Size - 1)
|
||||
{
|
||||
m_Size--;
|
||||
return;
|
||||
}
|
||||
|
||||
void Clear()
|
||||
{
|
||||
free(data);
|
||||
data=(cell*)malloc(sizeof(cell) * cellcount);
|
||||
cursize=1;
|
||||
count=0;
|
||||
};
|
||||
cell* Base()
|
||||
{
|
||||
return data;
|
||||
/* Otherwise, it's time to move stuff! */
|
||||
size_t remaining_indexes = (m_Size - 1) - index;
|
||||
cell *src = at(index + 1);
|
||||
cell *dest = at(index);
|
||||
memmove(dest, src, sizeof(cell)* m_BlockSize * remaining_indexes);
|
||||
|
||||
m_Size--;
|
||||
}
|
||||
cell* GetCellPointer(size_t which)
|
||||
|
||||
cell *insert_at(size_t index)
|
||||
{
|
||||
if (which >= count)
|
||||
/* Make sure it'll fit */
|
||||
if (!GrowIfNeeded(1))
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
return data + (which * cellcount);
|
||||
};
|
||||
// Shifts all items from this item, and including this item up 1.
|
||||
int ShiftUpFrom(size_t which)
|
||||
{
|
||||
// No point shifting this.
|
||||
if (which > this->count)
|
||||
{
|
||||
|
||||
return 0;
|
||||
}
|
||||
// First make a new item.
|
||||
this->Push();
|
||||
/* move everything up */
|
||||
cell *src = at(index);
|
||||
cell *dst = at(index + 1);
|
||||
memmove(dst, src, sizeof(cell)* m_BlockSize * (m_Size - index));
|
||||
|
||||
// If we got an InsertAfter(lastitem), then which will equal this->count - 1
|
||||
// all we needed to do was Push()
|
||||
if (which == this->count ||
|
||||
which == this->count - 1)
|
||||
{
|
||||
return 1;
|
||||
m_Size++;
|
||||
|
||||
return src;
|
||||
}
|
||||
|
||||
// Allocate a temporary buffer to store data in
|
||||
size_t tempbuffsize=(sizeof(cell) * cellcount) * (this->count - 1 - which);
|
||||
|
||||
cell* temp=(cell*)malloc(tempbuffsize);
|
||||
|
||||
// Copy old data to temp buffer
|
||||
memcpy(temp, GetCellPointer(which), tempbuffsize);
|
||||
|
||||
// Now copy temp buffer to adjusted location
|
||||
memcpy(GetCellPointer(which+1), temp, tempbuffsize);
|
||||
|
||||
// cleanup
|
||||
free(temp);
|
||||
|
||||
return 1;
|
||||
|
||||
};
|
||||
// Shifts all items from this item, and including this item down 1.
|
||||
// This deletes the item specified.
|
||||
int Delete(size_t which)
|
||||
bool resize(size_t count)
|
||||
{
|
||||
// No point shifting this.
|
||||
if (which >= this->count)
|
||||
if (count <= m_Size)
|
||||
{
|
||||
return 0;
|
||||
m_Size = count;
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
for (size_t i=which; i<this->count - 1; i++)
|
||||
if (!GrowIfNeeded(count - m_Size))
|
||||
{
|
||||
memcpy(GetCellPointer(i), GetCellPointer(i + 1), sizeof(cell) * cellcount);
|
||||
}
|
||||
this->count--;
|
||||
return 1;
|
||||
};
|
||||
int Swap(size_t item1, size_t item2)
|
||||
{
|
||||
if (item1 >= this->count ||
|
||||
item2 >= this->count)
|
||||
{
|
||||
return 0;
|
||||
return false;
|
||||
}
|
||||
|
||||
// Make a temp buffer to store item2
|
||||
cell* temp=(cell*)malloc(sizeof(cell) * cellcount);
|
||||
memcpy(temp, GetCellPointer(item2), sizeof(cell) * cellcount);
|
||||
m_Size = count;
|
||||
return true;
|
||||
}
|
||||
|
||||
// copy item1 to item2
|
||||
memcpy(GetCellPointer(item2), GetCellPointer(item1), sizeof(cell) * cellcount);
|
||||
|
||||
// copy item2 to item1
|
||||
memcpy(GetCellPointer(item1), temp, sizeof(cell) * cellcount);
|
||||
|
||||
// Cleanup
|
||||
free(temp);
|
||||
|
||||
return 1;
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
extern CVector<CellVector*> VectorHolder;
|
||||
|
||||
|
||||
inline CellVector* HandleToVector(AMX* amx, int handle)
|
||||
CellArray *clone()
|
||||
{
|
||||
if (handle <= 0 ||
|
||||
handle > (int)VectorHolder.size())
|
||||
CellArray *array = new CellArray(m_BlockSize);
|
||||
array->m_AllocSize = m_AllocSize;
|
||||
array->m_Size = m_Size;
|
||||
array->m_Data = (cell *)malloc(sizeof(cell)* m_BlockSize * m_AllocSize);
|
||||
memcpy(array->m_Data, m_Data, sizeof(cell)* m_BlockSize * m_Size);
|
||||
return array;
|
||||
}
|
||||
|
||||
cell *base()
|
||||
{
|
||||
return m_Data;
|
||||
}
|
||||
|
||||
size_t mem_usage()
|
||||
{
|
||||
return m_AllocSize * m_BlockSize * sizeof(cell);
|
||||
}
|
||||
|
||||
private:
|
||||
bool GrowIfNeeded(size_t count)
|
||||
{
|
||||
/* Shortcut out if we can store this */
|
||||
if (m_Size + count <= m_AllocSize)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
/* Set a base allocation size of 8 items */
|
||||
if (!m_AllocSize)
|
||||
{
|
||||
m_AllocSize = 8;
|
||||
}
|
||||
/* If it's not enough, keep doubling */
|
||||
while (m_Size + count > m_AllocSize)
|
||||
{
|
||||
m_AllocSize *= 2;
|
||||
}
|
||||
/* finally, allocate the new block */
|
||||
if (m_Data)
|
||||
{
|
||||
m_Data = (cell *)realloc(m_Data, sizeof(cell)* m_BlockSize * m_AllocSize);
|
||||
}
|
||||
else {
|
||||
m_Data = (cell *)malloc(sizeof(cell)* m_BlockSize * m_AllocSize);
|
||||
}
|
||||
return (m_Data != NULL);
|
||||
}
|
||||
private:
|
||||
cell *m_Data;
|
||||
size_t m_BlockSize;
|
||||
size_t m_AllocSize;
|
||||
size_t m_Size;
|
||||
};
|
||||
|
||||
extern ke::Vector<CellArray*> VectorHolder;
|
||||
|
||||
|
||||
inline CellArray* HandleToVector(AMX* amx, int handle)
|
||||
{
|
||||
if (handle <= 0 || handle > (int)VectorHolder.length())
|
||||
{
|
||||
LogError(amx, AMX_ERR_NATIVE, "Invalid array handle provided (%d)", handle);
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
CellVector* ret=VectorHolder[handle-1];
|
||||
CellArray* ret = VectorHolder[handle - 1];
|
||||
|
||||
if (ret == NULL)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -407,7 +407,7 @@ int C_Spawn(edict_t *pent)
|
|||
|
||||
FlagMan.LoadFile();
|
||||
|
||||
for (unsigned int i=0; i<VectorHolder.size(); i++)
|
||||
for (unsigned int i=0; i<VectorHolder.length(); i++)
|
||||
{
|
||||
delete VectorHolder[i];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -403,9 +403,9 @@ int sort_adtarray_strings_desc(const void *str1, const void *str2)
|
|||
return strcmp((char *) str2, (char *) str1);
|
||||
}
|
||||
|
||||
void sort_adt_random(CellVector *cArray)
|
||||
void sort_adt_random(CellArray *cArray)
|
||||
{
|
||||
size_t arraysize = cArray->Size();
|
||||
size_t arraysize = cArray->size();
|
||||
|
||||
srand((unsigned int)time(NULL));
|
||||
|
||||
|
|
@ -413,13 +413,13 @@ void sort_adt_random(CellVector *cArray)
|
|||
{
|
||||
int n = rand() % (i + 1);
|
||||
|
||||
cArray->Swap(i, n);
|
||||
cArray->swap(i, n);
|
||||
}
|
||||
}
|
||||
|
||||
static cell AMX_NATIVE_CALL SortADTArray(AMX *amx, cell *params)
|
||||
{
|
||||
CellVector* vec=HandleToVector(amx, params[1]);
|
||||
CellArray* vec = HandleToVector(amx, params[1]);
|
||||
|
||||
if (vec == NULL)
|
||||
{
|
||||
|
|
@ -436,9 +436,9 @@ static cell AMX_NATIVE_CALL SortADTArray(AMX *amx, cell *params)
|
|||
}
|
||||
|
||||
cell type = params[3];
|
||||
size_t arraysize = vec->Size();
|
||||
size_t blocksize = vec->GetCellCount();
|
||||
cell *array = vec->Base();
|
||||
size_t arraysize = vec->size();
|
||||
size_t blocksize = vec->blocksize();
|
||||
cell *array = vec->base();
|
||||
|
||||
if (type == Sort_Integer)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -110,7 +110,11 @@ int set_amxstring(AMX *amx, cell amx_addr, const char *source, int max)
|
|||
return dest - start;
|
||||
}
|
||||
|
||||
int set_amxstring_utf8(AMX *amx, cell amx_addr, const char *source, size_t sourcelen, size_t maxlen)
|
||||
template int set_amxstring_utf8<cell>(AMX *, cell, const cell *, size_t, size_t);
|
||||
template int set_amxstring_utf8<char>(AMX *, cell, const char *, size_t, size_t);
|
||||
|
||||
template <typename T>
|
||||
int set_amxstring_utf8(AMX *amx, cell amx_addr, const T *source, size_t sourcelen, size_t maxlen)
|
||||
{
|
||||
size_t len = sourcelen;
|
||||
bool needtocheck = false;
|
||||
|
|
|
|||
|
|
@ -514,18 +514,24 @@ unsigned int UTIL_ReplaceAll(char *subject, size_t maxlength, const char *search
|
|||
return total;
|
||||
}
|
||||
|
||||
unsigned int strncopy(char *dest, const char *src, size_t count)
|
||||
template unsigned int strncopy<char>(char *, const char *src, size_t count);
|
||||
template unsigned int strncopy<cell>(cell *, const char *src, size_t count);
|
||||
|
||||
template <typename D>
|
||||
unsigned int strncopy(D *dest, const char *src, size_t count)
|
||||
{
|
||||
if (!count)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
char *start = dest;
|
||||
D *start = dest;
|
||||
|
||||
while ((*src) && (--count))
|
||||
{
|
||||
*dest++ = *src++;
|
||||
*dest++ = *(unsigned char*)src++;
|
||||
}
|
||||
|
||||
*dest = '\0';
|
||||
|
||||
return (dest - start);
|
||||
|
|
|
|||
|
|
@ -4,10 +4,6 @@
|
|||
|
||||
#define _cellarray_included
|
||||
|
||||
enum Array
|
||||
{
|
||||
Invalid_Array = 0
|
||||
};
|
||||
/**
|
||||
* These arrays are intended to be used for a form of global storage without
|
||||
* requiring a #define that needs to be increased each time a person needs more
|
||||
|
|
@ -16,13 +12,39 @@ enum Array
|
|||
* normal arrays are faster and should be used whenever possible.
|
||||
*/
|
||||
|
||||
enum Array
|
||||
{
|
||||
Invalid_Array = 0
|
||||
};
|
||||
|
||||
/**
|
||||
* Given a maximum string size (including the null terminator),
|
||||
* returns the number of cells required to fit that string.
|
||||
*
|
||||
* @param size Number of bytes.
|
||||
* @return Minimum number of cells required to fit the byte count.
|
||||
*/
|
||||
stock ByteCountToCells(size)
|
||||
{
|
||||
if (!size)
|
||||
{
|
||||
return 1;
|
||||
}
|
||||
|
||||
return (size + 3) / 4;
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates a handle to a dynamically sized array.
|
||||
* It is very important that the cellsize you provide matches up with the buffer sizes
|
||||
* that you pass with subsequent Array{Get,Set,Push} calls.
|
||||
*
|
||||
* @note As per AMX Mod X 1.8.3, reserved parameter has no effect.
|
||||
*
|
||||
* @param cellsize How many cells each entry in the array is.
|
||||
* @param reserved How many blank entries are created immediately when the array is created. These entries are not valid to read from until called with ArraySet.
|
||||
* @param reserved How many blank entries are created immediately when the array is created.
|
||||
* These entries are not valid to read from until called with ArraySet.
|
||||
*
|
||||
* @return Handle to the array.
|
||||
*/
|
||||
native Array:ArrayCreate(cellsize = 1, reserved = 32);
|
||||
|
|
@ -32,7 +54,9 @@ native Array:ArrayCreate(cellsize=1, reserved=32);
|
|||
* You must close it.
|
||||
*
|
||||
* @param which Array handle to be cloned.
|
||||
*
|
||||
* @return New handle to the cloned array object on success, 0 on failure.
|
||||
* @error Invalid handle.
|
||||
*/
|
||||
native Array:ArrayClone(Array:which);
|
||||
|
||||
|
|
@ -40,7 +64,9 @@ native Array:ArrayClone(Array:which);
|
|||
* Clears all entries from the array.
|
||||
*
|
||||
* @param which The array to clear.
|
||||
* @return 1 on success, 0 on failure.
|
||||
*
|
||||
* @noreturn
|
||||
* @error Invalid handle.
|
||||
*/
|
||||
native ArrayClear(Array:which);
|
||||
|
||||
|
|
@ -48,7 +74,9 @@ native ArrayClear(Array:which);
|
|||
* Returns the number of elements in the array.
|
||||
*
|
||||
* @param which The array to check.
|
||||
*
|
||||
* @return How many elements are in the array.
|
||||
* @error Invalid handle.
|
||||
*/
|
||||
native ArraySize(Array:which);
|
||||
|
||||
|
|
@ -56,9 +84,11 @@ native ArraySize(Array:which);
|
|||
* Resizes an array. If the size is smaller than the current size,
|
||||
* the array is truncated.
|
||||
*
|
||||
* @param which Array Handle.
|
||||
* @param which Array handle.
|
||||
* @param newsize New size.
|
||||
* @return 1 on success, 0 on failure.
|
||||
*
|
||||
* @noreturn
|
||||
* @error Invalid handle or out of memory.
|
||||
*/
|
||||
native bool:ArrayResize(Array:which, newsize);
|
||||
|
||||
|
|
@ -68,9 +98,14 @@ native bool:ArrayResize(Array:which, newsize);
|
|||
*
|
||||
* @param which The array to retrieve the item from.
|
||||
* @param item The item to retrieve (zero-based).
|
||||
* @param size If not set, assumes the buffer size is equal to the
|
||||
* cellsize. Otherwise, the size passed is used.
|
||||
* @param output The output buffer to write.
|
||||
*
|
||||
* @return Number of cells copied.
|
||||
* @error Invalid handle or invalid index.
|
||||
*/
|
||||
native ArrayGetArray(Array:which, item, any:output[]);
|
||||
native ArrayGetArray(Array:which, item, any:output[], size = -1);
|
||||
|
||||
/**
|
||||
* Returns a single cell of data from an array.
|
||||
|
|
@ -78,9 +113,14 @@ native ArrayGetArray(Array:which, item, any:output[]);
|
|||
*
|
||||
* @param which The array to retrieve the item from.
|
||||
* @param item The item to retrieve (zero-based).
|
||||
* @return The value of the cell.
|
||||
* @param block Optionally specify which block to read from
|
||||
* (useful if the blocksize > 0).
|
||||
* @param asChar Optionally read as a byte instead of a cell.
|
||||
*
|
||||
* @return Value read.
|
||||
* @error Invalid handle, invalid index, or invalid block.
|
||||
*/
|
||||
native any:ArrayGetCell(Array:which, item);
|
||||
native any:ArrayGetCell(Array:which, item, block = 0, bool:asChar = false);
|
||||
|
||||
/**
|
||||
* Returns a string value from an array.
|
||||
|
|
@ -89,6 +129,9 @@ native any:ArrayGetCell(Array:which, item);
|
|||
* @param item The item to retrieve (zero-based).
|
||||
* @param output The variable to store the value in.
|
||||
* @param size Character size of the output buffer.
|
||||
*
|
||||
* @return Number of characters copied.
|
||||
* @error Invalid handle or invalid index.
|
||||
*/
|
||||
native ArrayGetString(Array:which, item, output[], size);
|
||||
|
||||
|
|
@ -100,8 +143,13 @@ native ArrayGetString(Array:which, item, output[], size);
|
|||
* @param which The array to set the item from within.
|
||||
* @param item The item to set (zero-based).
|
||||
* @param input The input buffer to store.
|
||||
* @param size If not set, assumes the buffer size is equal to the
|
||||
* blocksize. Otherwise, the size passed is used.
|
||||
*
|
||||
* @return Number of cells copied.
|
||||
* @error Invalid handle or invalid index.
|
||||
*/
|
||||
native ArraySetArray(Array:which, item, const any:input[]);
|
||||
native ArraySetArray(Array:which, item, const any:input[], size =-1);
|
||||
|
||||
/**
|
||||
* Sets an array's single cell value. Use this only on array that were created with a cellsize of 1!
|
||||
|
|
@ -110,8 +158,14 @@ native ArraySetArray(Array:which, item, const any:input[]);
|
|||
* @param which The array to set the item from within.
|
||||
* @param item The item to set (zero-based).
|
||||
* @param input The value to set.
|
||||
* @param block Optionally specify which block to write to
|
||||
* (useful if the blocksize > 0).
|
||||
* @param asChar Optionally set as a byte instead of a cell.
|
||||
*
|
||||
* @noreturn
|
||||
* @error Invalid handle, invalid index, or invalid block.
|
||||
*/
|
||||
native ArraySetCell(Array:which, item, any:input);
|
||||
native ArraySetCell(Array:which, item, any:input, block = 0, bool:asChar = false);
|
||||
|
||||
/**
|
||||
* Sets a string value from an array.
|
||||
|
|
@ -121,6 +175,9 @@ native ArraySetCell(Array:which, item, any:input);
|
|||
* @param which The array to set the item from within.
|
||||
* @param item The item to set (zero-based).
|
||||
* @param input The string to set the item as.
|
||||
*
|
||||
* @return Number of characters copied.
|
||||
* @error Invalid handle or invalid index.
|
||||
*/
|
||||
native ArraySetString(Array:which, item, const input[]);
|
||||
|
||||
|
|
@ -130,8 +187,14 @@ native ArraySetString(Array:which, item, const input[]);
|
|||
*
|
||||
* @param which The array to add the item to.
|
||||
* @param input The input buffer to store.
|
||||
* @param size If not set, the number of elements copied from the array
|
||||
* will be equal to the blocksize. If set higher than the
|
||||
* blocksize, the operation will be truncated.
|
||||
*
|
||||
* @return Index of the new entry.
|
||||
* @error Invalid handle or out of memory.
|
||||
*/
|
||||
native ArrayPushArray(Array:which, const any:input[]);
|
||||
native ArrayPushArray(Array:which, const any:input[], size = -1);
|
||||
|
||||
/**
|
||||
* Creates a new item and sets the array's single cell value.
|
||||
|
|
@ -139,6 +202,9 @@ native ArrayPushArray(Array:which, const any:input[]);
|
|||
*
|
||||
* @param which The array to add the item to.
|
||||
* @param input The value to set.
|
||||
*
|
||||
* @return Index of the new entry.
|
||||
* @error Invalid handle or out of memory.
|
||||
*/
|
||||
native ArrayPushCell(Array:which, any:input);
|
||||
|
||||
|
|
@ -148,6 +214,9 @@ native ArrayPushCell(Array:which, any:input);
|
|||
*
|
||||
* @param which The array to add the item to.
|
||||
* @param input The string to set the item as.
|
||||
*
|
||||
* @return Index of the new entry.
|
||||
* @error Invalid handle or out of memory.
|
||||
*/
|
||||
native ArrayPushString(Array:which, const input[]);
|
||||
|
||||
|
|
@ -158,6 +227,9 @@ native ArrayPushString(Array:which, const input[]);
|
|||
* @param which The array to add the item to.
|
||||
* @param item The item to insert after.
|
||||
* @param input The input buffer to store.
|
||||
*
|
||||
* @noreturn
|
||||
* @error Invalid handle or invalid index.
|
||||
*/
|
||||
native ArrayInsertArrayAfter(Array:which, item, const any:input[]);
|
||||
|
||||
|
|
@ -168,6 +240,9 @@ native ArrayInsertArrayAfter(Array:which, item, const any:input[]);
|
|||
* @param which The array to add the item to.
|
||||
* @param item The item to insert after.
|
||||
* @param input The value to set.
|
||||
*
|
||||
* @noreturn
|
||||
* @error Invalid handle or invalid index.
|
||||
*/
|
||||
native ArrayInsertCellAfter(Array:which, item, any:input);
|
||||
|
||||
|
|
@ -178,6 +253,9 @@ native ArrayInsertCellAfter(Array:which, item, any:input);
|
|||
* @param which The array to add the item to.
|
||||
* @param item The item to insert after.
|
||||
* @param input The value to set.
|
||||
*
|
||||
* @noreturn
|
||||
* @error Invalid handle or invalid index.
|
||||
*/
|
||||
native ArrayInsertStringAfter(Array:which, item, const input[]);
|
||||
|
||||
|
|
@ -188,6 +266,9 @@ native ArrayInsertStringAfter(Array:which, item, const input[]);
|
|||
* @param which The array to add the item to.
|
||||
* @param item The item to insert before.
|
||||
* @param input The input buffer to store.
|
||||
*
|
||||
* @noreturn
|
||||
* @error Invalid handle or invalid index.
|
||||
*/
|
||||
native ArrayInsertArrayBefore(Array:which, item, const any:input[]);
|
||||
|
||||
|
|
@ -198,6 +279,9 @@ native ArrayInsertArrayBefore(Array:which, item, const any:input[]);
|
|||
* @param which The array to add the item to.
|
||||
* @param item The item to insert after.
|
||||
* @param input The value to set.
|
||||
*
|
||||
* @noreturn
|
||||
* @error Invalid handle or invalid index.
|
||||
*/
|
||||
native ArrayInsertCellBefore(Array:which, item, const any:input);
|
||||
|
||||
|
|
@ -208,6 +292,9 @@ native ArrayInsertCellBefore(Array:which, item, const any:input);
|
|||
* @param which The array to add the item to.
|
||||
* @param item The item to insert before.
|
||||
* @param input The value to set.
|
||||
*
|
||||
* @noreturn
|
||||
* @error Invalid handle or invalid index.
|
||||
*/
|
||||
native ArrayInsertStringBefore(Array:which, item, const input[]);
|
||||
|
||||
|
|
@ -217,6 +304,9 @@ native ArrayInsertStringBefore(Array:which, item, const input[]);
|
|||
* @param which The array that contains the items.
|
||||
* @param item1 The first item to swap.
|
||||
* @param item2 The second item to swap.
|
||||
*
|
||||
* @noreturn
|
||||
* @error Invalid handle or invalid index.
|
||||
*/
|
||||
native ArraySwap(Array:which, item1, item2);
|
||||
|
||||
|
|
@ -225,6 +315,9 @@ native ArraySwap(Array:which, item1, item2);
|
|||
*
|
||||
* @param which The array that contains the item to delete.
|
||||
* @param item The item to delete.
|
||||
*
|
||||
* @noreturn
|
||||
* @error Invalid handle or invalid index.
|
||||
*/
|
||||
native ArrayDeleteItem(Array:which, item);
|
||||
|
||||
|
|
@ -232,9 +325,11 @@ native ArrayDeleteItem(Array:which, item);
|
|||
* Returns the index for the first occurance of the provided string. If the string
|
||||
* cannot be located, -1 will be returned.
|
||||
*
|
||||
* @param which Array Handle.
|
||||
* @param which Array handle.
|
||||
* @param item String to search for.
|
||||
*
|
||||
* @return Array index, or -1 on failure.
|
||||
* @error Invalid handle.
|
||||
*/
|
||||
native ArrayFindString(Array:which, const item[]);
|
||||
|
||||
|
|
@ -242,9 +337,11 @@ native ArrayFindString(Array:which, const item[]);
|
|||
* Returns the index for the first occurance of the provided value. If the value
|
||||
* cannot be located, -1 will be returned.
|
||||
*
|
||||
* @param which Array Handle.
|
||||
* @param which Array handle.
|
||||
* @param item Value to search for.
|
||||
*
|
||||
* @return Array index, or -1 on failure.
|
||||
* @error Invalid handle.
|
||||
*/
|
||||
native ArrayFindValue(Array:which, any:item);
|
||||
|
||||
|
|
@ -257,7 +354,9 @@ native ArrayFindValue(Array:which, any:item);
|
|||
*
|
||||
* @param which The array the string is stored in.
|
||||
* @param item Which item to print the string value of.
|
||||
*
|
||||
* @return Handle to the item directly. Do not use or save stale handles.
|
||||
* @error Invalid handle or invalid index.
|
||||
*/
|
||||
native DoNotUse:ArrayGetStringHandle(Array:which, item);
|
||||
|
||||
|
|
@ -265,11 +364,13 @@ native DoNotUse:ArrayGetStringHandle(Array:which, item);
|
|||
* Destroys the array, and resets the handle to 0 to prevent accidental usage after it is destroyed.
|
||||
*
|
||||
* @param which The array to destroy.
|
||||
*
|
||||
* @noreturn
|
||||
* @error Invalid handle.
|
||||
*/
|
||||
native ArrayDestroy(&Array:which);
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* Similar to sorting.inc's CustomSort.
|
||||
* The sorting algorithm then uses your comparison function to sort the data.
|
||||
|
|
@ -286,9 +387,17 @@ native ArrayDestroy(&Array:which);
|
|||
* -1 if item1 should go before item2
|
||||
* 0 if item1 and item2 are equal
|
||||
* 1 if item1 should go after item2
|
||||
* Note that the parameters after item2 are all optional and you do not need to specify them.
|
||||
*
|
||||
* Note that the parameters after item2 are all optional and you do not need to specify them.
|
||||
* Note that unlike the sorting.inc versions, the array passed to the callback is not in mid-sorted state.
|
||||
*
|
||||
* @param array Array handle.
|
||||
* @param comparefunc A callback function used for comparison.
|
||||
* @param data Extra data array you passed to the sort func.
|
||||
* @param data_size Size of extra data you passed to the sort func.
|
||||
*
|
||||
* @noreturn
|
||||
* @error Invalid handle or invalid callback.
|
||||
*/
|
||||
native ArraySort(Array:array, const comparefunc[], data[]="", data_size=0);
|
||||
|
||||
|
|
@ -328,7 +437,14 @@ native ArraySort(Array:array, const comparefunc[], data[]="", data_size=0);
|
|||
* 1 if elem1 should go after elem2
|
||||
*
|
||||
* Note that the parameters after elem2 are all optional and you do not need to specify them.
|
||||
*
|
||||
* Note that unlike the sorting.inc versions, the array passed to the callback is not in mid-sorted state.
|
||||
*
|
||||
* @param array Array handle.
|
||||
* @param comparefunc A callback function used for comparison.
|
||||
* @param data Extra data array you passed to the sort func.
|
||||
* @param data_size Size of extra data you passed to the sort func.
|
||||
*
|
||||
* @noreturn
|
||||
* @error Invalid handle, invalid callback or out of memory.
|
||||
*/
|
||||
native ArraySortEx(Array:array, const comparefunc[], data[]="", data_size=0);
|
||||
|
|
|
|||
|
|
@ -52,10 +52,10 @@ stock starttests(const startfunc[])
|
|||
errcount = 0;
|
||||
__testfuncnum = 1;
|
||||
server_print("Starting tests...");
|
||||
formatex(__testfunc,sizeof(__testfunc)-1,"%s",startfunc);
|
||||
formatex(__testfunc, charsmax(__testfunc), "%s", startfunc);
|
||||
|
||||
new func[32];
|
||||
formatex(func,sizeof(func)-1,"%s%d",__testfunc,__testfuncnum++);
|
||||
formatex(func, charsmax(func), "%s%d", __testfunc, __testfuncnum++);
|
||||
set_task(0.1, func);
|
||||
}
|
||||
|
||||
|
|
@ -64,7 +64,7 @@ stock showres()
|
|||
if (errcount==0)
|
||||
{
|
||||
new func[32];
|
||||
formatex(func,sizeof(func)-1,"%s%d",__testfunc,__testfuncnum++);
|
||||
formatex(func, charsmax(func), "%s%d", __testfunc, __testfuncnum++);
|
||||
if (get_func_id(func) == -1)
|
||||
{
|
||||
server_print("All tests ok!");
|
||||
|
|
@ -99,14 +99,17 @@ public arraytest1()
|
|||
|
||||
new Float:f;
|
||||
new Array:a = ArrayCreate(1);
|
||||
|
||||
if (a == Invalid_Array)
|
||||
{
|
||||
}
|
||||
|
||||
for (new i = 0; i < 1000; i++)
|
||||
{
|
||||
f = float(i);
|
||||
ArrayPushCell(a,f);
|
||||
}
|
||||
|
||||
new Float:r;
|
||||
for (new i = 0; i < 1000; i++)
|
||||
{
|
||||
|
|
@ -116,23 +119,20 @@ public arraytest1()
|
|||
// This is normally bad for float "casting", but in this case it should be fine.
|
||||
test(_:f, _:r);
|
||||
|
||||
|
||||
// Reset with inversed values
|
||||
new g=_:f;
|
||||
g=~g;
|
||||
|
||||
ArraySetCell(a, i, g);
|
||||
|
||||
r = Float:ArrayGetCell(a,i);
|
||||
|
||||
test(g, _:r);
|
||||
|
||||
}
|
||||
|
||||
ArrayDestroy(a);
|
||||
|
||||
showres();
|
||||
}
|
||||
|
||||
stock bool:checkarray(const a[], const b[], size)
|
||||
{
|
||||
while (size--)
|
||||
|
|
@ -145,6 +145,7 @@ stock bool:checkarray(const a[], const b[], size)
|
|||
|
||||
return true;
|
||||
}
|
||||
|
||||
stock invarray(a[],size)
|
||||
{
|
||||
while (size--)
|
||||
|
|
@ -160,6 +161,7 @@ public arraytest2()
|
|||
new Array:a = ArrayCreate(40);
|
||||
new buff[40];
|
||||
new buffb[40];
|
||||
|
||||
for (new i = 0; i < 1000; i++)
|
||||
{
|
||||
arrayset(buff, i, sizeof(buff));
|
||||
|
|
@ -169,18 +171,14 @@ public arraytest2()
|
|||
for (new i = 0; i < 1000; i++)
|
||||
{
|
||||
arrayset(buff, i, sizeof(buff));
|
||||
|
||||
ArrayGetArray(a, i, buffb);
|
||||
|
||||
test(_:checkarray(buff, buffb, sizeof(buff)), 1);
|
||||
|
||||
// Now overwrite the array with inversed value
|
||||
invarray(buff, sizeof(buff));
|
||||
|
||||
ArraySetArray(a, i, buff);
|
||||
|
||||
ArrayGetArray(a, i, buffb);
|
||||
|
||||
test(_:checkarray(buff, buffb, sizeof(buff)), 1);
|
||||
}
|
||||
|
||||
|
|
@ -188,12 +186,12 @@ public arraytest2()
|
|||
|
||||
showres();
|
||||
}
|
||||
|
||||
public arraytest3()
|
||||
{
|
||||
server_print("Testing 1000 iterations of strings...");
|
||||
|
||||
// The string is 10 long, the string we're trying to pass is 20 long.
|
||||
|
||||
new Array:a = ArrayCreate(10);
|
||||
|
||||
new buff[20] = "1234567890abcdefghi";
|
||||
|
|
@ -203,22 +201,18 @@ public arraytest3()
|
|||
{
|
||||
ArrayPushString(a, buff);
|
||||
}
|
||||
|
||||
for (new i = 0; i < 1000; i++)
|
||||
{
|
||||
ArrayGetString(a, i, buffb, sizeof(buffb)-1);
|
||||
|
||||
ArrayGetString(a, i, buffb, charsmax(buffb));
|
||||
test(strcmp(buffb,"123456789"),0);
|
||||
|
||||
ArraySetString(a, i, "9876543210");
|
||||
|
||||
ArrayGetString(a, i, buffb, sizeof(buffb)-1);
|
||||
|
||||
ArrayGetString(a, i, buffb, charsmax(buffb));
|
||||
test(strcmp(buffb,"987654321"),0);
|
||||
|
||||
buffb[0]=0;
|
||||
|
||||
formatex(buffb,sizeof(buffb)-1,"%a", ArrayGetStringHandle(a, i));
|
||||
|
||||
buffb[0] = EOS;
|
||||
formatex(buffb, charsmax(buffb),"%a", ArrayGetStringHandle(a, i));
|
||||
test(strcmp(buffb, "987654321"),0);
|
||||
}
|
||||
|
||||
|
|
@ -232,10 +226,12 @@ public sortcallback(Array:a, b, c)
|
|||
static stra[40];
|
||||
static strb[40];
|
||||
|
||||
ArrayGetString(a, b, stra, sizeof(stra)-1);
|
||||
ArrayGetString(a, c, strb, sizeof(strb)-1);
|
||||
ArrayGetString(a, b, stra, charsmax(stra));
|
||||
ArrayGetString(a, c, strb, charsmax(strb));
|
||||
|
||||
return strcmp(stra,strb);
|
||||
}
|
||||
|
||||
public arraytest4()
|
||||
{
|
||||
server_print("Testing sorting function...");
|
||||
|
|
@ -272,42 +268,38 @@ public arraytest4()
|
|||
new OldSize = ArraySize(a);
|
||||
|
||||
ArraySort(a, "sortcallback");
|
||||
|
||||
test(ArraySize(a), OldSize);
|
||||
|
||||
new buff[40];
|
||||
|
||||
ArrayGetString(a,0,buff,sizeof(buff)-1);
|
||||
|
||||
ArrayGetString(a, 0, buff, charsmax(buff));
|
||||
test(strcmp(buff,"abcdefghijklmnopqrstuvwxyz"),0);
|
||||
|
||||
ArrayGetString(a,25,buff,sizeof(buff)-1);
|
||||
|
||||
ArrayGetString(a, 25, buff, charsmax(buff));
|
||||
test(strcmp(buff, "z"), 0);
|
||||
|
||||
|
||||
new start = 'a';
|
||||
|
||||
for (new i = 0; i < OldSize; i++)
|
||||
{
|
||||
ArrayGetString(a,i,buff,sizeof(buff)-1)
|
||||
|
||||
ArrayGetString(a, i, buff, charsmax(buff));
|
||||
test(buff[0], start++);
|
||||
}
|
||||
|
||||
showres();
|
||||
}
|
||||
|
||||
public arraytest5()
|
||||
{
|
||||
server_print("Testing ArrayDeleteItem()...");
|
||||
new Array:a=ArrayCreate(1);
|
||||
|
||||
new Array:a = ArrayCreate(1);
|
||||
new v;
|
||||
|
||||
for (new i = 0; i < 1000; i++)
|
||||
{
|
||||
ArrayPushCell(a, i);
|
||||
}
|
||||
|
||||
for (new i = ArraySize(a) - 1; i >= 0; i--)
|
||||
{
|
||||
if (i % 2 == 0)
|
||||
|
|
@ -315,7 +307,9 @@ public arraytest5()
|
|||
ArrayDeleteItem(a, i);
|
||||
}
|
||||
}
|
||||
|
||||
test(ArraySize(a), 500);
|
||||
|
||||
for (new i = 0; i < 500; i++)
|
||||
{
|
||||
v = ArrayGetCell(a, i);
|
||||
|
|
@ -326,14 +320,17 @@ public arraytest5()
|
|||
// All remaining entries should be odd
|
||||
test((v & 1), 1);
|
||||
}
|
||||
|
||||
ArrayDestroy(a);
|
||||
|
||||
a = ArrayCreate(1);
|
||||
|
||||
// Repeat the same test, but check even numbers
|
||||
for (new i = 0; i < 1000; i++)
|
||||
{
|
||||
ArrayPushCell(a, i);
|
||||
}
|
||||
|
||||
for (new i = ArraySize(a) - 1; i >= 0 ; i--)
|
||||
{
|
||||
if (i % 2 == 1)
|
||||
|
|
@ -341,7 +338,9 @@ public arraytest5()
|
|||
ArrayDeleteItem(a, i);
|
||||
}
|
||||
}
|
||||
|
||||
test(ArraySize(a), 500);
|
||||
|
||||
for (new i = 0; i < 500; i++)
|
||||
{
|
||||
v = ArrayGetCell(a, i);
|
||||
|
|
@ -352,10 +351,12 @@ public arraytest5()
|
|||
// All remaining entries should be even
|
||||
test((v & 1), 0);
|
||||
}
|
||||
|
||||
ArrayDestroy(a);
|
||||
|
||||
showres();
|
||||
}
|
||||
|
||||
public arraytest6()
|
||||
{
|
||||
server_print("Testing ArrayInsertCellAfter()...");
|
||||
|
|
@ -366,6 +367,7 @@ public arraytest6()
|
|||
{
|
||||
ArrayPushCell(a, i);
|
||||
new item = ArraySize(a) - 1;
|
||||
|
||||
for (new j = 0; j < 10; j++)
|
||||
{
|
||||
ArrayInsertCellAfter(a, item + j, j);
|
||||
|
|
@ -378,8 +380,8 @@ public arraytest6()
|
|||
for (new i = 0; i < 110; i++)
|
||||
{
|
||||
v = ArrayGetCell(a, i);
|
||||
|
||||
test(v, i / 10);
|
||||
|
||||
for (new j = 0; j < 10; j++)
|
||||
{
|
||||
v = ArrayGetCell(a, ++i);
|
||||
|
|
@ -387,12 +389,51 @@ public arraytest6()
|
|||
}
|
||||
}
|
||||
|
||||
ArrayDestroy(a);
|
||||
|
||||
showres();
|
||||
}
|
||||
|
||||
public arraytest7()
|
||||
{
|
||||
server_print("Testing ArrayInsertStringAfter()...");
|
||||
|
||||
new Array:a = ArrayCreate(4);
|
||||
new buffer[4];
|
||||
|
||||
for (new i = 0; i < 10;i++)
|
||||
{
|
||||
formatex(buffer, charsmax(buffer), "%d", i);
|
||||
ArrayPushString(a, buffer);
|
||||
new item = ArraySize(a) - 1;
|
||||
|
||||
for (new j = 0; j < 10; j++)
|
||||
{
|
||||
formatex(buffer, charsmax(buffer), "%d", j);
|
||||
ArrayInsertStringAfter(a, item + j, buffer);
|
||||
}
|
||||
}
|
||||
|
||||
test(ArraySize(a), 110);
|
||||
|
||||
for (new i = 0; i < 110; i++)
|
||||
{
|
||||
ArrayGetString(a, i, buffer, charsmax(buffer));
|
||||
test(str_to_num(buffer), i / 10);
|
||||
|
||||
for (new j = 0; j < 10; j++)
|
||||
{
|
||||
ArrayGetString(a, ++i, buffer, charsmax(buffer));
|
||||
test(str_to_num(buffer), j);
|
||||
}
|
||||
}
|
||||
|
||||
ArrayDestroy(a);
|
||||
|
||||
showres();
|
||||
}
|
||||
public arraytest7()
|
||||
|
||||
public arraytest8()
|
||||
{
|
||||
server_print("Testing ArrayInsertCellBefore()...");
|
||||
|
||||
|
|
@ -400,8 +441,8 @@ public arraytest7()
|
|||
|
||||
for (new i = 0; i < 10; i++)
|
||||
{
|
||||
ArrayPushCell(a, i);
|
||||
new item=ArraySize(a)-1;
|
||||
new item = ArrayPushCell(a, i);
|
||||
|
||||
for (new j = 0; j < 10; j++)
|
||||
{
|
||||
ArrayInsertCellBefore(a, item, j);
|
||||
|
|
@ -410,38 +451,75 @@ public arraytest7()
|
|||
|
||||
test(ArraySize(a), 110);
|
||||
|
||||
new v;
|
||||
for (new i = 0; i < 110; i++)
|
||||
{
|
||||
for (new j = 9; j >= 0; j--)
|
||||
{
|
||||
v=ArrayGetCell(a, i++);
|
||||
test(v, j);
|
||||
test(ArrayGetCell(a, i++), j);
|
||||
}
|
||||
|
||||
v=ArrayGetCell(a, i);
|
||||
|
||||
test(v, (i - 10) / 10);
|
||||
test(ArrayGetCell(a, i), (i - 10) / 10);
|
||||
}
|
||||
|
||||
|
||||
ArrayDestroy(a);
|
||||
|
||||
showres();
|
||||
}
|
||||
public arraytest8()
|
||||
|
||||
public arraytest9()
|
||||
{
|
||||
server_print("Testing ArrayInsertStringBefore()...");
|
||||
|
||||
new buffer[4];
|
||||
new Array:a = ArrayCreate(4);
|
||||
|
||||
for (new i = 0; i < 10; i++)
|
||||
{
|
||||
formatex(buffer, charsmax(buffer), "%d", i);
|
||||
new item = ArrayPushString(a, buffer);
|
||||
|
||||
for (new j = 0; j < 10; j++)
|
||||
{
|
||||
formatex(buffer, charsmax(buffer), "%d", j);
|
||||
ArrayInsertStringBefore(a, item, buffer);
|
||||
}
|
||||
}
|
||||
|
||||
test(ArraySize(a), 110);
|
||||
|
||||
for (new i = 0; i < 110; i++)
|
||||
{
|
||||
for (new j = 9; j >= 0; j--)
|
||||
{
|
||||
ArrayGetString(a, i++, buffer, charsmax(buffer));
|
||||
test(str_to_num(buffer), j);
|
||||
}
|
||||
|
||||
ArrayGetString(a, i, buffer, charsmax(buffer));
|
||||
test(str_to_num(buffer), (i - 10) / 10);
|
||||
}
|
||||
|
||||
ArrayDestroy(a);
|
||||
|
||||
showres();
|
||||
}
|
||||
|
||||
public arraytest10()
|
||||
{
|
||||
server_print("Testing ArraySwap()...");
|
||||
|
||||
new Array:a = ArrayCreate(1);
|
||||
|
||||
for (new i = 0; i < 10; i++)
|
||||
{
|
||||
ArrayPushCell(a, i);
|
||||
}
|
||||
|
||||
for (new i = 0; i < 5; i++)
|
||||
{
|
||||
ArraySwap(a, i, (10 - (i + 1)));
|
||||
}
|
||||
|
||||
new v;
|
||||
for (new i = 0; i < 5; i++)
|
||||
{
|
||||
|
|
@ -455,11 +533,12 @@ public arraytest8()
|
|||
showres();
|
||||
}
|
||||
|
||||
public sortcallbackex_string(Array:a, const b[], const c[], d)
|
||||
public Sortcallbackex_string(Array:a, const b[], const c[], d)
|
||||
{
|
||||
return strcmp(b, c);
|
||||
}
|
||||
public arraytest9()
|
||||
|
||||
public arraytest11()
|
||||
{
|
||||
server_print("Testing (new) sorting function with string...");
|
||||
|
||||
|
|
@ -494,27 +573,21 @@ public arraytest9()
|
|||
|
||||
new OldSize = ArraySize(a);
|
||||
|
||||
ArraySortEx(a, "sortcallbackex_string");
|
||||
|
||||
ArraySortEx(a, "Sortcallbackex_string");
|
||||
test(ArraySize(a), OldSize);
|
||||
|
||||
new buff[40];
|
||||
|
||||
ArrayGetString(a,0,buff,sizeof(buff)-1);
|
||||
|
||||
ArrayGetString(a, 0, buff, charsmax(buff));
|
||||
test(strcmp(buff, "abcdefghijklmnopqrstuvwxyz"), 0);
|
||||
|
||||
ArrayGetString(a,25,buff,sizeof(buff)-1);
|
||||
|
||||
ArrayGetString(a, 25, buff, charsmax(buff));
|
||||
test(strcmp(buff, "z"),0);
|
||||
|
||||
|
||||
new start = 'a';
|
||||
|
||||
for (new i = 0; i < OldSize; i++)
|
||||
{
|
||||
ArrayGetString(a,i,buff,sizeof(buff)-1)
|
||||
|
||||
ArrayGetString(a, i, buff, charsmax(buff))
|
||||
test(buff[0], start++);
|
||||
}
|
||||
|
||||
|
|
@ -523,11 +596,13 @@ public arraytest9()
|
|||
showres();
|
||||
}
|
||||
|
||||
public sortcallbackex_int(Array:a, const b, const c, d)
|
||||
|
||||
public Sortcallbackex_int(Array:a, const b, const c, d)
|
||||
{
|
||||
return b < c ? -1 : 1;
|
||||
}
|
||||
public arraytest10()
|
||||
|
||||
public arraytest12()
|
||||
{
|
||||
server_print("Testing (new) sorting function with integer...");
|
||||
|
||||
|
|
@ -546,7 +621,7 @@ public arraytest10()
|
|||
|
||||
new OldSize = ArraySize(a);
|
||||
|
||||
ArraySortEx(a, "sortcallbackex_int");
|
||||
ArraySortEx(a, "Sortcallbackex_int");
|
||||
|
||||
test(ArraySize(a), OldSize);
|
||||
test(ArrayGetCell(a, 0), 1);
|
||||
|
|
@ -562,7 +637,7 @@ public arraytest10()
|
|||
showres();
|
||||
}
|
||||
|
||||
public arraytest11()
|
||||
public arraytest13()
|
||||
{
|
||||
server_print("Testing cloning function...");
|
||||
|
||||
|
|
@ -595,7 +670,7 @@ public arraytest11()
|
|||
showres();
|
||||
}
|
||||
|
||||
public arraytest12()
|
||||
public arraytest14()
|
||||
{
|
||||
server_print("Testing resizing function...");
|
||||
|
||||
|
|
@ -619,7 +694,7 @@ public arraytest12()
|
|||
showres();
|
||||
}
|
||||
|
||||
public arraytest13()
|
||||
public arraytest15()
|
||||
{
|
||||
server_print("Testing finding string in array...");
|
||||
|
||||
|
|
@ -645,7 +720,7 @@ public arraytest13()
|
|||
showres();
|
||||
}
|
||||
|
||||
public arraytest14()
|
||||
public arraytest16()
|
||||
{
|
||||
server_print("Testing finding value in array...");
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user