Reinserts original comments
This commit is contained in:
112 files changed
+7113
-5131
No files matched your search
@@ -1,5 +1,10 @@
|
||||
|
||||
|
||||
/**
|
||||
* Parses training_area_telegrams.h
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
* Created by Christian Ehrlicher, SLSE, 2016-04-14
|
||||
*/
|
||||
|
||||
#include "LogViewTetraTelegramsParser.hpp"
|
||||
#include <utility>
|
||||
@@ -67,7 +72,7 @@ static void fillBasemembers(StructInformation &si, const QHash<QString, StructIn
|
||||
return;
|
||||
StructInformation base = structs.value(si.baseStruct);
|
||||
fillBasemembers(base, structs);
|
||||
si.member = (base.member + si.member);
|
||||
si.member = (base.member + si.member); // base first
|
||||
}
|
||||
|
||||
bool LogViewTetraTelegramsParser::parse(const QString &filename)
|
||||
@@ -75,7 +80,7 @@ bool LogViewTetraTelegramsParser::parse(const QString &filename)
|
||||
m_telegramIdEnum = EnumInformation();
|
||||
m_enums.clear();
|
||||
m_structs.clear();
|
||||
|
||||
//m_pods.clear(); // only set once
|
||||
m_visibleTelegrams.clear();
|
||||
|
||||
QFile f(filename);
|
||||
@@ -174,7 +179,7 @@ int LogViewTetraTelegramsParser::parseStruct(const QVector<QStringView> &lines,
|
||||
continue;
|
||||
if (base.endsWith(QLatin1Char(',')))
|
||||
base.chop(1);
|
||||
if (base.endsWith(QLatin1Char('>')))
|
||||
if (base.endsWith(QLatin1Char('>'))) // helper template - ignore
|
||||
{
|
||||
si.isVisible = true;
|
||||
continue;
|
||||
@@ -287,8 +292,8 @@ int LogViewTetraTelegramsParser::parseEnum(const QVector<QStringView> &lines, in
|
||||
return -1;
|
||||
enumName = tokens.at(2);
|
||||
}
|
||||
if (enumName.endsWith(QLatin1Char(';')))
|
||||
return iStartPos;
|
||||
if (enumName.endsWith(QLatin1Char(';'))) // forward decl
|
||||
return iStartPos; // move to next line
|
||||
|
||||
EnumInformation ei;
|
||||
ei.type = enumName.toString();
|
||||
@@ -311,7 +316,7 @@ int LogViewTetraTelegramsParser::parseEnum(const QVector<QStringView> &lines, in
|
||||
{
|
||||
if (tokens.size() == 4 && tokens.at(0) == QLatin1String("}") && tokens.at(3).endsWith(QLatin1Char(';')) && si)
|
||||
{
|
||||
|
||||
// enum in struct with direct decl of member
|
||||
MemberInformation mi;
|
||||
if (ns.isEmpty())
|
||||
mi.type = ei.type;
|
||||
@@ -386,7 +391,7 @@ int LogViewTetraTelegramsParser::parseConstraint(const QVector<QStringView> &lin
|
||||
}
|
||||
if (tokens.at(0) == QLatin1String("};"))
|
||||
break;
|
||||
if (tokens.size() != 8 || tokens.at(2) != QLatin1String("TelegramId"))
|
||||
if (tokens.size() != 8 || tokens.at(2) != QLatin1String("TelegramId")) // static constexpr TelegramId id() { return TelegramId::INIT; }
|
||||
{
|
||||
++i;
|
||||
continue;
|
||||
@@ -477,7 +482,7 @@ QVector<QStringView> LogViewTetraTelegramsParser::tokenize(const QStringView &li
|
||||
const QStringView &token = ret.at(i);
|
||||
if (token.startsWith(QLatin1String("//")))
|
||||
{
|
||||
|
||||
// all comment after this - merge into one
|
||||
if (i == ret.size() - 1)
|
||||
break;
|
||||
const QStringView &lastToken = ret.last();
|
||||
@@ -535,4 +540,4 @@ bool LogViewTetraTelegramsParser::validStructTokens(const QVector<QStringView> &
|
||||
return false;
|
||||
}
|
||||
|
||||
}
|
||||
} // namespace N_LogView
|
||||
Reference in new issue
Block a user