Skip to content

Fix parsing of rolling-release version. #4294

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
toots merged 3 commits into from
Jan 1, 2025
Merged

Fix parsing of rolling-release version. #4294

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9caef8c
Fix parsing of rolling-release version.
smimram Jan 1, 2025
0be682f
Format.
toots Jan 1, 2025
4e68eb9
Update src/lang/lang_string.ml
toots Jan 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/lang/lang_string.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,11 +352,14 @@ module Version = struct

(* We assume something like, 2.0.0+git@7e211ffd *)
let of_string s : t =
let rex = Re.Pcre.regexp "([\\.\\d]+)([^\\.]+)?" in
let rex = Re.Pcre.regexp "(?:rolling-release-v)?([\\.\\dx]+)([^\\.]+)?" in
let sub = Re.Pcre.exec ~rex s in
let num = Re.Pcre.get_substring sub 1 in
let str = try Re.Pcre.get_substring sub 2 with _ -> "" in
let num = String.split_on_char '.' num |> List.map int_of_string in
let num =
let int_of_string s = if s = "x" then -1 else int_of_string s in
String.split_on_char '.' num |> List.map int_of_string
in
(num, str)

(** Number part. *)
Expand Down
4 changes: 4 additions & 0 deletions tests/core/string_test.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
let () = assert ("aa\\\"bb" = Lang_string.escape_utf8_string "aa\"bb")

(* Bug #4287 *)
let () =
ignore (Lang_string.Version.of_string "rolling-release-v2.3.x+git@2addd93da")
Loading