--- a/src/scriptreader.h Fri Jan 10 16:11:49 2014 +0200
+++ b/src/scriptreader.h Fri Jan 10 21:58:42 2014 +0200
@@ -1,48 +1,8 @@
-/*
- * 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 __SCRIPTREADER_H__
-#define __SCRIPTREADER_H__
+#ifndef BOTC_SCRIPTREADER_H
+#define BOTC_SCRIPTREADER_H
#include <stdio.h>
-#include "str.h"
+#include "main.h"
#include "commands.h"
#include "objwriter.h"
@@ -129,9 +89,9 @@
// ============================================================================
typedef struct {
- str name;
+ string name;
type_e type;
- str val;
+ string val;
} constinfo_t;
// ============================================================================
@@ -142,7 +102,7 @@
// ====================================================================
// MEMBERS
FILE* fp[MAX_FILESTACK];
- char* filepath[MAX_FILESTACK];
+ string filepath[MAX_FILESTACK];
int fc;
unsigned int pos[MAX_FILESTACK];
@@ -150,23 +110,23 @@
unsigned int curchar[MAX_FILESTACK];
ScopeInfo scopestack[MAX_SCOPE];
long savedpos[MAX_FILESTACK]; // filepointer cursor position
- str token;
+ string token;
int commentmode;
long prevpos;
- str prevtoken;
+ string prevtoken;
// ====================================================================
// METHODS
// scriptreader.cxx:
- ScriptReader (str path);
+ ScriptReader (string path);
~ScriptReader ();
- void OpenFile (str path);
+ void OpenFile (string path);
void CloseFile (unsigned int u = MAX_FILESTACK);
char ReadChar ();
char PeekChar (int offset = 0);
bool Next (bool peek = false);
void Prev ();
- str PeekNext (int offset = 0);
+ string PeekNext (int offset = 0);
void Seek (unsigned int n, int origin);
void MustNext (const char* c = "");
void MustThis (const char* c);
@@ -185,7 +145,7 @@
DataBuffer* ParseAssignment (ScriptVar* var);
int ParseOperator (bool peek = false);
DataBuffer* ParseExprValue (type_e reqtype);
- str ParseFloat ();
+ string ParseFloat ();
void PushScope ();
// preprocessor.cxx:
@@ -197,15 +157,15 @@
private:
bool atnewline;
char c;
- void ParserMessage (const char* header, char* message);
+ void ParserMessage (const char* header, string message);
bool DoDirectivePreprocessing ();
char PPReadChar ();
void PPMustChar (char c);
- str PPReadWord (char &term);
+ string PPReadWord (char &term);
};
-constinfo_t* FindConstant (str token);
+constinfo_t* FindConstant (string token);
extern bool g_Neurosphere;
-#endif // __SCRIPTREADER_H__
\ No newline at end of file
+#endif // BOTC_SCRIPTREADER_H
\ No newline at end of file