summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorAndreas Stöckel <astoecke@techfak.uni-bielefeld.de>2015-01-01 15:09:24 +0100
committerAndreas Stöckel <andreas@somweyr.de>2015-01-01 15:09:24 +0100
commit386daea692688c7dd2bf021225c407ad4ded3133 (patch)
treeda5271be8ca559abdb5af158fd9b9f9908639631 /src/core
parent0d952e6cab7106ecf94a848f7261a3441ea2b241 (diff)
Adapted Tokenizer to new Location types
Diffstat (limited to 'src/core')
-rw-r--r--src/core/Tokenizer.cpp4
-rw-r--r--src/core/Tokenizer.hpp12
2 files changed, 8 insertions, 8 deletions
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),