shithub: mc

Info  •  Files  •  Log  •  Branches

Match date abbreviations in the middle of formats

--- a/lib/date/parse.myr

+++ b/lib/date/parse.myr

@@ -164,9 +164,9 @@

 const indexof = {dst, s, set, err

 	for var i = 0; i < set.len; i++

-		if s.len >= set[i].len && std.streq(s, set[i])

+		if s.len >= set[i].len && std.streq(s[:set[i].len], set[i])

 			dst# = i

-			-> s

+			-> s[set[i].len:]

 		;;

 	;;

 	err# = `std.Some `Badname s

--- a/lib/date/test/parse.myr

+++ b/lib/date/test/parse.myr

@@ -37,6 +37,15 @@

 	| `std.Err m:

 		std.fatal("Failed to parse date: {}", m)

 	;;

+

+	/*Names*/

+	match date.parsefmt("%a, %d %b %Y %H:%M:%S %z", "Thu, 21 Sep 2017 13:55:05 -0400")

+	| `std.Ok d:

+		std.assert(d.actual == 1506016505 * 1_000_000, "wrong timestamp")

+		eq(std.bfmt(buf[:], "{D}", d), "2017-9-21 13:55:05 -0400")

+	| `std.Err m:

+		std.fatal("Failed to parse date: {}", m)

+	;;

 }

 const eq = {actual, expected