Mercurial > botc / file diff

--- a/src/Main.cc	Sun Feb 09 15:13:02 2014 +0200
+++ b/src/Main.cc	Sun Feb 09 21:27:55 2014 +0200
@@ -30,7 +30,6 @@
 #include "Events.h"
 #include "Commands.h"
 #include "StringTable.h"
-#include "Variables.h"
 #include "DataBuffer.h"
 #include "Parser.h"
 #include "Lexer.h"
@@ -98,24 +97,21 @@
 		Print ("Script parsed successfully.\n");
 
 		// Parse done, print statistics and write to file
-		int globalcount = g_GlobalVariables.Size();
+		int globalcount = parser->GetScope (0).globalVariables.Size();
 		int stringcount = CountStringsInTable();
-		Print ("%1 / %2 strings written\n", stringcount, gMaxStringlistSize);
-		Print ("%1 / %2 global variables\n", globalcount, gMaxGlobalVars);
+		Print ("%1 / %2 strings\n", stringcount, gMaxStringlistSize);
+		Print ("%1 / %2 global variable indices\n", globalcount, gMaxGlobalVars);
 		Print ("%1 / %2 events\n", parser->GetNumEvents(), gMaxEvents);
 		Print ("%1 state%s1\n", parser->GetNumStates());
 
 		parser->WriteToFile (outfile);
-
-		// Clear out the junk
 		delete parser;
-
-		// Done!
-		exit (0);
+		return 0;
 	}
 	catch (ScriptError& e)
 	{
 		PrintTo (stderr, "error: %1\n", e.what());
+		return 1;
 	}
 }