if (!Entries.empty()) {
const YAMLVFSEntry &Entry = Entries.front();
- bool first_entry_is_directory = Entry.IsDirectory;
- StringRef Dir =
- first_entry_is_directory ? Entry.VPath : path::parent_path(Entry.VPath);
- startDirectory(Dir);
+
+ startDirectory(
+ Entry.IsDirectory ? Entry.VPath : path::parent_path(Entry.VPath)
+ );
StringRef RPath = Entry.RPath;
if (UseOverlayRelative) {
RPath = RPath.slice(OverlayDirLen, RPath.size());
}
- if (!first_entry_is_directory)
+ bool IsCurrentDirEmpty = true;
+ if (!Entry.IsDirectory) {
writeEntry(path::filename(Entry.VPath), RPath);
+ IsCurrentDirEmpty = false;
+ }
for (const auto &Entry : Entries.slice(1)) {
StringRef Dir =
Entry.IsDirectory ? Entry.VPath : path::parent_path(Entry.VPath);
if (Dir == DirStack.back()) {
- if (!first_entry_is_directory) {
+ if (!IsCurrentDirEmpty) {
OS << ",\n";
- first_entry_is_directory = false;
}
} else {
+ bool IsDirPoppedFromStack = false;
while (!DirStack.empty() && !containedIn(DirStack.back(), Dir)) {
OS << "\n";
endDirectory();
+ IsDirPoppedFromStack = true;
+ }
+ if (IsDirPoppedFromStack || !IsCurrentDirEmpty) {
+ OS << ",\n";
}
- OS << ",\n";
startDirectory(Dir);
+ IsCurrentDirEmpty = true;
}
StringRef RPath = Entry.RPath;
if (UseOverlayRelative) {
"Overlay dir must be contained in RPath");
RPath = RPath.slice(OverlayDirLen, RPath.size());
}
- if (!Entry.IsDirectory)
+ if (!Entry.IsDirectory) {
writeEntry(path::filename(Entry.VPath), RPath);
+ IsCurrentDirEmpty = false;
+ }
}
while (!DirStack.empty()) {
IntrusiveRefCntPtr<ErrorDummyFileSystem> Lower(new ErrorDummyFileSystem());
IntrusiveRefCntPtr<vfs::FileSystem> FS = getFromYAMLRawString(Buffer, Lower);
- // FIXME: Missing comma separator between file entries.
- EXPECT_FALSE(FS.get() != nullptr);
+ EXPECT_TRUE(FS.get() != nullptr);
}
TEST_F(VFSFromYAMLTest, YAMLVFSWriterTest3) {
IntrusiveRefCntPtr<ErrorDummyFileSystem> Lower(new ErrorDummyFileSystem());
IntrusiveRefCntPtr<vfs::FileSystem> FS = getFromYAMLRawString(Buffer, Lower);
- // FIXME: Spurious comma separator before first file entry in directory.
- EXPECT_FALSE(FS.get() != nullptr);
+ EXPECT_TRUE(FS.get() != nullptr);
}
TEST_F(VFSFromYAMLTest, YAMLVFSWriterTestHandleDirs) {