From 386daea692688c7dd2bf021225c407ad4ded3133 Mon Sep 17 00:00:00 2001 From: Andreas Stöckel Date: Thu, 1 Jan 2015 15:09:24 +0100 Subject: Adapted Tokenizer to new Location types --- src/core/Tokenizer.cpp | 4 ++-- src/core/Tokenizer.hpp | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/core/Tokenizer.cpp b/src/core/Tokenizer.cpp index 0af5f5a..9d25608 100644 --- a/src/core/Tokenizer.cpp +++ b/src/core/Tokenizer.cpp @@ -81,8 +81,8 @@ bool Tokenizer::prepare() { std::stringstream buffer; char c; - uint32_t startColumn = input.getColumn(); - uint32_t startLine = input.getLine(); + int startColumn = input.getColumn(); + int startLine = input.getLine(); bool bufEmpty = true; while (input.peek(c)) { if (root.children.find(c) != root.children.end()) { diff --git a/src/core/Tokenizer.hpp b/src/core/Tokenizer.hpp index 33327cc..2b03e17 100644 --- a/src/core/Tokenizer.hpp +++ b/src/core/Tokenizer.hpp @@ -121,13 +121,13 @@ static const int TOKEN_TEXT = -2; struct Token { int tokenId; std::string content; - uint32_t startColumn; - uint32_t startLine; - uint32_t endColumn; - uint32_t endLine; + int startColumn; + int startLine; + int endColumn; + int endLine; - Token(int tokenId, std::string content, uint32_t startColumn, uint32_t startLine, - uint32_t endColumn, uint32_t endLine) + Token(int tokenId, std::string content, int startColumn, int startLine, + int endColumn, int endLine) : tokenId(tokenId), content(content), startColumn(startColumn), -- cgit v1.2.3