Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
35 changes: 26 additions & 9 deletions src/numen/parser.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -589,16 +589,26 @@ std::optional<ParsedTime> Parser::parseTime(bool afterDate) {
}

std::optional<DateString> Parser::parseRFC3339() {
// 2026-08-17T14:30:00Z
// 2026-08-17T14:30[:00[.5]][Z|+02:00]
using L = Lexer;
auto parsed = m_lexer.peakForward<L::Number, L::Operator, L::Number, L::Operator, L::Number, L::String,
L::Number, L::Operator, L::Number, L::Operator, L::Number>();
L::Number, L::Operator, L::Number>();

if (!parsed) return std::nullopt;

auto &[year, s1, month, s2, day, tsep, hour, s3, min, s4, s] = *parsed;
auto &[year, s1, month, s2, day, tsep, hour, s3, min] = *parsed;

if (!(s1.op == "-" && s2.op == "-" && s3.op == ":" && s4.op == ":")) return std::nullopt;
if (!(s1.op == "-" && s2.op == "-" && s3.op == ":" && equalsIgnoreCase(tsep.data, "T"))) {
return std::nullopt;
}

std::size_t length = std::tuple_size_v<decltype(parsed)::value_type>;
double secs = 0;

if (auto tail = m_lexer.peakForward<L::Operator, L::Number>(length); tail && std::get<0>(*tail).op == ":") {
secs = std::get<1>(*tail).n.toDouble();
length += 2;
}

// the shape alone does not make it a timestamp: every component has to be
// one a clock could read, or the cast below has nothing to land on
Expand All @@ -607,8 +617,9 @@ std::optional<DateString> Parser::parseRFC3339() {
auto dayOfMonth = clockComponent(day.n.toDouble(), 31);
auto hours = clockComponent(hour.n.toDouble(), 23);
auto minutes = clockComponent(min.n.toDouble(), 59);
// :60 is a leap second, which is a reading RFC 3339 allows
auto seconds = clockComponent(s.n.toDouble(), 60);
// :60 is a leap second, which is a reading RFC 3339 allows. fractions of a
// second are dropped, a time only holds whole seconds
auto seconds = clockComponent(std::trunc(secs), 60);

if (!yr || !mon || !dayOfMonth || !hours || !minutes || !seconds) return std::nullopt;
if (*mon < 1 || *dayOfMonth < 1) return std::nullopt;
Expand All @@ -624,18 +635,24 @@ std::optional<DateString> Parser::parseRFC3339() {
.seconds = std::chrono::seconds{*seconds},
}};

m_lexer.advance(std::tuple_size_v<decltype(parsed)::value_type>);
m_lexer.advance(static_cast<int>(length));

// an offset is a sign glued to the time: "14:30 + 1 hour" adds an hour, it is not UTC+1
auto sign = m_lexer.peak();
const bool hasOffset = sign && (sign->raw == "+" || sign->raw == "-") && m_lexer.isGluedLeft(*sign);

if (auto zulu = m_lexer.peakAs<Lexer::String>(); zulu && zulu->data == "Z") {
m_lexer.next();
ds.timezone = TimezoneOffset{.name = "UTC"};
return ds;
} else if (auto offset = parseTimezoneOffset()) {
} else if (auto offset = hasOffset ? parseTimezoneOffset() : std::nullopt) {
ds.timezone = TimezoneOffset{.name = "UTC", .offset = *offset};
return ds;
}

return std::nullopt;
// without a zone it is local time, read the same as "2026-08-17 14:30"
ds.timezone = parseTimezone();
return ds;
}

std::optional<std::chrono::seconds> Parser::parseTimezoneOffset() {
Expand Down
18 changes: 18 additions & 0 deletions tests/corpus/datetime.corpus
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,24 @@ Jan 2025 18 at 7 pm => 2025-01-18 19:00:00 (Etc/UTC)
2026-01-18T14:30:00+05 => 2026-01-18 19:30:00 (Etc/UTC+5)
2026-01-18T14:30:00+05: => 2026-01-18 19:30:00 (Etc/UTC+5)

# ISO 8601: seconds are optional and read as ":00"
2026-10-01T12:00Z => 2026-10-01 12:00:00 (Etc/UTC)
2026-10-01T12:00+02:00 => 2026-10-01 14:00:00 (Etc/UTC+2)
2026-10-01T12:00-05:30 => 2026-10-01 06:30:00 (Etc/UTC-5:30)

# ISO 8601 without a zone is local time, the same as "2026-10-01 12:00"
2026-10-01T12:00 => 2026-10-01 12:00:00 (Etc/UTC)
2026-10-01T12:00:30 => 2026-10-01 12:00:30 (Etc/UTC)
2026-10-01T12:00 tokyo => 2026-10-01 03:00:00 (Etc/UTC)

# an offset is glued to the time, a spaced sign is arithmetic
2026-10-01T12:00 + 1 hour => 2026-10-01 13:00:00 (Etc/UTC)
2026-10-01T12:00:00 + 1 hour => 2026-10-01 13:00:00 (Etc/UTC)

# fractional seconds are truncated
2026-10-01T12:00:00.5Z => 2026-10-01 12:00:00 (Etc/UTC)
2026-10-01T12:00:59.999Z => 2026-10-01 12:00:59 (Etc/UTC)

# a component no clock could read means it is not a timestamp
2026-01-18T14:30:60Z => 2026-01-18 14:31:00 (Etc/UTC)
2026-01-18T80:30:00Z => 2026-01-18 00:00:00 (Etc/UTC)
Expand Down
8 changes: 8 additions & 0 deletions tests/datetime.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,14 @@ TEST_CASE("toRFC3339 discards subseconds") {
CHECK(numen::DateTime{.time = t, .tz = test::zone("UTC")}.toRFC3339() == "2026-01-18T02:30:00Z");
}

TEST_CASE("ISO 8601 date times without a zone are local time") {
auto config = configAt({2026y, January, 18d});
config.timezone = test::zone("Europe/Moscow"); // UTC+3, no DST

test::assertExpr("2026-10-01T12:00", "2026-10-01 12:00:00 (Europe/Moscow)", config);
test::assertExpr("2026-10-01T12:00:30", "2026-10-01 12:00:30 (Europe/Moscow)", config);
}

TEST_CASE("json() renders date times as RFC 3339") {
auto config = configAt({2026y, January, 18d});
test::assertExpr("json(now)", "2026-01-18T00:00:00Z", config);
Expand Down
Loading