Commit b9739aa3 authored by Oliver Bock's avatar Oliver Bock
Browse files

Remove trailing whitespaces

parent bf0e7ff3
......@@ -34,28 +34,28 @@ void ResourceCompiler::compile()
{
// parse input file (resource <-> file mapping)
parseInputFile();
// load the binary files (resource <-> data mapping)
loadBinaryData();
// temporary variables
ostringstream resourceIdentifierInitializer;
ostringstream resourceIndexInitializer;
ostringstream resourceStorageInitializer;
map<string, vector<unsigned char> >::iterator mapPos;
vector<unsigned char>::iterator dataPos;
unsigned int currentIndex = 0;
// store total amount of resources
resourceIndexInitializer << "{0x" << hex << m_ResourceDataMap.size() << ", 0x0},";
// iterate over all resource data mappings we have
for(mapPos = m_ResourceDataMap.begin(); mapPos != m_ResourceDataMap.end(); ++mapPos) {
// store identifier
resourceIdentifierInitializer << "\"" << mapPos->first << "\",";
// store data base index
resourceIndexInitializer << "{0x" << hex << currentIndex << ",";
resourceIndexInitializer << "0x" << hex << mapPos->second.size() << "},";
......@@ -67,32 +67,32 @@ void ResourceCompiler::compile()
resourceStorageInitializer << "0x" << hex << (int)*dataPos << ",";
}
}
// open the output code file
ofstream outputFile(m_ResourceCodeFile.c_str(), ios::out);
if(!outputFile) {
cerr << "Couldn't open output file \"" << m_ResourceCodeFile << "\"!" << endl,
cerr << "Couldn't open output file \"" << m_ResourceCodeFile << "\"!" << endl,
exit(1);
}
// let's get some exceptions
outputFile.exceptions(ios::failbit | ios::badbit);
try {
// write header
outputFile << "#include <string>" << endl << endl;
// write code file contents (remove trailing commas)
string output = resourceIdentifierInitializer.str();
outputFile << "extern const std::string c_ResourceIdentifiers[] = {" << endl;
outputFile << output.substr(0, output.length() - 1);
outputFile << endl << "};" << endl << endl;
output = resourceIndexInitializer.str();
outputFile << "extern const unsigned int c_ResourceIndex[][2] = {" << endl;
outputFile << "extern const unsigned int c_ResourceIndex[][2] = {" << endl;
outputFile << output.substr(0, output.length() - 1);
outputFile << endl << "};" << endl << endl;
output = resourceStorageInitializer.str();
outputFile << "extern const unsigned char c_ResourceStorage[] = {" << endl;
outputFile << output.substr(0, output.length() - 1);
......@@ -101,7 +101,7 @@ void ResourceCompiler::compile()
catch(const ios::failure& error) {
cerr << "Error during output file processing: " << error.what() << endl;
}
// clean up and clode file
outputFile.flush();
outputFile.close();
......@@ -115,23 +115,23 @@ void ResourceCompiler::parseInputFile()
cerr << "Couldn't open input file \"" << m_ResourceSpecFile << "\"!" << endl,
exit(1);
}
// let's get some exceptions
inputFile.exceptions(ios::failbit | ios::badbit);
try {
string line;
// read input file line by line
while(getline(inputFile, line)) {
unsigned int firstCharacter = line.find_first_not_of(" \t\r\n\f");
// we (sort of) allow for empty lines and comments
if(firstCharacter != string::npos && line.substr(firstCharacter, 1) != "#") {
if(firstCharacter != string::npos && line.substr(firstCharacter, 1) != "#") {
// find our token delimiter
unsigned int separator = line.find("|");
// make sure there's exactly one delimiter
if(separator == string::npos || separator != line.rfind("|")) {
cerr << "Unexpected resource specification: " << line << endl;
......@@ -147,9 +147,9 @@ void ResourceCompiler::parseInputFile()
// check stream state for real error
if(!inputFile.eof()) {
cerr << "Error during input file processing: " << error.what();
}
}
}
// close input file
inputFile.close();
}
......@@ -157,27 +157,27 @@ void ResourceCompiler::parseInputFile()
void ResourceCompiler::loadBinaryData()
{
map<string, string>::iterator pos;
// iterate over all resource file mappings we have
for(pos = m_ResourceFileMap.begin(); pos != m_ResourceFileMap.end(); ++pos) {
// open given resource file
ifstream binaryFile(pos->second.c_str(), ios::in | ios::binary);
if(!binaryFile) {
cerr << "Couldn't open binary file \"" << pos->second << "\"!" << endl,
exit(1);
}
// let's get some exceptions
binaryFile.exceptions(ios::failbit | ios::badbit);
try {
// store binary resource file using stream iterators
// copy( istream_iterator<unsigned char>(binaryFile),
// istream_iterator<unsigned char>(),
// back_inserter(m_ResourceDataMap[pos->first])
// );
// "copy" ends prematurely, so use the crude way instead
char c = 0;
while(binaryFile.get(c)) {
......@@ -188,7 +188,7 @@ void ResourceCompiler::loadBinaryData()
// check stream state for real error
if(!binaryFile.eof()) {
cerr << "Error during binary file processing: " << error.what();
}
}
}
// close current file
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment