[regex-ripout] part 2/n #431

strega-nil · 2022-03-12T00:49:43Z

No description provided.

also rename reformat_version -> format_version_for_nugetref

src/vcpkg/tools.cpp

src/vcpkg/versions.cpp

BillyONeal · 2022-03-14T16:29:13Z

src/vcpkg/tools.cpp

@@ -25,25 +25,57 @@ namespace vcpkg
        std::string sha512;
    };

-    static Optional<std::array<int, 3>> parse_version_string(const std::string& version_as_string)
+    // /\d+\.\d+(\.\d+)?/
+    static Optional<std::array<int, 3>> parse_version_string(StringView string_version)


While I have outstanding changes to tools.cpp, this change will not create issues for me.

src/vcpkg/versions.cpp

src/vcpkg/tools.cpp

src/vcpkg/versions.cpp

BillyONeal · 2022-03-14T16:42:03Z

src/vcpkg/versions.cpp

+    }
+
+    // /(\d+)(\.\d+|$)(\.\d+)?.*/
+    bool try_parse_external_dot_version(ParsedExternalVersion& out, StringView version)


This needs a test consisting of at least all the current values from vcpkgTools.xml.

This API is different in character than our other try_parse_Xxx functions in that they tend to return a structure (or write to a structure) that owns its data, while the lifetime of the data fed to this is tied to the caller. I'm a little worried of someone doing:

try_parse_external_dot_version(x, something_that_returns_std_string())

Would it make sense to make ParsedExternalVersion have strings rather than StringViews inside?

I'd prefer to not do that, but I will if you insist. This is mostly an implementation detail function that's been pulled out into it's own thing.

I think that's reasonable; do we want a new name like "try_extract" rather than "try_parse" to indicate this ownership difference? ("I think you're being paranoid Bill" is a reasonable answer ;))

src/vcpkg/versions.cpp

src/vcpkg/commands.autocomplete.cpp

Additionally, this includes a change to be more correct: &#x<hex>; is now considered a character reference.

also format

src/vcpkg/versions.cpp

# Conflicts: # include/vcpkg/base/strings.h # src/vcpkg/commands.autocomplete.cpp # src/vcpkg/sourceparagraph.cpp

BillyONeal

This approval is conditional on removing the now unused <charconv> include; everything else are nitpicks.

include/vcpkg/base/strings.h

src/vcpkg/export.ifw.cpp

src/vcpkg/metrics.cpp

BillyONeal · 2022-03-16T19:58:47Z

Thanks for adding tests :D

* put is_hex_digit and is_word_char into parserbase * try_parse_external_*_version -> try_extract_external_*_version * add ZERO_MAC constant * add consts to `last` * make `is_character_ref` a function

strega-nil added 2 commits March 11, 2022 15:46

[regex-ripout] autocomplete

a7aef70

[regex-ripout] tools.cpp:version parsing

7691226

also rename reformat_version -> format_version_for_nugetref

BillyONeal reviewed Mar 14, 2022

View reviewed changes

strega-nil added 3 commits March 14, 2022 10:55

[regex-ripout] export.ifw

f62754c

Additionally, this includes a change to be more correct: &#x<hex>; is now considered a character reference.

[regex-ripout] export.prefab

f124b55

also format

[regex-ripout] metrics

e11e4da

strega-nil commented Mar 14, 2022

View reviewed changes

src/vcpkg/versions.cpp Outdated Show resolved Hide resolved

strega-nil-ms force-pushed the regex-ripout-2 branch 2 times, most recently from e05d570 to 5143398 Compare March 15, 2022 05:06

Billy CRs for version parsing

7bf88dc

strega-nil-ms force-pushed the regex-ripout-2 branch from 5143398 to 7bf88dc Compare March 15, 2022 05:07

strega-nil added 2 commits March 15, 2022 00:58

fix strto

8286c57

use from_chars?

9941c3f

strega-nil-ms force-pushed the regex-ripout-2 branch from a08151e to 9941c3f Compare March 15, 2022 08:16

strega-nil added 2 commits March 15, 2022 01:23

fix tests

36cfbce

strictify strto

6d7d4ef

strega-nil-ms force-pushed the regex-ripout-2 branch from 7dd84dd to 6d7d4ef Compare March 15, 2022 15:51

strega-nil and others added 4 commits March 15, 2022 15:13

add tests for autocomplete

4012207

switch back to strto

2e14bae

clang-format

2d8a953

Merge remote-tracking branch 'origin/main' into regex-ripout-2

d4b470d

# Conflicts: # include/vcpkg/base/strings.h # src/vcpkg/commands.autocomplete.cpp # src/vcpkg/sourceparagraph.cpp

BillyONeal approved these changes Mar 16, 2022

View reviewed changes

Billy CRs

399b13a

* put is_hex_digit and is_word_char into parserbase * try_parse_external_*_version -> try_extract_external_*_version * add ZERO_MAC constant * add consts to `last` * make `is_character_ref` a function

strega-nil-ms force-pushed the regex-ripout-2 branch from 00d54c8 to 399b13a Compare March 16, 2022 21:27

strega-nil added 2 commits March 16, 2022 14:29

remove P = Parse::ParserBase;

faa5b70

format

d7f3427

strega-nil-ms merged commit 460b058 into microsoft:main Mar 16, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[regex-ripout] part 2/n #431

[regex-ripout] part 2/n #431

strega-nil commented Mar 12, 2022

BillyONeal Mar 14, 2022

BillyONeal Mar 14, 2022

BillyONeal Mar 14, 2022

strega-nil-ms Mar 15, 2022

BillyONeal Mar 16, 2022

BillyONeal left a comment

BillyONeal commented Mar 16, 2022

[regex-ripout] part 2/n #431

[regex-ripout] part 2/n #431

Conversation

strega-nil commented Mar 12, 2022

BillyONeal Mar 14, 2022

Choose a reason for hiding this comment

BillyONeal Mar 14, 2022

Choose a reason for hiding this comment

BillyONeal Mar 14, 2022

Choose a reason for hiding this comment

strega-nil-ms Mar 15, 2022

Choose a reason for hiding this comment

BillyONeal Mar 16, 2022

Choose a reason for hiding this comment

BillyONeal left a comment

Choose a reason for hiding this comment

BillyONeal commented Mar 16, 2022