libAthena/athena
2
0
Fork 0
mirror of https://github.com/libAthena/athena.git synced 2025-12-09 21:47:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reimplement Exceptions.

Browse Source
This commit is contained in:
Phillip Stephens
2015-05-18 16:28:17 -07:00
parent 20e12b86ca
commit 423a9a37d2
18 changed files with 239 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/Athena/FileReader.cpp
View File

@@ -103,7 +103,7 @@ void FileReader::seek(atInt64 pos, SeekOrigin origin)
bool FileReader::atEnd() const
{
if (!isOpen())
THROW_INVALID_OPERATION_EXCEPTION("File not open");
THROW_INVALID_OPERATION_EXCEPTION_RETURN(true, "File not open");
return feof(m_fileHandle) != 0;
}
@@ -111,7 +111,7 @@ bool FileReader::atEnd() const
atUint64 FileReader::position() const
{
if (!isOpen())
THROW_INVALID_OPERATION_EXCEPTION("File not open");
THROW_INVALID_OPERATION_EXCEPTION_RETURN(0, "File not open");
return ftello64(m_fileHandle);
}
@@ -119,7 +119,7 @@ atUint64 FileReader::position() const
atUint64 FileReader::length() const
{
if (!isOpen())
THROW_INVALID_OPERATION_EXCEPTION("File not open");
THROW_INVALID_OPERATION_EXCEPTION_RETURN(0, "File not open");
return utility::fileSize(m_filename);
}
@@ -138,13 +138,13 @@ void FileReader::seekBit(int bit)
bool FileReader::readBit()
{
if (!isOpen())
THROW_INVALID_OPERATION_EXCEPTION("File is not open for reading");
THROW_INVALID_OPERATION_EXCEPTION_RETURN(false, "File is not open for reading");
if (!m_bitValid)
{
size_t size = fread(&m_currentByte, 1, 1, m_fileHandle);
if (size != sizeof(atUint8))
THROW_IO_EXCEPTION("Error reading from file.");
THROW_IO_EXCEPTION_RETURN(false, "Error reading from file.");
m_bitShift = 0;
m_bitValid = true;
@@ -161,7 +161,7 @@ bool FileReader::readBit()
atUint8 FileReader::readUByte()
{
if (!isOpen())
THROW_INVALID_OPERATION_EXCEPTION("File not open for reading");
THROW_INVALID_OPERATION_EXCEPTION_RETURN(0, "File not open for reading");
m_bitValid = false;
atUint8 val = 0;
@@ -172,14 +172,14 @@ atUint8 FileReader::readUByte()
atInt8 FileReader::readByte()
{
if (!isOpen())
THROW_INVALID_OPERATION_EXCEPTION("File not open for reading");
THROW_INVALID_OPERATION_EXCEPTION_RETURN(0, "File not open for reading");
return (atInt8)readUByte();
}
atUint8* FileReader::readUBytes(atUint64 len)
{
if (!isOpen())
THROW_INVALID_OPERATION_EXCEPTION("File not open for reading");
THROW_INVALID_OPERATION_EXCEPTION_RETURN(nullptr, "File not open for reading");
m_bitValid = false;
atUint8* val = new atUint8[len];
fread(val, 1, len, m_fileHandle);
@@ -189,7 +189,7 @@ atUint8* FileReader::readUBytes(atUint64 len)
atUint64 FileReader::readUBytesToBuf(void* buf, atUint64 len)
{
if (!isOpen())
THROW_INVALID_OPERATION_EXCEPTION("File not open for reading");
THROW_INVALID_OPERATION_EXCEPTION_RETURN(0, "File not open for reading");
m_bitValid = false;
return fread(buf, 1, len, m_fileHandle);
}
@@ -197,14 +197,14 @@ atUint64 FileReader::readUBytesToBuf(void* buf, atUint64 len)
atInt8* FileReader::readBytes(atUint64 len)
{
if (!isOpen())
THROW_INVALID_OPERATION_EXCEPTION("File not open for reading");
THROW_INVALID_OPERATION_EXCEPTION_RETURN(nullptr, "File not open for reading");
return (atInt8*)readUBytes(len);
}
atUint16 FileReader::readUint16()
{
if (!isOpen())
THROW_INVALID_OPERATION_EXCEPTION("File not open for reading");
THROW_INVALID_OPERATION_EXCEPTION_RETURN(0, "File not open for reading");
m_bitValid = false;
atUint16 val;
@@ -219,7 +219,7 @@ atUint16 FileReader::readUint16()
atInt16 FileReader::readInt16()
{
if (!isOpen())
THROW_INVALID_OPERATION_EXCEPTION("File not open for reading");
THROW_INVALID_OPERATION_EXCEPTION_RETURN(0, "File not open for reading");
return (atInt16)readUint16();
}
@@ -227,7 +227,7 @@ atInt16 FileReader::readInt16()
atUint32 FileReader::readUint32()
{
if (!isOpen())
THROW_INVALID_OPERATION_EXCEPTION("File not open for reading");
THROW_INVALID_OPERATION_EXCEPTION_RETURN(0, "File not open for reading");
m_bitValid = false;
atUint32 val;
@@ -242,7 +242,7 @@ atUint32 FileReader::readUint32()
atInt32 FileReader::readInt32()
{
if (!isOpen())
THROW_INVALID_OPERATION_EXCEPTION("File not open for reading");
THROW_INVALID_OPERATION_EXCEPTION_RETURN(0, "File not open for reading");
return (atInt32)readUint32();
}
@@ -250,7 +250,7 @@ atInt32 FileReader::readInt32()
atUint64 FileReader::readUint64()
{
if (!isOpen())
THROW_INVALID_OPERATION_EXCEPTION("File not open for reading");
THROW_INVALID_OPERATION_EXCEPTION_RETURN(0, "File not open for reading");
m_bitValid = false;
atUint64 val;
@@ -265,7 +265,7 @@ atUint64 FileReader::readUint64()
atInt64 FileReader::readInt64()
{
if (!isOpen())
THROW_INVALID_OPERATION_EXCEPTION("File not open for reading");
THROW_INVALID_OPERATION_EXCEPTION_RETURN(0, "File not open for reading");
return (atInt64)readUint64();
}
@@ -273,7 +273,7 @@ atInt64 FileReader::readInt64()
double FileReader::readDouble()
{
if (!isOpen())
THROW_INVALID_OPERATION_EXCEPTION("File not open for reading");
THROW_INVALID_OPERATION_EXCEPTION_RETURN(0, "File not open for reading");
m_bitValid = false;
double val;
@@ -288,7 +288,7 @@ double FileReader::readDouble()
float FileReader::readFloat()
{
if (!isOpen())
THROW_INVALID_OPERATION_EXCEPTION("File not open for reading");
THROW_INVALID_OPERATION_EXCEPTION_RETURN(0, "File not open for reading");
m_bitValid = false;
float val;
@@ -303,7 +303,7 @@ float FileReader::readFloat()
bool FileReader::readBool()
{
if (!isOpen())
THROW_INVALID_OPERATION_EXCEPTION("File not open for reading");
THROW_INVALID_OPERATION_EXCEPTION_RETURN(false, "File not open for reading");
return (readByte() != 0);
}
@@ -330,7 +330,7 @@ std::string FileReader::readString(atInt32 maxlen)
std::string FileReader::readUnicode(atInt32 maxlen)
{
if (!isOpen())
THROW_INVALID_OPERATION_EXCEPTION("File not open for reading");
THROW_INVALID_OPERATION_EXCEPTION_RETURN(std::string(), "File not open for reading");
std::string ret;
std::vector<short> tmp;