botc: comparison src/main.cxx

-:03e4d9db3fd9
+:1ee9b312dc18
 /*
-*	botc source code
+	Copyright (c) 2013-2014, Santeri Piippo
-*	Copyright (C) 2012 Santeri `Dusk` Piippo
+	All rights reserved.
-*	All rights reserved.
-*
+	Redistribution and use in source and binary forms, with or without
-*	Redistribution and use in source and binary forms, with or without
+	modification, are permitted provided that the following conditions are met:
-*	modification, are permitted provided that the following conditions are met:
-*
+		* Redistributions of source code must retain the above copyright
-*	1. Redistributions of source code must retain the above copyright notice,
+		  notice, this list of conditions and the following disclaimer.
-*	   this list of conditions and the following disclaimer.
-*	2. Redistributions in binary form must reproduce the above copyright notice,
+		* Redistributions in binary form must reproduce the above copyright
-*	   this list of conditions and the following disclaimer in the documentation
+		  notice, this list of conditions and the following disclaimer in the
-*	   and/or other materials provided with the distribution.
+		  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
+		* Neither the name of the <organization> nor the
-*	   specific prior written permission.
+		  names of its contributors may be used to endorse or promote products
-*	4. Redistributions in any form must be accompanied by information on how to
+		  derived from this software without specific prior written permission.
-*	   obtain complete source code for the software and any accompanying
-*	   software that uses the software. The source code must either be included
+	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-*	   in the distribution or be available for no more than the cost of
+	ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-*	   distribution plus a nominal fee, and must be freely redistributable
+	WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-*	   under reasonable conditions. For an executable file, complete source
+	DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
-*	   code means the source code for all modules it contains. It does not
+	DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-*	   include source code for modules or files that typically accompany the
+	(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-*	   major components of the operating system on which the executable file
+	LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-*	   runs.
+	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
-*	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+	SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*	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.
-*/
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 #include "main.h"
-#include "str.h"
 #include "scriptreader.h"
-#include "objwriter.h"
+#include "object_writer.h"
 #include "events.h"
 #include "commands.h"
 #include "stringtable.h"
 #include "variables.h"
 #include "containers.h"
-#include "databuffer.h"
+#include "data_buffer.h"
 #include "bots.h"
-#include "botcommands.h"
+#include "object_writer.h"
+#include "parser.h"
 // List of keywords
-const string_list g_Keywords = {
+const string_list g_Keywords =
+{
 	"bool",
 	"break",
 	"case",
 	"continue",
 	"const",
 	"state",
 	"switch",
 	"str"
 	"void",
 	"while",
 	// These ones aren't implemented yet but I plan to do so, thus they are
 	// reserved. Also serves as a to-do list of sorts for me. >:F
 	"enum", // Would enum actually be useful? I think so.
 	"func", // Would function support need external support from zandronum?
 	"return",
 };
 // databuffer global variable
 int g_NextMark = 0;
-int main (int argc, char** argv) {
+int main (int argc, char** argv)
+{
 	// Intepret command-line parameters:
 	// -l: list commands
 	// I guess there should be a better way to do this.
-	if (argc == 2 && !strcmp (argv[1], "-l")) {
+	if (argc == 2 && !strcmp (argv[1], "-l"))
-		ReadCommands ();
+	{
+		ReadCommands();
 		printf ("Begin list of commands:\n");
 		printf ("------------------------------------------------------\n");
 		CommandDef* comm;
 		ITERATE_COMMANDS (comm)
 			print ("%1\n", GetCommandPrototype (comm));
 		printf ("------------------------------------------------------\n");
 		printf ("End of command list\n");
 		exit (0);
 	}
 	// Print header
 	string header;
 	string headerline;
 	header = format ("%1 version %2.%3", APPNAME, VERSION_MAJOR, VERSION_MINOR);
 	for (int i = 0; i < (header.len() / 2) - 1; ++i)
 		headerline += "-=";
 	headerline += '-';
 	print ("%1\n%2\n", header, headerline);
-	if (argc < 2) {
+	if (argc < 2)
+	{
 		fprintf (stderr, "usage: %s <infile> [outfile] # compiles botscript\n", argv[0]);
 		fprintf (stderr, "       %s -l                 # lists commands\n", argv[0]);
 		exit (1);
 	}
-	// A word should always be exactly 4 bytes. The above list command
-	// doesn't need it, but the rest of the program does.
-	if (sizeof (word) != 4)
-		error ("%s expects a word (uint32_t) to be 4 bytes in size, is %d\n",
-			APPNAME, sizeof (word));
 	string outfile;
 	if (argc < 3)
 		outfile = ObjectFileName (argv[1]);
 	else
 		outfile = argv[2];
 	// If we'd end up writing into an existing file,
 	// ask the user if we want to overwrite it
-	if (fexists (outfile)) {
+	if (fexists (outfile))
+	{
 		// Additional warning if the paths are the same
 		string warning;
 #ifdef FILE_CASEINSENSITIVE
-		if (!outfile.icompare (argv[1]))
+		if (+outfile == +string (argv[1]))
 #else
-		if (!outfile.compare (argv[1]))
+		if (outfile == argv[1])
 #endif
 		{
 			warning = "\nWARNING: Output file is the same as the input file. ";
 			warning += "Answering yes here will destroy the source!\n";
 			warning += "Continue nevertheless?";
 		}
 		printf ("output file `%s` already exists! overwrite?%s (y/n) ", outfile.chars(), warning.chars());
 		char ans;
-		fgets (&ans, 2, stdin);
+		fgets (&ans, 1, stdin);
-		if (ans != 'y') {
+		if (ans != 'y')
+		{
 			printf ("abort\n");
 			exit (1);
 		}
 	}
 	// Read definitions
 	printf ("Reading definitions...\n");
-	ReadEvents ();
+	ReadEvents();
-	ReadCommands ();
+	ReadCommands();
 	// Prepare reader and writer
-	ScriptReader* r = new ScriptReader (argv[1]);
+	botscript_parser* r = new botscript_parser;
-	ObjWriter* w = new ObjWriter (outfile);
+	object_writer* w = new object_writer;
 	// We're set, begin parsing :)
 	printf ("Parsing script...\n");
-	r->ParseBotScript (w);
+	r->parse_botscript (argv[1], w);
 	printf ("Script parsed successfully.\n");
 	// Parse done, print statistics and write to file
-	unsigned int globalcount = g_GlobalVariables.size();
+	int globalcount = g_GlobalVariables.size();
-	unsigned int stringcount = num_strings_in_table ();
+	int stringcount = num_strings_in_table();
-	int NumMarks = w->MainBuffer->CountMarks ();
+	int NumMarks = w->MainBuffer->count_marks();
-	int NumRefs = w->MainBuffer->CountReferences ();
+	int NumRefs = w->MainBuffer->count_references();
-	printf ("%u / %u strings written\n", stringcount, MAX_LIST_STRINGS);
+	print ("%1 / %2 strings written\n", stringcount, MAX_LIST_STRINGS);
-	printf ("%u / %u global variables\n", globalcount, MAX_SCRIPT_VARIABLES);
+	print ("%1 / %2 global variables\n", globalcount, MAX_SCRIPT_VARIABLES);
-	printf ("%d / %d bytecode marks\n", NumMarks, MAX_MARKS);
+	print ("%1 / %2 bytecode marks\n", NumMarks, MAX_MARKS); // TODO: nuke
-	printf ("%d / %d bytecode references\n", NumRefs, MAX_MARKS);
+	print ("%1 / %2 bytecode references\n", NumRefs, MAX_MARKS); // TODO: nuke
-	printf ("%d / %d events\n", g_NumEvents, MAX_NUM_EVENTS);
+	print ("%1 / %2 events\n", g_NumEvents, MAX_NUM_EVENTS);
-	printf ("%d state%s\n", g_NumStates, PLURAL (g_NumStates));
+	print ("%1 state%s1\n", g_NumStates);
-	w->WriteToFile ();
+	w->write_to_file (outfile);
 	// Clear out the junk
 	delete r;
 	delete w;
 	// Done!
 	exit (0);
 }
 // ============================================================================
 // Utility functions
 // ============================================================================
 // Does the given file exist?
-bool fexists (string path) {
+bool fexists (string path)
-	if (FILE* test = fopen (path, "r")) {
+{
+	if (FILE* test = fopen (path, "r"))
+	{
 		fclose (test);
 		return true;
 	}
 	return false;
 }
 // ============================================================================
 // Generic error
-void error (const char* text, ...) {
+void error (const char* text, ...)
+{
 	va_list va;
 	va_start (va, text);
 	fprintf (stderr, "error: ");
 	vfprintf (stderr, text, va);
 	va_end (va);
 	exit (1);
 }
 // ============================================================================
 // Mutates given filename to an object filename
-string ObjectFileName (string s) {
+string ObjectFileName (string s)
+{
 	// Locate the extension and chop it out
 	int extdot = s.last (".");
 	if (extdot >= s.len() - 4)
 		s -= (s.len() - extdot);
 	s += ".o";
 	return s;
 }
 // ============================================================================
 // Is the given argument a reserved keyword?
-bool IsKeyword (string s) {
+bool IsKeyword (string s)
-	for (unsigned int u = 0; u < NumKeywords (); u++)
+{
+	for (int u = 0; u < NumKeywords(); u++)
 		if (s.to_uppercase() == g_Keywords[u].to_uppercase())
 			return true;
 	return false;
 }
-unsigned int NumKeywords () {
+int NumKeywords()
+{
 	return sizeof (g_Keywords) / sizeof (const char*);
 }
 // ============================================================================
-type_e GetTypeByName (string t) {
+type_e GetTypeByName (string t)
+{
 	t = t.to_lowercase();
 	return	(t == "int") ? TYPE_INT :
 			(t == "str") ? TYPE_STRING :
 			(t == "void") ? TYPE_VOID :
 			(t == "bool") ? TYPE_BOOL :
 }
 // ============================================================================
 // Inverse operation - type name by value
-string GetTypeName (type_e type) {
+string GetTypeName (type_e type)
-	switch (type) {
+{
+	switch (type)
+	{
 	case TYPE_INT: return "int"; break;
 	case TYPE_STRING: return "str"; break;
 	case TYPE_VOID: return "void"; break;
 	case TYPE_BOOL: return "bool"; break;
 	case TYPE_UNKNOWN: return "???"; break;
 	}
 	return "";
 }

Mercurial > botc / file comparison

comparison: src/main.cxx

src/main.cxx