Mercurial > botc / changeset

--- a/.gitignore	Wed Feb 12 06:15:11 2014 +0200
+++ b/.gitignore	Wed Feb 12 06:33:16 2014 +0200
@@ -1,5 +1,6 @@
 build
 GitInformation.h
+EnumStrings.h
 untracked
 botc.kdev4
 .kdev4
\ No newline at end of file

--- a/CMakeLists.txt	Wed Feb 12 06:15:11 2014 +0200
+++ b/CMakeLists.txt	Wed Feb 12 06:33:16 2014 +0200
@@ -1,7 +1,26 @@
 cmake_minimum_required (VERSION 2.8)
 
-add_subdirectory (updaterevision)
-add_executable (botc
+set (BOTC_HEADERS
+	src/BotStuff.h
+	src/Commands.h
+	src/Containers.h
+	src/DataBuffer.h
+	src/Events.h
+	src/Expression.h
+	src/Format.h
+	src/Lexer.h
+	src/LexerScanner.h
+	src/Macros.h
+	src/Main.h
+	src/Parser.h
+	src/Property.h
+	src/String.h
+	src/StringTable.h
+	src/Tokens.h
+	src/Types.h
+)
+
+set (BOTC_SOURCES
 	src/Commands.cc
 	src/DataBuffer.cc
 	src/Events.cc
@@ -15,6 +34,9 @@
 	src/StringTable.cc
 )
 
+add_subdirectory (updaterevision)
+add_subdirectory (namedenums)
+
 get_target_property (UPDATEREVISION_EXE updaterevision LOCATION)
 
 add_custom_target (revision_check ALL
@@ -22,6 +44,15 @@
     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
     DEPENDS updaterevision)
 
+get_target_property (NAMEDENUMS_EXE namedenums LOCATION)
+
+add_custom_target (botc_enum_strings ALL
+    COMMAND ${NAMEDENUMS_EXE} ${BOTC_HEADERS} src/EnumStrings.h
+    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+    DEPENDS namedenums)
+
+add_executable (botc ${BOTC_SOURCES})
+add_dependencies(botc revision_check botc_enum_strings)
 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -W -Wall")
 
 if ("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/namedenums/CMakeLists.txt	Wed Feb 12 06:33:16 2014 +0200
@@ -0,0 +1,3 @@
+cmake_minimum_required (VERSION 2.4)
+add_executable (namedenums NamedEnumerations.cc)
+set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -W -Wall")

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/namedenums/NamedEnumerations.cc	Wed Feb 12 06:33:16 2014 +0200
@@ -0,0 +1,251 @@
+/*
+	Copyright 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:
+
+	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. The name of the author may not be used to endorse or promote products
+	   derived from this software without specific prior written permission.
+
+	THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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 <string>
+#include <deque>
+#include <algorithm>
+#include <cerrno>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <cstdarg>
+
+using std::string;
+using std::deque;
+
+static int gLineNumber;
+static std::string gCurrentFile;
+
+// =============================================================================
+//
+struct NamedEnumInfo
+{
+	string			name;
+	deque<string>	enumerators;
+};
+
+// =============================================================================
+//
+void SkipWhitespace (char*& cp)
+{
+	while (isspace (*cp))
+	{
+		if (*cp == '\n')
+			gLineNumber++;
+
+		++cp;
+	}
+
+	if (strncmp (cp, "//", 2) == 0)
+	{
+		while (*(++cp) != '\n')
+			;
+
+		gLineNumber++;
+		SkipWhitespace (cp);
+	}
+}
+
+// =============================================================================
+//
+void Error (const char* fmt, ...)
+{
+	char buf[1024];
+	va_list va;
+	va_start (va, fmt);
+	vsprintf (buf, fmt, va);
+	va_end (va);
+	throw std::string (buf);
+}
+
+// =============================================================================
+//
+int main (int argc, char* argv[])
+{
+	try
+	{
+		deque<NamedEnumInfo>	namedEnumerations;
+		deque<string>			filesToInclude;
+
+		if (argc < 3)
+		{
+			fprintf (stderr, "usage: %s input [input [input [...]]] output\n", argv[0]);
+			return EXIT_FAILURE;
+		}
+
+		for (int i = 1; i < argc - 1; ++ i)
+		{
+			gCurrentFile = argv[i];
+			FILE* fp = fopen (argv[i], "r");
+			char* buf;
+			gLineNumber = 1;
+
+			if (fp == NULL)
+			{
+				fprintf (stderr, "could not open %s for writing: %s\n",
+					argv[i], strerror (errno));
+				exit (EXIT_FAILURE);
+			}
+
+			fseek (fp, 0, SEEK_END);
+			long int filesize = ftell (fp);
+			rewind (fp);
+
+			try
+			{
+				buf = new char[filesize];
+			}
+			catch (std::bad_alloc)
+			{
+				Error ("could not allocate %ld bytes for %s\n", filesize, argv[i]);
+			}
+
+			if (static_cast<long> (fread (buf, 1, filesize, fp)) < filesize)
+				Error ("could not read %ld bytes from %s\n", filesize, argv[i]);
+
+			char* const end = &buf[0] + filesize;
+
+			for (char* cp = &buf[0]; cp < end; ++cp)
+			{
+				SkipWhitespace (cp);
+
+				if (strncmp (cp, "#define ", strlen ("#define ")) == 0)
+				{
+					while (cp < end && *cp != '\n')
+						cp++;
+
+					continue;
+				}
+
+				if ((cp != &buf[0] && isspace (* (cp - 1)) == false) ||
+					strncmp (cp, "named_enum ", strlen ("named_enum ")) != 0)
+				{
+					continue;
+				}
+
+				cp += strlen ("named_enum ");
+				SkipWhitespace (cp);
+
+				NamedEnumInfo nenum;
+				auto& enumname = nenum.name;
+				auto& enumerators = nenum.enumerators;
+
+				if (isalpha (*cp) == false && *cp != '_')
+					Error ("anonymous named_enum");
+
+				while (isalnum (*cp) || *cp == '_')
+					enumname += *cp++;
+
+				SkipWhitespace (cp);
+
+				if (*cp++ != '{')
+					Error ("expected '{' after named_enum");
+
+				for (;;)
+				{
+					SkipWhitespace (cp);
+
+					if (*cp == '}')
+					{
+						cp++;
+						break;
+					}
+
+					if (isalpha (*cp) == false && *cp != '_')
+						Error ("expected identifier, got '%c'", *cp);
+
+					std::string enumerator;
+
+					while (isalnum (*cp) || *cp == '_')
+						enumerator += *cp++;
+
+					SkipWhitespace (cp);
+
+					if (*cp == ',')
+						SkipWhitespace (++cp);
+
+					if (*cp == '=')
+						Error ("named enums must not have defined values");
+
+					enumerators.push_back (enumerator);
+				}
+
+				SkipWhitespace (cp);
+
+				if (*cp != ';')
+					Error ("expected ';'");
+
+				if (enumerators.size() > 0)
+				{
+					namedEnumerations.push_back (nenum);
+					filesToInclude.push_back (argv[i]);
+				}
+			}
+		}
+
+		FILE* fp;
+
+		if ((fp = fopen (argv[argc - 1], "w")) == NULL)
+			Error ("couldn't open %s for writing: %s", argv[argc - 1], strerror (errno));
+
+		fprintf (fp, "#pragma once\n");
+
+		std::sort (filesToInclude.begin(), filesToInclude.end());
+		auto pos = std::unique (filesToInclude.begin(), filesToInclude.end());
+		filesToInclude.resize (std::distance (filesToInclude.begin(), pos));
+
+		for (const string & a : filesToInclude)
+			fprintf (fp, "#include \"%s\"\n", basename (a.c_str()));
+
+		for (NamedEnumInfo & e : namedEnumerations)
+		{
+			fprintf (fp, "\nstatic const char* g%sNames[] =\n{\n", e.name.c_str());
+
+			for (const string & a : e.enumerators)
+				fprintf (fp, "\t\"%s\",\n", a.c_str());
+
+			fprintf (fp, "};\n\n");
+
+			fprintf (fp, "inline const char* Get%sString( %s a )\n"
+				"{\n"
+				"\treturn g%sNames[a];\n"
+				"}\n",
+				e.name.c_str(), e.name.c_str(), e.name.c_str());
+		}
+
+		printf ("Wrote named enumerations to %s\n", argv[argc - 1]);
+		fclose (fp);
+	}
+	catch (std::string a)
+	{
+		fprintf (stderr, "%s:%d: error: %s\n", gCurrentFile.c_str(), gLineNumber, a.c_str());
+		return 1;
+	}
+
+	return 0;
+}

--- a/src/Main.cc	Wed Feb 12 06:15:11 2014 +0200
+++ b/src/Main.cc	Wed Feb 12 06:33:16 2014 +0200
@@ -34,6 +34,7 @@
 #include "Parser.h"
 #include "Lexer.h"
 #include "GitInformation.h"
+#include "EnumStrings.h"
 
 int main (int argc, char** argv)
 {

--- a/src/Types.h	Wed Feb 12 06:15:11 2014 +0200
+++ b/src/Types.h	Wed Feb 12 06:33:16 2014 +0200
@@ -40,7 +40,7 @@
 //
 named_enum DataType
 {
-	TYPE_Unknown = 0,
+	TYPE_Unknown,
 	TYPE_Void,
 	TYPE_Int,
 	TYPE_String,