X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Floader%2FTokenizer.h;h=b7ca72f664c148c1f92029a27cc132fbdb7682ce;hb=00dafa489224450ccc0321e238c176b9e8aa34bc;hp=15eadf8710e20b4d42ed550ad9b72f7697d3e2e7;hpb=996552758ec3bc748081b65b26b4a61bcd619324;p=l2e.git

diff --git a/src/loader/Tokenizer.h b/src/loader/Tokenizer.h
index 15eadf8..b7ca72f 100644
--- a/src/loader/Tokenizer.h
+++ b/src/loader/Tokenizer.h
@@ -10,6 +10,7 @@
 
 #include <iosfwd>
 #include <ostream>
+#include <stdexcept>
 #include <string>
 
 namespace loader {
@@ -27,7 +28,7 @@ public:
 	struct Token {
 
 		enum Type {
-			UNKNOWN,
+			UNKNOWN = 0,
 			ANGLE_BRACKET_OPEN = '{',
 			ANGLE_BRACKET_CLOSE = '}',
 			CHEVRON_OPEN = '<',
@@ -36,14 +37,16 @@ public:
 			COMMA = ',',
 			BRACKET_OPEN = '[',
 			BRACKET_CLOSE = ']',
-			NUMBER,
-			STRING,
-			KEYWORD_EXPORT,
-			KEYWORD_FALSE,
-			KEYWORD_INCLUDE,
-			KEYWORD_TRUE,
-			IDENTIFIER,
-			TYPE_NAME,
+			PARENTHESIS_OPEN = '(',
+			PARENTHESIS_CLOSE = ')',
+			NUMBER = '0',
+			STRING = '"',
+			KEYWORD_EXPORT = 'e',
+			KEYWORD_FALSE = 'f',
+			KEYWORD_INCLUDE = 'i',
+			KEYWORD_TRUE = 't',
+			IDENTIFIER = 'x',
+			TYPE_NAME = 'n',
 		};
 
 		Token() : type(UNKNOWN), number(0) { }
@@ -55,8 +58,14 @@ public:
 
 	};
 
+	class LexerError: public std::runtime_error {
+	public:
+		explicit LexerError(const std::string &msg) : std::runtime_error(msg) { }
+	};
+
 	bool HasMore();
 	Token GetNext();
+	const Token &Peek();
 	void Putback(const Token &);
 
 private:
@@ -93,6 +102,10 @@ inline const char *TokenTypeToString(Tokenizer::Token::Type t) {
 			return "BRACKET_OPEN";
 		case Tokenizer::Token::BRACKET_CLOSE:
 			return "BRACKET_CLOSE";
+		case Tokenizer::Token::PARENTHESIS_OPEN:
+			return "PARENTHESIS_OPEN";
+		case Tokenizer::Token::PARENTHESIS_CLOSE:
+			return "PARENTHESIS_CLOSE";
 		case Tokenizer::Token::NUMBER:
 			return "NUMBER";
 		case Tokenizer::Token::STRING: