--- a/src/objwriter.h Fri Jan 10 16:11:49 2014 +0200
+++ b/src/objwriter.h Fri Jan 10 21:58:42 2014 +0200
@@ -1,50 +1,10 @@
-/*
- * botc source code
- * Copyright (C) 2012 Santeri `Dusk` Piippo
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * 3. Neither the name of the developer nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- * 4. Redistributions in any form must be accompanied by information on how to
- * obtain complete source code for the software and any accompanying
- * software that uses the software. The source code must either be included
- * in the distribution or be available for no more than the cost of
- * distribution plus a nominal fee, and must be freely redistributable
- * under reasonable conditions. For an executable file, complete source
- * code means the source code for all modules it contains. It does not
- * include source code for modules or files that typically accompany the
- * major components of the operating system on which the executable file
- * runs.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef __OBJWRITER_H__
-#define __OBJWRITER_H__
+#ifndef BOTC_OBJWRITER_H
+#define BOTC_OBJWRITER_H
#include <stdio.h>
#include <typeinfo>
#include <string.h>
-#include "common.h"
+#include "main.h"
#include "str.h"
#include "databuffer.h"
@@ -57,7 +17,7 @@
FILE* fp;
// Path to the file we're writing to
- str filepath;
+ string filepath;
// The main buffer - the contents of this is what we
// write to file after parsing is complete
@@ -83,33 +43,34 @@
// ====================================================================
// METHODS
- ObjWriter (str path);
+ ObjWriter (string path);
void WriteString (char* s);
void WriteString (const char* s);
- void WriteString (str s);
+ void WriteString (string s);
void WriteBuffer (DataBuffer* buf);
void WriteBuffers ();
void WriteStringTable ();
void WriteToFile ();
DataBuffer* GetCurrentBuffer ();
- unsigned int AddMark (str name);
- unsigned int FindMark (str name);
+ unsigned int AddMark (string name);
+ unsigned int FindMark (string name);
unsigned int AddReference (unsigned int mark);
void MoveMark (unsigned int mark);
void OffsetMark (unsigned int mark, int offset);
void DeleteMark (unsigned int mark);
- template <class T> void DoWrite (const char* func, T stuff) {
- GetCurrentBuffer ()->DoWrite (func, stuff);
+
+ template <class T> void Write (T stuff) {
+ GetCurrentBuffer ()->Write (stuff);
}
// Default to word
- void DoWrite (const char* func, word stuff) {
- DoWrite<word> (func, stuff);
+ void Write (word stuff) {
+ Write<word> (stuff);
}
- void DoWrite (const char* func, byte stuff) {
- DoWrite<byte> (func, stuff);
+ void DoWrite (byte stuff) {
+ Write<byte> (stuff);
}
private:
@@ -125,4 +86,4 @@
}
};
-#endif // __OBJWRITER_H__
\ No newline at end of file
+#endif // BOTC_OBJWRITER_H
\ No newline at end of file