libAthena
/
athena
mirror of https://github.com/libAthena/athena.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

YAML fix for last fix

This commit is contained in:
Jack Andersen 2017-05-21 23:32:11 -04:00
parent 6a76fa90dc
commit c0441e7c7a
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
atdna/main.cpp
View File

@ -102,7 +102,6 @@ class ATDNAEmitVisitor : public clang::RecursiveASTVisitor<ATDNAEmitVisitor>
std::string m_fieldName; std::string m_fieldName;
std::string m_sizeExpr; std::string m_sizeExpr;
std::string m_ioOp; std::string m_ioOp;
bool m_isDNAType;
bool m_output = true; bool m_output = true;
YAMLFieldNode(Type tp) : m_type(tp) {} YAMLFieldNode(Type tp) : m_type(tp) {}
@ -125,17 +124,10 @@ class ATDNAEmitVisitor : public clang::RecursiveASTVisitor<ATDNAEmitVisitor>
out << " }\n"; out << " }\n";
break; break;
case Type::Value: case Type::Value:
if (m_isDNAType)
{
out << " " << m_fieldName << "." << m_ioOp << ";\n";
}
else
{
if (!p) if (!p)
out << " " << m_fieldName << " = " << m_ioOp << ";\n"; out << " " << m_fieldName << " = " << m_ioOp << ";\n";
else else
out << " " << m_ioOp << "\n"; out << " " << m_ioOp << "\n";
}
break; break;
case Type::VectorRefSize: case Type::VectorRefSize:
if (!p) if (!p)
@ -2041,12 +2033,21 @@ class ATDNAEmitVisitor : public clang::RecursiveASTVisitor<ATDNAEmitVisitor>
if (ioOp.empty()) if (ioOp.empty())
continue; continue;
if (isDNAType)
{
outputNodes.emplace_back(YAMLFieldNode::Type::Record);
YAMLFieldNode& outNode = outputNodes.back();
outNode.m_fieldName = fieldName;
outNode.m_fieldNameBare = fieldNameBare;
}
else
{
outputNodes.emplace_back(YAMLFieldNode::Type::Value); outputNodes.emplace_back(YAMLFieldNode::Type::Value);
YAMLFieldNode& outNode = outputNodes.back(); YAMLFieldNode& outNode = outputNodes.back();
outNode.m_fieldName = fieldName; outNode.m_fieldName = fieldName;
outNode.m_isDNAType = isDNAType;
outNode.m_ioOp = ioOp; outNode.m_ioOp = ioOp;
} }
}
else if (!tsDecl->getName().compare("Vector")) else if (!tsDecl->getName().compare("Vector"))
{ {
llvm::APSInt endian(64, -1); llvm::APSInt endian(64, -1);