summaryrefslogtreecommitdiff
path: root/src/parse/parseerror.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/parse/parseerror.cpp')
-rw-r--r--src/parse/parseerror.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/parse/parseerror.cpp b/src/parse/parseerror.cpp
index 3c5d41fe..1bb30985 100644
--- a/src/parse/parseerror.cpp
+++ b/src/parse/parseerror.cpp
@@ -19,13 +19,13 @@ CompileError::Generic::Generic(::std::string message):
}
CompileError::Generic::Generic(const TokenStream& lex, ::std::string message)
{
- ::std::cout << lex.getPosition() << ": Generic(" << message << ")" << ::std::endl;
+ ::std::cout << lex.point_span() << ": Generic(" << message << ")" << ::std::endl;
}
CompileError::BugCheck::BugCheck(const TokenStream& lex, ::std::string message):
m_message(message)
{
- ::std::cout << lex.getPosition() << "BugCheck(" << message << ")" << ::std::endl;
+ ::std::cout << lex.point_span() << "BugCheck(" << message << ")" << ::std::endl;
}
CompileError::BugCheck::BugCheck(::std::string message):
m_message(message)
@@ -41,7 +41,7 @@ CompileError::Todo::Todo(::std::string message):
CompileError::Todo::Todo(const TokenStream& lex, ::std::string message):
m_message(message)
{
- ::std::cout << lex.getPosition() << ": Todo(" << message << ")" << ::std::endl;
+ ::std::cout << lex.point_span() << ": Todo(" << message << ")" << ::std::endl;
}
CompileError::Todo::~Todo() throw()
{
@@ -49,7 +49,7 @@ CompileError::Todo::~Todo() throw()
ParseError::BadChar::BadChar(const TokenStream& lex, char character)
{
- ::std::cout << lex.getPosition() << ": BadChar(" << character << ")" << ::std::endl;
+ ::std::cout << lex.point_span() << ": BadChar(" << character << ")" << ::std::endl;
}
ParseError::BadChar::~BadChar() throw()
{
@@ -58,24 +58,24 @@ ParseError::BadChar::~BadChar() throw()
ParseError::Unexpected::Unexpected(const TokenStream& lex, const Token& tok)//:
// m_tok( mv$(tok) )
{
- auto pos = tok.get_pos();
+ Span pos = tok.get_pos();
if(pos.filename == "")
- pos = lex.getPosition();
+ pos = lex.point_span();
::std::cout << pos << ": Unexpected(" << tok << ")" << ::std::endl;
}
ParseError::Unexpected::Unexpected(const TokenStream& lex, const Token& tok, Token exp)//:
// m_tok( mv$(tok) )
{
- auto pos = tok.get_pos();
+ Span pos = tok.get_pos();
if(pos.filename == "")
- pos = lex.getPosition();
+ pos = lex.point_span();
::std::cout << pos << ": Unexpected(" << tok << ", " << exp << ")" << ::std::endl;
}
ParseError::Unexpected::Unexpected(const TokenStream& lex, const Token& tok, ::std::vector<eTokenType> exp)
{
- auto pos = tok.get_pos();
+ Span pos = tok.get_pos();
if(pos.filename == "")
- pos = lex.getPosition();
+ pos = lex.point_span();
::std::cout << pos << ": Unexpected " << tok << ", expected ";
bool f = true;
for(auto v: exp) {