diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2020-02-09 14:50:26 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-09 14:50:26 -0800 |
| commit | a33044c18637d3df6de93128d33dae1fb5ba575c (patch) | |
| tree | 273838dd27daed933e63bc7d29a28b569557755f /toolsrc/src/vcpkg-test/util.cpp | |
| parent | 039098c9546195a50e45c41e37d7e2b9168b4245 (diff) | |
| download | vcpkg-a33044c18637d3df6de93128d33dae1fb5ba575c.tar.gz vcpkg-a33044c18637d3df6de93128d33dae1fb5ba575c.zip | |
[vcpkg] Track parser row/col state in Paragraph (renamed from RawParagraph) (#9987)
Diffstat (limited to 'toolsrc/src/vcpkg-test/util.cpp')
| -rw-r--r-- | toolsrc/src/vcpkg-test/util.cpp | 31 |
1 files changed, 14 insertions, 17 deletions
diff --git a/toolsrc/src/vcpkg-test/util.cpp b/toolsrc/src/vcpkg-test/util.cpp index ae02e3ab0..d754baec1 100644 --- a/toolsrc/src/vcpkg-test/util.cpp +++ b/toolsrc/src/vcpkg-test/util.cpp @@ -58,7 +58,7 @@ namespace vcpkg::Test {"Build-Depends", feature.second}, }); } - auto m_pgh = vcpkg::SourceControlFile::parse_control_file("", std::move(scf_pghs)); + auto m_pgh = test_parse_control_file(std::move(scf_pghs)); REQUIRE(m_pgh.has_value()); return std::move(*m_pgh.get()); } @@ -68,14 +68,13 @@ namespace vcpkg::Test const char* default_features, const char* triplet) { - using Pgh = std::unordered_map<std::string, std::string>; - return std::make_unique<StatusParagraph>(Pgh{{"Package", name}, - {"Version", "1"}, - {"Architecture", triplet}, - {"Multi-Arch", "same"}, - {"Depends", depends}, - {"Default-Features", default_features}, - {"Status", "install ok installed"}}); + return std::make_unique<StatusParagraph>(Parse::Paragraph{{"Package", {name, {}}}, + {"Version", {"1", {}}}, + {"Architecture", {triplet, {}}}, + {"Multi-Arch", {"same", {}}}, + {"Depends", {depends, {}}}, + {"Default-Features", {default_features, {}}}, + {"Status", {"install ok installed", {}}}}); } std::unique_ptr<StatusParagraph> make_status_feature_pgh(const char* name, @@ -83,14 +82,12 @@ namespace vcpkg::Test const char* depends, const char* triplet) { - using Pgh = std::unordered_map<std::string, std::string>; - return std::make_unique<StatusParagraph>(Pgh{{"Package", name}, - {"Version", "1"}, - {"Feature", feature}, - {"Architecture", triplet}, - {"Multi-Arch", "same"}, - {"Depends", depends}, - {"Status", "install ok installed"}}); + return std::make_unique<StatusParagraph>(Parse::Paragraph{{"Package", {name, {}}}, + {"Feature", {feature, {}}}, + {"Architecture", {triplet, {}}}, + {"Multi-Arch", {"same", {}}}, + {"Depends", {depends, {}}}, + {"Status", {"install ok installed", {}}}}); } PackageSpec PackageSpecMap::emplace(const char* name, |