- 07191b0f52301e1e4a790e236f7b7c2fd90561ae Disambiguates computed return type of absl::optional logi... by Abseil Team <absl-team@google.com>
- acd95f8ec4e6ec1587cb198c7f40af3c81094d92 Release container benchmarks. by Alex Strelnikov <strel@google.com> - 80f596b6b7c5e06453e778c16527d5a0e85f8413 Allow absl::base_internal::AtomicHook to have a default v... by Derek Mauro <dmauro@google.com> - 8402631546af8bcbd4acdf897d0cdfb805ad544a Release thread_identity benchmark. by Alex Strelnikov <strel@google.com> - 6dcb1e90fefb8556ce4654983d3a73c7585b4b99 Fix spelling error in variant.h by Abseil Team <absl-team@google.com> - faa8a81e1442018c0d400b09a595a5be55074715 Run tests from CMake. The CI is currently Linux only, fo... by Jon Cohen <cohenjon@google.com> - 745ed6db574f931f2ec3a88e964fb03a5f22f816 Internal change. by Derek Mauro <dmauro@google.com> - 23facd7d1c5f43ac8181b016ee4acc5955f048c1 absl::variant exception safety test. by Xiaoyi Zhang <zhangxy@google.com> - c18e21e7cf8f6e83ae9d90e536e886409dd6cf68 Reinstate the syntax check on time-zone abbreviations now... by Abseil Team <absl-team@google.com> - da469f4314f0c820665a2b5b9477af9462b23e42 Import CCTZ changes to internal copy. by Shaindel Schwartz <shaindel@google.com> - 44ea35843517be03ab256b69449ccfea64352621 Import CCTZ changes to internal copy. by Abseil Team <absl-team@google.com> - 55d1105312687c6093950fac831c7540f49045b5 Import CCTZ changes to internal copy. by Greg Falcon <gfalcon@google.com> - 58d7965ad274406410b6d833213eca04d41c6867 Add zoneinfo as a data dependency to the //absl/time tests. by Shaindel Schwartz <shaindel@google.com> - 6acc50146f9ff29015bfaaa5bf9900691f839da5 Change benchmark target type from cc_test to cc_binary. by Alex Strelnikov <strel@google.com> - db3fbdae8f9f285a466f7a070326b1ce43b6a0dd Update WORKSPACE for C++ microbenchmarks and release algo... by Alex Strelnikov <strel@google.com> - 0869ae168255242af651853ed01719166d8cebf6 Update to Bazel version 0.13.0. by Abseil Team <absl-team@google.com> - e507dd53ab788964207fdf27d31b72a33c296fab Add missing include of cstdio by Abseil Team <absl-team@google.com> GitOrigin-RevId: 07191b0f52301e1e4a790e236f7b7c2fd90561ae Change-Id: I90994cf2b438fbec894724dcd9b90882281eef56
This commit is contained in:
parent
9613678332
commit
26b789f9a5
35 changed files with 1583 additions and 119 deletions
|
|
@ -80,6 +80,7 @@ cc_test(
|
|||
name = "time_zone_format_test",
|
||||
size = "small",
|
||||
srcs = ["src/time_zone_format_test.cc"],
|
||||
data = [":zoneinfo"],
|
||||
deps = [
|
||||
":civil_time",
|
||||
":time_zone",
|
||||
|
|
@ -91,6 +92,7 @@ cc_test(
|
|||
name = "time_zone_lookup_test",
|
||||
size = "small",
|
||||
srcs = ["src/time_zone_lookup_test.cc"],
|
||||
data = [":zoneinfo"],
|
||||
deps = [
|
||||
":civil_time",
|
||||
":time_zone",
|
||||
|
|
@ -103,3 +105,8 @@ cc_test(
|
|||
### examples
|
||||
|
||||
### binaries
|
||||
|
||||
filegroup(
|
||||
name = "zoneinfo",
|
||||
srcs = glob(["testdata/zoneinfo/**"]),
|
||||
)
|
||||
|
|
|
|||
|
|
@ -20,8 +20,8 @@
|
|||
#include <ostream>
|
||||
#include <type_traits>
|
||||
|
||||
// Disable constexpr support unless we are using clang in C++14 mode.
|
||||
#if __clang__ && __cpp_constexpr >= 201304
|
||||
// Disable constexpr support unless we are in C++14 mode.
|
||||
#if __cpp_constexpr >= 201304 || _MSC_VER >= 1910
|
||||
#define CONSTEXPR_D constexpr // data
|
||||
#define CONSTEXPR_F constexpr // function
|
||||
#define CONSTEXPR_M constexpr // member
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ std::string Format(const T& t) {
|
|||
|
||||
} // namespace
|
||||
|
||||
#if __clang__ && __cpp_constexpr >= 201304
|
||||
#if __cpp_constexpr >= 201304 || _MSC_VER >= 1910
|
||||
// Construction constexpr tests
|
||||
|
||||
TEST(CivilTime, Normal) {
|
||||
|
|
@ -319,7 +319,7 @@ TEST(CivilTime, YearDay) {
|
|||
constexpr int yd = get_yearday(cd);
|
||||
static_assert(yd == 28, "YearDay");
|
||||
}
|
||||
#endif // __clang__ && __cpp_constexpr >= 201304
|
||||
#endif // __cpp_constexpr >= 201304 || _MSC_VER >= 1910
|
||||
|
||||
// The remaining tests do not use constexpr.
|
||||
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ namespace cctz {
|
|||
namespace {
|
||||
|
||||
// The prefix used for the internal names of fixed-offset zones.
|
||||
const char kFixedOffsetPrefix[] = "Fixed/";
|
||||
const char kFixedOffsetPrefix[] = "Fixed/UTC";
|
||||
|
||||
int Parse02d(const char* p) {
|
||||
static const char kDigits[] = "0123456789";
|
||||
|
|
@ -50,13 +50,11 @@ bool FixedOffsetFromName(const std::string& name, sys_seconds* offset) {
|
|||
|
||||
const std::size_t prefix_len = sizeof(kFixedOffsetPrefix) - 1;
|
||||
const char* const ep = kFixedOffsetPrefix + prefix_len;
|
||||
if (name.size() != prefix_len + 12) // "<prefix>UTC+99:99:99"
|
||||
if (name.size() != prefix_len + 9) // <prefix>+99:99:99
|
||||
return false;
|
||||
if (!std::equal(kFixedOffsetPrefix, ep, name.begin()))
|
||||
return false;
|
||||
const char* np = name.data() + prefix_len;
|
||||
if (*np++ != 'U' || *np++ != 'T' || *np++ != 'C')
|
||||
return false;
|
||||
if (np[0] != '+' && np[0] != '-')
|
||||
return false;
|
||||
if (np[3] != ':' || np[6] != ':') // see note below about large offsets
|
||||
|
|
@ -97,8 +95,8 @@ std::string FixedOffsetToName(const sys_seconds& offset) {
|
|||
}
|
||||
int hours = minutes / 60;
|
||||
minutes %= 60;
|
||||
char buf[sizeof(kFixedOffsetPrefix) + sizeof("UTC-24:00:00")];
|
||||
snprintf(buf, sizeof(buf), "%sUTC%c%02d:%02d:%02d",
|
||||
char buf[sizeof(kFixedOffsetPrefix) + sizeof("-24:00:00")];
|
||||
snprintf(buf, sizeof(buf), "%s%c%02d:%02d:%02d",
|
||||
kFixedOffsetPrefix, sign, hours, minutes, seconds);
|
||||
return buf;
|
||||
}
|
||||
|
|
@ -106,22 +104,14 @@ std::string FixedOffsetToName(const sys_seconds& offset) {
|
|||
std::string FixedOffsetToAbbr(const sys_seconds& offset) {
|
||||
std::string abbr = FixedOffsetToName(offset);
|
||||
const std::size_t prefix_len = sizeof(kFixedOffsetPrefix) - 1;
|
||||
const char* const ep = kFixedOffsetPrefix + prefix_len;
|
||||
if (abbr.size() >= prefix_len) {
|
||||
if (std::equal(kFixedOffsetPrefix, ep, abbr.begin())) {
|
||||
abbr.erase(0, prefix_len);
|
||||
if (abbr.size() == 12) { // UTC+99:99:99
|
||||
abbr.erase(9, 1); // UTC+99:9999
|
||||
abbr.erase(6, 1); // UTC+999999
|
||||
if (abbr[8] == '0' && abbr[9] == '0') { // UTC+999900
|
||||
abbr.erase(8, 2); // UTC+9999
|
||||
if (abbr[6] == '0' && abbr[7] == '0') { // UTC+9900
|
||||
abbr.erase(6, 2); // UTC+99
|
||||
if (abbr[4] == '0') { // UTC+09
|
||||
abbr.erase(4, 1); // UTC+9
|
||||
}
|
||||
}
|
||||
}
|
||||
if (abbr.size() == prefix_len + 9) { // <prefix>+99:99:99
|
||||
abbr.erase(0, prefix_len); // +99:99:99
|
||||
abbr.erase(6, 1); // +99:9999
|
||||
abbr.erase(3, 1); // +999999
|
||||
if (abbr[5] == '0' && abbr[6] == '0') { // +999900
|
||||
abbr.erase(5, 2); // +9999
|
||||
if (abbr[3] == '0' && abbr[4] == '0') { // +9900
|
||||
abbr.erase(3, 2); // +99
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -134,6 +134,9 @@ time_zone local_time_zone() {
|
|||
|
||||
time_zone tz;
|
||||
load_time_zone(name, &tz); // Falls back to UTC.
|
||||
// TODO: Follow the RFC3339 "Unknown Local Offset Convention" and
|
||||
// arrange for %z to generate "-0000" when we don't know the local
|
||||
// offset because the load_time_zone() failed and we're using UTC.
|
||||
return tz;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1119,18 +1119,6 @@ TEST(TimeZoneEdgeCase, AfricaMonrovia) {
|
|||
auto tp = convert(civil_second(1972, 1, 6, 23, 59, 59), tz);
|
||||
ExpectTime(tp, tz, 1972, 1, 6, 23, 59, 59, -44.5 * 60, false, "MMT");
|
||||
tp += seconds(1);
|
||||
#ifndef TZDATA_2017B_IS_UBIQUITOUS
|
||||
// The 2017b tzdata release moved the shift from -004430 to +00
|
||||
// from 1972-05-01 to 1972-01-07, so we temporarily accept both
|
||||
// outcomes until 2017b is ubiquitous.
|
||||
if (tz.lookup(tp).offset == -44.5 * 60) {
|
||||
tp = convert(civil_second(1972, 4, 30, 23, 59, 59), tz);
|
||||
ExpectTime(tp, tz, 1972, 4, 30, 23, 59, 59, -44.5 * 60, false, "LRT");
|
||||
tp += seconds(1);
|
||||
ExpectTime(tp, tz, 1972, 5, 1, 0, 44, 30, 0 * 60, false, "GMT");
|
||||
return;
|
||||
}
|
||||
#endif
|
||||
ExpectTime(tp, tz, 1972, 1, 7, 0, 44, 30, 0 * 60, false, "GMT");
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -26,8 +26,7 @@ namespace cctz = absl::time_internal::cctz;
|
|||
namespace absl {
|
||||
namespace time_internal {
|
||||
|
||||
// TODO(bww): Reinstate when the FixedTimeZone() abbreviations are updated.
|
||||
#if 1 || GTEST_USES_SIMPLE_RE
|
||||
#if GTEST_USES_SIMPLE_RE
|
||||
extern const char kZoneAbbrRE[] = ".*"; // just punt
|
||||
#else
|
||||
extern const char kZoneAbbrRE[] = "[A-Za-z]{3,4}|[-+][0-9]{2}([0-9]{2})?";
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue