botc: comparison src/main.cxx

-:11f23fabf8a6
+:03e4d9db3fd9
 *	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 __MAIN_CXX__
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "common.h"
+#include "main.h"
 #include "str.h"
 #include "scriptreader.h"
 #include "objwriter.h"
 #include "events.h"
 #include "commands.h"
 #include "stringtable.h"
 #include "variables.h"
-#include "array.h"
+#include "containers.h"
 #include "databuffer.h"
 #include "bots.h"
 #include "botcommands.h"
 // List of keywords
-const char* g_Keywords[] = {
+const string_list g_Keywords = {
 	"bool",
 	"break",
 	"case",
 	"continue",
 	"const",
 		printf ("Begin list of commands:\n");
 		printf ("------------------------------------------------------\n");
 		CommandDef* comm;
 		ITERATE_COMMANDS (comm)
-			printf ("%s\n", GetCommandPrototype (comm).chars());
+			print ("%1\n", GetCommandPrototype (comm));
 		printf ("------------------------------------------------------\n");
 		printf ("End of command list\n");
 		exit (0);
 	}
 	// Print header
-	str header;
+	string header;
-	str headerline = "-=";
+	string headerline;
-	header.appendformat ("%s version %d.%d", APPNAME, VERSION_MAJOR, VERSION_MINOR);
+	header = format ("%1 version %2.%3", APPNAME, VERSION_MAJOR, VERSION_MINOR);
-	headerline *= (header.len() / 2) - 1;
+	for (int i = 0; i < (header.len() / 2) - 1; ++i)
+		headerline += "-=";
 	headerline += '-';
-	printf ("%s\n%s\n", header.chars(), headerline.chars());
+	print ("%1\n%2\n", header, headerline);
 	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);
 	// 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));
-	str outfile;
+	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)) {
 		// Additional warning if the paths are the same
-		str warning;
+		string warning;
 #ifdef FILE_CASEINSENSITIVE
 		if (!outfile.icompare (argv[1]))
 #else
 		if (!outfile.compare (argv[1]))
 #endif
 	// Read definitions
 	printf ("Reading definitions...\n");
 	ReadEvents ();
 	ReadCommands ();
-	// Init stuff
-	InitStringTable ();
 	// Prepare reader and writer
 	ScriptReader* r = new ScriptReader (argv[1]);
 	ObjWriter* w = new ObjWriter (outfile);
 	// We're set, begin parsing :)
 	r->ParseBotScript (w);
 	printf ("Script parsed successfully.\n");
 	// Parse done, print statistics and write to file
 	unsigned int globalcount = g_GlobalVariables.size();
-	unsigned int stringcount = CountStringTable ();
+	unsigned int stringcount = num_strings_in_table ();
 	int NumMarks = w->MainBuffer->CountMarks ();
 	int NumRefs = w->MainBuffer->CountReferences ();
 	printf ("%u / %u strings written\n", stringcount, MAX_LIST_STRINGS);
 	printf ("%u / %u global variables\n", globalcount, MAX_SCRIPT_VARIABLES);
 	printf ("%d / %d bytecode marks\n", NumMarks, MAX_MARKS);
 // ============================================================================
 // Utility functions
 // ============================================================================
 // Does the given file exist?
-bool fexists (char* path) {
+bool fexists (string path) {
 	if (FILE* test = fopen (path, "r")) {
 		fclose (test);
 		return true;
 	}
 	return false;
 }
 // ============================================================================
 // Generic error
 void error (const char* text, ...) {
-	PERFORM_FORMAT (text, c);
+	va_list va;
-	fprintf (stderr, "error: %s", c);
+	va_start (va, text);
+	fprintf (stderr, "error: ");
+	vfprintf (stderr, text, va);
+	va_end (va);
 	exit (1);
 }
 // ============================================================================
 // Mutates given filename to an object filename
-char* ObjectFileName (str s) {
+string ObjectFileName (string s) {
 	// Locate the extension and chop it out
-	unsigned int extdot = s.last (".");
+	int extdot = s.last (".");
-	if (extdot >= s.len()-4)
+	if (extdot >= s.len() - 4)
 		s -= (s.len() - extdot);
 	s += ".o";
-	return s.chars();
+	return s;
 }
 // ============================================================================
 // Is the given argument a reserved keyword?
-bool IsKeyword (str s) {
+bool IsKeyword (string s) {
 	for (unsigned int u = 0; u < NumKeywords (); u++)
-		if (!s.icompare (g_Keywords[u]))
+		if (s.to_uppercase() == g_Keywords[u].to_uppercase())
 			return true;
 	return false;
 }
 unsigned int NumKeywords () {
 	return sizeof (g_Keywords) / sizeof (const char*);
 }
 // ============================================================================
-type_e GetTypeByName (str t) {
+type_e GetTypeByName (string t) {
-	t = t.tolower();
+	t = t.to_lowercase();
 	return	(t == "int") ? TYPE_INT :
 			(t == "str") ? TYPE_STRING :
 			(t == "void") ? TYPE_VOID :
 			(t == "bool") ? TYPE_BOOL :
 			TYPE_UNKNOWN;
 }
 // ============================================================================
 // Inverse operation - type name by value
-str GetTypeName (type_e type) {
+string GetTypeName (type_e 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;

Mercurial > botc / file comparison

comparison: src/main.cxx

src/main.cxx