--- a/src/variables.cxx Fri Jan 10 21:58:42 2014 +0200
+++ b/src/variables.cxx Sat Jan 11 22:36:31 2014 +0200
@@ -1,42 +1,32 @@
/*
- * 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.
- */
+ Copyright (c) 2013-2014, Santeri 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:
+
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ * 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.
+
+ * Neither the name of the <organization> nor the
+ names of its contributors may be used to endorse or promote products
+ derived from this software without specific prior written permission.
+
+ 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 <COPYRIGHT HOLDER> 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.
+*/
#include <stdio.h>
#include <stdlib.h>
@@ -44,62 +34,66 @@
#include "main.h"
#include "containers.h"
#include "bots.h"
-#include "botcommands.h"
-#include "objwriter.h"
+#include "object_writer.h"
#include "stringtable.h"
#include "variables.h"
-#include "scriptreader.h"
+#include "parser.h"
-list<ScriptVar> g_GlobalVariables;
-list<ScriptVar> g_LocalVariables;
+list<script_variable> g_GlobalVariables;
+list<script_variable> g_LocalVariables;
// ============================================================================
// Tries to declare a new global-scope variable. Returns pointer
// to new global variable, null if declaration failed.
-ScriptVar* DeclareGlobalVariable (ScriptReader* r, type_e type, string name) {
+script_variable* DeclareGlobalVariable (botscript_parser* r, type_e type, string name)
+{
// Unfortunately the VM does not support string variables so yeah.
if (type == TYPE_STRING)
- r->ParserError ("variables cannot be string\n");
-
+ error ("variables cannot be string\n");
+
// Check that the variable is valid
if (FindCommand (name))
- r->ParserError ("name of variable-to-be `%s` conflicts with that of a command", name.chars());
-
+ error ("name of variable-to-be `%s` conflicts with that of a command", name.chars());
+
if (IsKeyword (name))
- r->ParserError ("name of variable-to-be `%s` is a keyword", name.chars());
-
+ error ("name of variable-to-be `%s` is a keyword", name.chars());
+
if (g_GlobalVariables.size() >= MAX_SCRIPT_VARIABLES)
- r->ParserError ("too many global variables!");
-
- for (uint i = 0; i < g_GlobalVariables.size(); i++)
+ error ("too many global variables!");
+
+ for (int i = 0; i < g_GlobalVariables.size(); i++)
if (g_GlobalVariables[i].name == name)
- r->ParserError ("attempted redeclaration of global variable `%s`", name.chars());
-
- ScriptVar g;
+ error ("attempted redeclaration of global variable `%s`", name.chars());
+
+ script_variable g;
g.index = g_GlobalVariables.size();
g.name = name;
g.statename = "";
g.value = 0;
g.type = type;
-
+
g_GlobalVariables << g;
return &g_GlobalVariables[g.index];
}
// ============================================================================
// Find a global variable by name
-ScriptVar* FindGlobalVariable (string name) {
- for (uint i = 0; i < g_GlobalVariables.size(); i++) {
- ScriptVar* g = &g_GlobalVariables[i];
+script_variable* FindGlobalVariable (string name)
+{
+ for (int i = 0; i < g_GlobalVariables.size(); i++)
+ {
+ script_variable* g = &g_GlobalVariables[i];
+
if (g->name == name)
return g;
}
-
+
return null;
}
// ============================================================================
// Count all declared global variables
-uint CountGlobalVars () {
+int CountGlobalVars ()
+{
return g_GlobalVariables.size();
-}
\ No newline at end of file
+}