#include "Tokenizer.h"
#include <istream>
-#include <stdexcept>
namespace loader {
void Tokenizer::Putback(const Token &t) {
if (isPutback) {
- throw std::runtime_error("Tokenizer: double putback not supported");
+ throw LexerError("Tokenizer: double putback not supported");
} else {
putback = t;
isPutback = true;
}
}
+const Tokenizer::Token &Tokenizer::Peek() {
+ if (!isPutback) {
+ putback = GetNext();
+ isPutback = true;
+ }
+ return putback;
+}
+
Tokenizer::Token Tokenizer::GetNext() {
if (isPutback) {
isPutback = false;
case Token::COMMA:
case Token::BRACKET_OPEN:
case Token::BRACKET_CLOSE:
- return (Token::Type) c;
+ case Token::PARENTHESIS_OPEN:
+ case Token::PARENTHESIS_CLOSE:
+ return Token ((Token::Type) c);
case '+': case '-':
case '0': case '1': case '2': case '3': case '4':
case '5': case '6': case '7': case '8': case '9':
} else if (std::islower(c)) {
CheckKeyword(t);
} else {
- throw std::runtime_error(std::string("Tokenizer: cannot parse token: ") + c);
+ throw LexerError(std::string("Tokenizer: cannot parse token: ") + c);
}
return t;
}
std::istream::char_type c;
in.get(c);
if (c != '"') {
- throw std::runtime_error("Tokenizer: strings must begin with '\"'");
+ throw LexerError("Tokenizer: strings must begin with '\"'");
}
while (in.get(c)) {