Mercurial > botc / file diff

--- a/src/Types.h	Tue Feb 11 03:29:03 2014 +0200
+++ b/src/Types.h	Wed Feb 12 06:15:11 2014 +0200
@@ -31,39 +31,20 @@
 
 #include <cstdlib>
 #include <stdexcept>
+#include "Macros.h"
 #include "String.h"
 
 static const std::nullptr_t null = nullptr;
 
 // =============================================================================
 //
-// Byte datatype
-//
-typedef int32_t word;
-typedef unsigned char byte;
-
-// =============================================================================
-//
-// Parser mode: where is the parser at?
-//
-enum EParserMode
+named_enum DataType
 {
-	ETopLevelMode,		// at top level
-	EEventMode,			// inside event definition
-	EMainLoopMode,		// inside mainloop
-	EOnenterMode,		// inside onenter
-	EOnexitMode,		// inside onexit
-};
-
-// =============================================================================
-//
-enum EType
-{
-	EUnknownType = 0,
-	EVoidType,
-	EIntType,
-	EStringType,
-	EBoolType,
+	TYPE_Unknown = 0,
+	TYPE_Void,
+	TYPE_Int,
+	TYPE_String,
+	TYPE_Bool,
 };
 
 // =============================================================================
@@ -112,4 +93,4 @@
 using FILE = void;
 #endif
 
-#endif // BOTC_TYPES_H
\ No newline at end of file
+#endif // BOTC_TYPES_H