[pdbdump] Use the "flow" style to print out a sequence of uint32_t.

[ruiu]

Summary

Lists can be written either with "-" or "[]" in YAML.

[zturner]

Yea, I wondered what that "flow" style was that I saw in comments. I guess now I know. There is another one called LLVM_YAML_IS_DOCUMENT_LIST_VECTOR. Do you know what this is?

[ruiu]

Looks like it is to write multiple YAML documents into a single file. http://llvm.org/docs/YamlIO.html#document-list

llvm/trunk/test/DebugInfo/PDB/pdbdump-yaml.test

 ; RUN: llvm-pdbdump pdb2yaml -stream-metadata -stream-directory -pdb-stream %p/Inputs/empty.pdb \
 ; RUN:   | FileCheck -check-prefix=YAML %s
 ; RUN: llvm-pdbdump pdb2yaml -no-file-headers -stream-metadata -stream-directory -pdb-stream \
 ; RUN:   %p/Inputs/empty.pdb | FileCheck -check-prefix=NO-HEADERS %s
 
 ; YAML:      ---
 ; YAML-NEXT: MSF:
 ; YAML-NEXT:   SuperBlock:
 ; YAML-NEXT:     BlockSize:       4096
 ; YAML-NEXT:     FreeBlockMap:     2
 ; YAML-NEXT:     NumBlocks:       25
 ; YAML-NEXT:     NumDirectoryBytes: 136
 ; YAML-NEXT:     Unknown1:        0
 ; YAML-NEXT:     BlockMapAddr:    24
 ; YAML-NEXT:   NumDirectoryBlocks: 1
-; YAML-NEXT:   DirectoryBlocks:
-; YAML-NEXT:     - 23
+; YAML-NEXT:   DirectoryBlocks: [ 23 ]
 ; YAML-NEXT:   NumStreams:      17
 ; YAML-NEXT:   FileSize:        102400
-; YAML-NEXT: StreamSizes:
-; YAML-NEXT:   - 40
-; YAML-NEXT:   - 118
-; YAML-NEXT:   - 5392
-; YAML-NEXT:   - 739
-; YAML-NEXT:   - 784
-; YAML-NEXT:   - 0
-; YAML-NEXT:   - 556
-; YAML-NEXT:   - 604
-; YAML-NEXT:   - 104
-; YAML-NEXT:   - 0
-; YAML-NEXT:   - 160
-; YAML-NEXT:   - 32
-; YAML-NEXT:   - 308
-; YAML-NEXT:   - 239
-; YAML-NEXT:   - 520
-; YAML-NEXT:   - 308
-; YAML-NEXT:   - 68
+; YAML-NEXT: StreamSizes: [ 40, 118, 5392, 739, 784, 0, 556, 604, 104, 0, 160, 32,
+; YAML-NEXT:                308, 239, 520, 308, 68 ]
 ; YAML-NEXT: StreamMap:
-; YAML-NEXT:   - Stream:
-; YAML-NEXT:       - 8
-; YAML-NEXT:   - Stream:
-; YAML-NEXT:       - 19
-; YAML-NEXT:   - Stream:
-; YAML-NEXT:       - 18
-; YAML-NEXT:       - 17
-; YAML-NEXT:   - Stream:
-; YAML-NEXT:       - 14
-; YAML-NEXT:   - Stream:
-; YAML-NEXT:       - 20
-; YAML-NEXT:   - Stream:
-; YAML-NEXT:   - Stream:
-; YAML-NEXT:       - 11
-; YAML-NEXT:   - Stream:
-; YAML-NEXT:       - 13
-; YAML-NEXT:   - Stream:
-; YAML-NEXT:       - 12
-; YAML-NEXT:   - Stream:
-; YAML-NEXT:   - Stream:
-; YAML-NEXT:       - 10
-; YAML-NEXT:   - Stream:
-; YAML-NEXT:       - 15
-; YAML-NEXT:   - Stream:
-; YAML-NEXT:       - 6
-; YAML-NEXT:   - Stream:
-; YAML-NEXT:       - 16
-; YAML-NEXT:   - Stream:
-; YAML-NEXT:       - 7
-; YAML-NEXT:   - Stream:
-; YAML-NEXT:       - 21
-; YAML-NEXT:   - Stream:
-; YAML-NEXT:       - 22
+; YAML-NEXT:   - Stream: [ 8 ]
+; YAML-NEXT:   - Stream: [ 19 ]
+; YAML-NEXT:   - Stream: [ 18, 17 ]
+; YAML-NEXT:   - Stream: [ 14 ]
+; YAML-NEXT:   - Stream: [ 20 ]
+; YAML-NEXT:   - Stream: [ ]
+; YAML-NEXT:   - Stream: [ 11 ]
+; YAML-NEXT:   - Stream: [ 13 ]
+; YAML-NEXT:   - Stream: [ 12 ]
+; YAML-NEXT:   - Stream: [ ]
+; YAML-NEXT:   - Stream: [ 10 ]
+; YAML-NEXT:   - Stream: [ 15 ]
+; YAML-NEXT:   - Stream: [ 6 ]
+; YAML-NEXT:   - Stream: [ 16 ]
+; YAML-NEXT:   - Stream: [ 7 ]
+; YAML-NEXT:   - Stream: [ 21 ]
+; YAML-NEXT:   - Stream: [ 22 ]
 ; YAML-NEXT: PdbStream:
 ; YAML-NEXT:   Age:             1
 ; YAML-NEXT:   Guid:            '{0B355641-86A0-A249-896F-9988FAE52FF0}'
 ; YAML-NEXT:   Signature:       1424295906
 ; YAML-NEXT:   Version:         VC70
 ; YAML-NEXT:     NamedStreams:
 ; YAML-NEXT:       - Name:            /names
 ; YAML-NEXT:         StreamNum:       13
 ; YAML-NEXT:       - Name:            /LinkInfo
 ; YAML-NEXT:         StreamNum:       5
 ; YAML-NEXT:       - Name:            /src/headerblock
 ; YAML-NEXT:         StreamNum:       9
 ; YAML-NEXT: ...
 
 ; NO-HEADERS: ---
 ; NO-HEADERS-NOT: MSF:
 ; NO-HEADERS-NOT:   SuperBlock:
 ; NO-HEADERS: ...
 No newline at end of file

llvm/trunk/tools/llvm-pdbdump/PdbYaml.h

 };
 
 template <> struct MappingTraits<pdb::yaml::NamedStreamMapping> {
   static void mapping(IO &IO, pdb::yaml::NamedStreamMapping &Obj);
 };
 }
 }
 
-LLVM_YAML_IS_SEQUENCE_VECTOR(uint32_t)
+LLVM_YAML_IS_FLOW_SEQUENCE_VECTOR(uint32_t)
 LLVM_YAML_IS_SEQUENCE_VECTOR(llvm::pdb::yaml::NamedStreamMapping)
 LLVM_YAML_IS_SEQUENCE_VECTOR(llvm::pdb::yaml::StreamBlockList)
 
 #endif // LLVM_TOOLS_LLVMPDBDUMP_PDBYAML_H