--- a/src/stringtable.cxx Fri Jan 10 16:11:49 2014 +0200
+++ b/src/stringtable.cxx Fri Jan 10 21:58:42 2014 +0200
@@ -1,104 +1,53 @@
-/*
- * 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.
- */
-
-#define __STRINGTABLE_CXX__
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include "common.h"
+#include "main.h"
#include "bots.h"
#include "stringtable.h"
+static string_list g_string_table;
+
// ============================================================================
-// Initializes the string table
-void InitStringTable() {
- // Zero out everything first.
- for (unsigned int a = 0; a < MAX_LIST_STRINGS; a++)
- for (unsigned int b = 0; b < MAX_STRING_LENGTH; b++)
- g_StringTable[a][b] = 0;
+//
+const string_list& get_string_table()
+{
+ return g_string_table;
}
// ============================================================================
// Potentially adds a string to the table and returns the index of it.
-unsigned int PushToStringTable (char* s) {
+//
+int get_string_table_index (const string& a)
+{
// Must not be too long.
- if (strlen (s) >= MAX_STRING_LENGTH)
- error ("string `%s` too long (%d characters max)\n", s, strlen (s));
-
- // Find a free slot in the table.
- unsigned int a;
- for (a = 0; a < MAX_LIST_STRINGS; a++) {
+ if (strlen (a) >= MAX_STRING_LENGTH)
+ error ("string `%s` too long (%d characters, max is %d)\n",
+ a.c_str(), a.length(), MAX_STRING_LENGTH);
+
+ // Find a free slot in the table.
+ int idx;
+
+ for (idx = 0; idx < g_string_table.size(); idx++)
+ {
// String is already in the table, thus return it.
- if (!strcmp (s, g_StringTable[a]))
- return a;
-
- // String is empty, thus it's free.
- if (!strlen (g_StringTable[a]))
- break;
+ if (g_string_table[idx] == a)
+ return idx;
}
-
- // no free slots!
- if (a == MAX_LIST_STRINGS)
- error ("too many strings defined!\n");
-
- // Determine the length
- size_t l1 = strlen (s);
- size_t l2 = MAX_LIST_STRINGS - 1;
- size_t len = (l1 < l2) ? l1 : l2;
-
+
+ // Check if the table is already full
+ if (g_string_table.size() == MAX_LIST_STRINGS - 1)
+ error ("too many strings!\n");
+
// Now, dump the string into the slot
- strncpy (g_StringTable[a], s, len);
- g_StringTable[a][len] = 0;
-
- return a;
+ g_string_table[idx] = a;
+
+ return idx;
}
// ============================================================================
// Counts the amount of strings in the table.
-unsigned int CountStringTable () {
- unsigned int count = 0;
- for (unsigned int a = 0; a < MAX_LIST_STRINGS; a++) {
- if (!strlen (g_StringTable[a]))
- break;
- else
- count++;
- }
- return count;
-}
\ No newline at end of file
+//
+int num_strings_in_table()
+{
+ return g_string_table.size();
+}