X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=common%2Ftrace_dump.cpp;h=e6810b6afa63e209e156b096bb8a5197b2dc32ce;hb=d7c738e13decf8a8a891008c51b437ccbe3434fb;hp=2b8c27a3780b28f57bb4ddad5ba14aebac9cdc97;hpb=e7cb2b98575d5ff3801bd3527a648e0dbfdebdad;p=apitrace diff --git a/common/trace_dump.cpp b/common/trace_dump.cpp index 2b8c27a..e6810b6 100644 --- a/common/trace_dump.cpp +++ b/common/trace_dump.cpp @@ -170,14 +170,32 @@ public: } } - void visit(Struct *s) { - const char *sep = ""; - os << "{"; + const char * + visitMembers(Struct *s, const char *sep = "") { for (unsigned i = 0; i < s->members.size(); ++i) { - os << sep << italic << s->sig->member_names[i] << normal << " = "; - _visit(s->members[i]); + const char *memberName = s->sig->member_names[i]; + Value *memberValue = s->members[i]; + + if (!memberName || !*memberName) { + // Anonymous structure + Struct *memberStruct = dynamic_cast(memberValue); + assert(memberStruct); + if (memberStruct) { + sep = visitMembers(memberStruct, sep); + continue; + } + } + + os << sep << italic << memberName << normal << " = ", + _visit(memberValue); sep = ", "; } + return sep; + } + + void visit(Struct *s) { + os << "{"; + visitMembers(s); os << "}"; }