OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

#1665 Add support for peeking at next char in command file

Browse Source
This commit is contained in:
Bjørnar Grip Fjær 2017-07-26 16:22:46 +02:00
parent df1eb2a962
commit 1a4e1135a2
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ApplicationCode/CommandFileInterface/Core/RicfMessages.cpp
View File

@ -25,7 +25,7 @@
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RicfMessages::addWarning(const QString& message) void RicfMessages::addWarning(const QString& message)
{ {
m_messages.push_back(std::make_pair(WARNING, "Line " + QString::number(m_currentLineNumber) +": " + message)); m_messages.push_back(std::make_pair(MESSAGE_WARNING, "Line " + QString::number(m_currentLineNumber) +": " + message));
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -33,7 +33,7 @@ void RicfMessages::addWarning(const QString& message)
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RicfMessages::addError(const QString& message) void RicfMessages::addError(const QString& message)
{ {
m_messages.push_back(std::make_pair(ERROR, "Line " + QString::number(m_currentLineNumber) +": " + message)); m_messages.push_back(std::make_pair(MESSAGE_ERROR, "Line " + QString::number(m_currentLineNumber) +": " + message));
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -65,3 +65,17 @@ QChar RicfMessages::readCharWithLineNumberCount(QTextStream& inputStream)
} }
return ch; return ch;
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QChar RicfMessages::peekNextChar(QTextStream& inputStream)
{
QChar ch;
if (!inputStream.atEnd())
{
inputStream >> ch;
inputStream.seek(inputStream.pos() - 1);
}
return ch;
}

5
ApplicationCode/CommandFileInterface/Core/RicfMessages.h
View File

@ -29,8 +29,8 @@ public:
enum MessageType enum MessageType
{ {
WARNING, MESSAGE_WARNING,
ERROR MESSAGE_ERROR
}; };
void addWarning(const QString& message); void addWarning(const QString& message);
@ -38,6 +38,7 @@ public:
void skipWhiteSpaceWithLineNumberCount(QTextStream& inputStream); void skipWhiteSpaceWithLineNumberCount(QTextStream& inputStream);
QChar readCharWithLineNumberCount(QTextStream& inputStream); QChar readCharWithLineNumberCount(QTextStream& inputStream);
QChar peekNextChar(QTextStream& inputStream);
QString currentCommand; QString currentCommand;
QString currentArgument; QString currentArgument;