added basic parser (not completely tested)

[l2e.git] / src / loader / Tokenizer.cpp

diff --git a/src/loader/Tokenizer.cpp b/src/loader/Tokenizer.cpp
index 828f6ed131afe44118e8b86aead5b2c2235284ea..cdabe01eed9b8a07c654a2cd068620b953e3f3f9 100644 (file)
--- a/src/loader/Tokenizer.cpp
+++ b/src/loader/Tokenizer.cpp
@@ -12,7 +12,7 @@
 namespace loader {
 
 bool Tokenizer::HasMore() {
-       return in;
+       return std::istream::sentry(in);
 }
 
 void Tokenizer::Putback(const Token &t) {
@@ -24,6 +24,14 @@ void Tokenizer::Putback(const Token &t) {
        }
 }
 
+const Tokenizer::Token &Tokenizer::Peek() {
+       if (!isPutback) {
+               putback = GetNext();
+               isPutback = true;
+       }
+       return putback;
+}
+
 Tokenizer::Token Tokenizer::GetNext() {
        if (isPutback) {
                isPutback = false;