packagespec: fix warning on vcpkg::Located::operator ==() (microsoft#1711)

leha-bot · web-flow · commit d0d4200c1824 · 2025-06-26T15:02:49.000-07:00
There was an comparison of identical operands.
diff --git a/include/vcpkg/packagespec.h b/include/vcpkg/packagespec.h
@@ -112,7 +112,7 @@ namespace vcpkg
 
         friend bool operator==(const Located& lhs, const Located& rhs)
         {
-            return lhs.loc.row == rhs.loc.row && rhs.loc.column == rhs.loc.column && lhs.value == rhs.value;
+            return lhs.loc.row == rhs.loc.row && lhs.loc.column == rhs.loc.column && lhs.value == rhs.value;
         }
         friend bool operator!=(const Located& lhs, const Located& rhs) { return !(lhs == rhs); }
     };
diff --git a/src/vcpkg-test/specifier.cpp b/src/vcpkg-test/specifier.cpp
@@ -270,7 +270,7 @@ TEST_CASE ("specifier parsing", "[specifier]")
                 "zlib[feature]:x64-uwp", AllowFeatures::Yes, ParseExplicitTriplet::Allow, AllowPlatformSpec::Yes)
                 .value_or_exit(VCPKG_LINE_INFO);
         REQUIRE(spec.name.value == "zlib");
-        SourceLoc feature_loc{{}, {}, 0, 5};
+        SourceLoc feature_loc{{}, {}, 0, 6};
         REQUIRE(spec.features.value_or_exit(VCPKG_LINE_INFO) ==
                 std::vector<Located<std::string>>{Located<std::string>(feature_loc, "feature")});
         REQUIRE(spec.triplet.value_or_exit(VCPKG_LINE_INFO).value == "x64-uwp");
@@ -301,9 +301,9 @@ TEST_CASE ("specifier parsing", "[specifier]")
                         "zlib[0, 1,2]", AllowFeatures::Yes, ParseExplicitTriplet::Allow, AllowPlatformSpec::Yes)
                         .value_or_exit(VCPKG_LINE_INFO);
         REQUIRE(spec.name.value == "zlib");
-        SourceLoc zero_loc{{}, {}, 0, 5};
-        SourceLoc one_loc{{}, {}, 0, 8};
-        SourceLoc two_loc{{}, {}, 0, 10};
+        SourceLoc zero_loc{{}, {}, 0, 6};
+        SourceLoc one_loc{{}, {}, 0, 9};
+        SourceLoc two_loc{{}, {}, 0, 11};
         REQUIRE(spec.features.value_or_exit(VCPKG_LINE_INFO) ==
                 std::vector<Located<std::string>>{Located<std::string>{zero_loc, "0"},
                                                   Located<std::string>{one_loc, "1"},
@@ -317,7 +317,7 @@ TEST_CASE ("specifier parsing", "[specifier]")
         auto spec = vcpkg::parse_qualified_specifier(
                         "zlib[*]", AllowFeatures::Yes, ParseExplicitTriplet::Allow, AllowPlatformSpec::Yes)
                         .value_or_exit(VCPKG_LINE_INFO);
-        SourceLoc star_loc{{}, {}, 0, 5};
+        SourceLoc star_loc{{}, {}, 0, 6};
         REQUIRE(spec.name.value == "zlib");
         REQUIRE(spec.features.value_or_exit(VCPKG_LINE_INFO) ==
                 std::vector<Located<std::string>>{Located<std::string>{star_loc, "*"}});
diff --git a/src/vcpkg/base/parse.cpp b/src/vcpkg/base/parse.cpp
@@ -9,14 +9,15 @@ namespace vcpkg
 {
     static void advance_rowcol(char32_t ch, int& row, int& column)
     {
-        if (row == 0 && column == 0)
+        if (row == 0)
         {
+            if (column != 0)
+            {
+                ++column;
+            }
+
             return;
         }
-        else if (row == 0 || column == 0)
-        {
-            Checks::unreachable(VCPKG_LINE_INFO);
-        }
 
         if (ch == '\t')
         {
diff --git a/src/vcpkg/packagespec.cpp b/src/vcpkg/packagespec.cpp
@@ -218,7 +218,7 @@ namespace vcpkg
                                                                   AllowPlatformSpec allow_platform_spec)
     {
         // there is no origin because this function is used for user inputs
-        auto parser = ParserBase(input, nullopt, {0, 0});
+        auto parser = ParserBase(input, nullopt, {0, 1});
         auto maybe_pqs = parse_qualified_specifier(parser, allow_features, parse_explicit_triplet, allow_platform_spec);
         if (!parser.at_eof())
         {

Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ namespace vcpkg`
`112`	`112`
`113`	`113`	`friend bool operator==(const Located& lhs, const Located& rhs)`
`114`	`114`	`{`
`115`		`- return lhs.loc.row == rhs.loc.row && rhs.loc.column == rhs.loc.column && lhs.value == rhs.value;`
	`115`	`+ return lhs.loc.row == rhs.loc.row && lhs.loc.column == rhs.loc.column && lhs.value == rhs.value;`
`116`	`116`	`}`
`117`	`117`	`friend bool operator!=(const Located& lhs, const Located& rhs) { return !(lhs == rhs); }`
`118`	`118`	`};`
Original file line number	Diff line number	Diff line change
`@@ -9,14 +9,15 @@ namespace vcpkg`
`9`	`9`	`{`
`10`	`10`	`static void advance_rowcol(char32_t ch, int& row, int& column)`
`11`	`11`	`{`
`12`		`- if (row == 0 && column == 0)`
	`12`	`+ if (row == 0)`
`13`	`13`	`{`
	`14`	`+ if (column != 0)`
	`15`	`+ {`
	`16`	`+ ++column;`
	`17`	`+ }`
	`18`	`+`
`14`	`19`	`return;`
`15`	`20`	`}`
`16`		`- else if (row == 0 \|\| column == 0)`
`17`		`- {`
`18`		`- Checks::unreachable(VCPKG_LINE_INFO);`
`19`		`- }`
`20`	`21`
`21`	`22`	`if (ch == '\t')`
`22`	`23`	`{`
Original file line number	Diff line number	Diff line change
`@@ -218,7 +218,7 @@ namespace vcpkg`
`218`	`218`	`AllowPlatformSpec allow_platform_spec)`
`219`	`219`	`{`
`220`	`220`	`// there is no origin because this function is used for user inputs`
`221`		`- auto parser = ParserBase(input, nullopt, {0, 0});`
	`221`	`+ auto parser = ParserBase(input, nullopt, {0, 1});`
`222`	`222`	`auto maybe_pqs = parse_qualified_specifier(parser, allow_features, parse_explicit_triplet, allow_platform_spec);`
`223`	`223`	`if (!parser.at_eof())`
`224`	`224`	`{`