Use the ability to set the tzdb path at runtime

R/cpp11.R

@@ -172,6 +172,10 @@ clock_set_install <- function(path) {
   invisible(.Call("_clock_clock_set_install", path, PACKAGE = "clock"))
 }
 
+clock_set_tz_dir <- function(path) {
+  invisible(.Call("_clock_clock_set_tz_dir", path, PACKAGE = "clock"))
+}
+
 iso_year_week_day_check_range_cpp <- function(x, component_string, arg) {
   invisible(.Call("_clock_iso_year_week_day_check_range_cpp", x, component_string, arg, PACKAGE = "clock"))
 }

R/zzz.R

@@ -1,6 +1,15 @@
 .onLoad <- function(libname, pkgname) {
-  tzdata <- system.file("tzdata", package = "clock", mustWork = TRUE)
-  clock_set_install(tzdata)
+  sysname <- tolower(Sys.info()[["sysname"]])
+
+  if (identical(sysname, "windows")) {
+    # Use shipped text version of the tzdb
+    tzdata <- system.file("tzdata", package = "clock", mustWork = TRUE)
+    clock_set_install(tzdata)
+  } else {
+    # Use shipped binary version of the tzdb
+    tz_dir <- system.file("zoneinfo", package = "clock", mustWork = TRUE)
+    clock_set_tz_dir(tz_dir)
+  }
 
   vctrs::s3_register("pillar::pillar_shaft", "clock_calendar", pillar_shaft.clock_calendar)
   vctrs::s3_register("pillar::pillar_shaft", "clock_time_point", pillar_shaft.clock_time_point)

inst/include/date/date.h

@@ -45,9 +45,7 @@
 #include <cctype>
 #include <chrono>
 #include <climits>
-#if !(__cplusplus >= 201402)
-#  include <cmath>
-#endif
+#include <cmath>
 #include <cstddef>
 #include <cstdint>
 #include <cstdlib>
@@ -6169,28 +6167,42 @@ long double
 read_long_double(std::basic_istream<CharT, Traits>& is, unsigned m = 1, unsigned M = 10)
 {
     unsigned count = 0;
+    unsigned fcount = 0;
+    unsigned long long i = 0;
+    unsigned long long f = 0;
+    bool parsing_fraction = false;
+#if ONLY_C_LOCALE
+    typename Traits::int_type decimal_point = '.';
+#else
     auto decimal_point = Traits::to_int_type(
         std::use_facet<std::numpunct<CharT>>(is.getloc()).decimal_point());
-    std::string buf;
+#endif
     while (true)
     {
         auto ic = is.peek();
         if (Traits::eq_int_type(ic, Traits::eof()))
             break;
         if (Traits::eq_int_type(ic, decimal_point))
         {
-            buf += '.';
             decimal_point = Traits::eof();
-            is.get();
+            parsing_fraction = true;
         }
         else
         {
             auto c = static_cast<char>(Traits::to_char_type(ic));
             if (!('0' <= c && c <= '9'))
                 break;
-            buf += c;
-            (void)is.get();
+            if (!parsing_fraction)
+            {
+                i = 10*i + static_cast<unsigned>(c - '0');
+            }
+            else
+            {
+                f = 10*f + static_cast<unsigned>(c - '0');
+                ++fcount;
+            }
         }
+        (void)is.get();
         if (++count == M)
             break;
     }
@@ -6199,7 +6211,7 @@ read_long_double(std::basic_istream<CharT, Traits>& is, unsigned m = 1, unsigned
         is.setstate(std::ios::failbit);
         return 0;
     }
-    return std::stold(buf);
+    return i + f/std::pow(10.L, fcount);
 }
 
 struct rs
@@ -6966,7 +6978,7 @@ from_stream(std::basic_istream<CharT, Traits>& is, const CharT* fmt,
 #else
                         auto nm = detail::ampm_names();
                         auto i = detail::scan_keyword(is, nm.first, nm.second) - nm.first;
-                        tp = i;
+                        tp = static_cast<decltype(tp)>(i);
 #endif
                         checked_set(p, tp, not_a_ampm, is);
                     }

inst/include/date/tz.h

@@ -47,8 +47,16 @@
 #  define USE_OS_TZDB 0
 #endif
 
+#ifndef USE_BINARY_TZDB
+#  define USE_BINARY_TZDB USE_OS_TZDB
+#endif
+
+#if (!USE_BINARY_TZDB) && (USE_OS_TZDB)
+#  define error "If USE_OS_TZDB is used, then USE_BINARY_TZDB must also be used."
+#endif
+
 #ifndef HAS_REMOTE_API
-#  if USE_OS_TZDB == 0
+#  if USE_BINARY_TZDB == 0
 #    ifdef _WIN32
 #      define HAS_REMOTE_API 0
 #    else
@@ -64,8 +72,8 @@
 # pragma clang diagnostic ignored "-Wconstant-logical-operand"
 #endif
 
-static_assert(!(USE_OS_TZDB && HAS_REMOTE_API),
-              "USE_OS_TZDB and HAS_REMOTE_API can not be used together");
+static_assert(!(USE_BINARY_TZDB && HAS_REMOTE_API),
+              "USE_BINARY_TZDB and HAS_REMOTE_API can not be used together");
 
 #ifdef __clang__
 # pragma clang diagnostic pop
@@ -82,9 +90,9 @@ static_assert(HAS_REMOTE_API == 0 ? AUTO_DOWNLOAD == 0 : true,
 #  define USE_SHELL_API 1
 #endif
 
-#if USE_OS_TZDB
+#if USE_OS_TZDB || USE_BINARY_TZDB
 #  ifdef _WIN32
-#    error "USE_OS_TZDB can not be used on Windows"
+#    error "USE_OS_TZDB and USE_BINARY_TZDB can not be used on Windows"
 #  endif
 #endif
 
@@ -764,13 +772,13 @@ operator!=(const zoned_time<Duration1, TimeZonePtr>& x,
 
 namespace detail
 {
-#  if USE_OS_TZDB
+#  if USE_BINARY_TZDB
     struct transition;
     struct expanded_ttinfo;
-#  else  // !USE_OS_TZDB
+#  else  // !USE_BINARY_TZDB
     struct zonelet;
     class Rule;
-#  endif  // !USE_OS_TZDB
+#  endif  // !USE_BINARY_TZDB
 }
 
 #endif  // !defined(_MSC_VER) || (_MSC_VER >= 1900)
@@ -779,12 +787,12 @@ class time_zone
 {
 private:
     std::string                          name_;
-#if USE_OS_TZDB
+#if USE_BINARY_TZDB
     std::vector<detail::transition>      transitions_;
     std::vector<detail::expanded_ttinfo> ttinfos_;
-#else  // !USE_OS_TZDB
+#else  // !USE_BINARY_TZDB
     std::vector<detail::zonelet>         zonelets_;
-#endif  // !USE_OS_TZDB
+#endif  // !USE_BINARY_TZDB
     std::unique_ptr<std::once_flag>      adjusted_;
 
 public:
@@ -819,9 +827,9 @@ class time_zone
     friend bool operator< (const time_zone& x, const time_zone& y) NOEXCEPT;
     friend DATE_API std::ostream& operator<<(std::ostream& os, const time_zone& z);
 
-#if !USE_OS_TZDB
+#if !USE_BINARY_TZDB
     DATE_API void add(const std::string& s);
-#endif  // !USE_OS_TZDB
+#endif  // !USE_BINARY_TZDB
 
 private:
     DATE_API sys_info   get_info_impl(sys_seconds tp) const;
@@ -834,7 +842,7 @@ class time_zone
         sys_time<typename std::common_type<Duration, std::chrono::seconds>::type>
         to_sys_impl(local_time<Duration> tp, choose, std::true_type) const;
 
-#if USE_OS_TZDB
+#if USE_BINARY_TZDB
     DATE_API void init() const;
     DATE_API void init_impl();
     DATE_API sys_info
@@ -844,11 +852,11 @@ class time_zone
     DATE_API void
     load_data(std::istream& inf, std::int32_t tzh_leapcnt, std::int32_t tzh_timecnt,
                                  std::int32_t tzh_typecnt, std::int32_t tzh_charcnt);
-#else  // !USE_OS_TZDB
+#else  // !USE_BINARY_TZDB
     DATE_API sys_info   get_info_impl(sys_seconds tp, int timezone) const;
     DATE_API void adjust_infos(const std::vector<detail::Rule>& rules);
     DATE_API void parse_info(std::istream& in);
-#endif  // !USE_OS_TZDB
+#endif  // !USE_BINARY_TZDB
 };
 
 #if defined(_MSC_VER) && (_MSC_VER < 1900)
@@ -958,7 +966,7 @@ time_zone::to_sys_impl(local_time<Duration> tp, choose, std::true_type) const
     return sys_time<Duration>{tp.time_since_epoch()} - i.first.offset;
 }
 
-#if !USE_OS_TZDB
+#if !USE_BINARY_TZDB
 
 class time_zone_link
 {
@@ -984,15 +992,15 @@ inline bool operator> (const time_zone_link& x, const time_zone_link& y) {return
 inline bool operator<=(const time_zone_link& x, const time_zone_link& y) {return !(y < x);}
 inline bool operator>=(const time_zone_link& x, const time_zone_link& y) {return !(x < y);}
 
-#endif  // !USE_OS_TZDB
+#endif  // !USE_BINARY_TZDB
 
 class leap_second
 {
 private:
     sys_seconds date_;
 
 public:
-#if USE_OS_TZDB
+#if USE_BINARY_TZDB
     DATE_API explicit leap_second(const sys_seconds& s, detail::undocumented);
 #else
     DATE_API explicit leap_second(const std::string& s, detail::undocumented);
@@ -1151,11 +1159,11 @@ struct tzdb
 {
     std::string                 version = "unknown";
     std::vector<time_zone>      zones;
-#if !USE_OS_TZDB
+#if !USE_BINARY_TZDB
     std::vector<time_zone_link> links;
 #endif
     std::vector<leap_second>    leap_seconds;
-#if !USE_OS_TZDB
+#if !USE_BINARY_TZDB
     std::vector<detail::Rule>   rules;
 #endif
 #ifdef _WIN32
@@ -1294,12 +1302,14 @@ tzdb_list::cend() const NOEXCEPT
 
 DATE_API tzdb_list& get_tzdb_list();
 
-#if !USE_OS_TZDB
-
+#if USE_BINARY_TZDB
+#  if !USE_OS_TZDB
+DATE_API void set_tz_dir(const std::string& tz_dir);
+#  endif // !USE_OS_TZDB
+#else // !USE_BINARY_TZDB
 DATE_API const tzdb& reload_tzdb();
 DATE_API void        set_install(const std::string& install);
-
-#endif  // !USE_OS_TZDB
+#endif // USE_BINARY_TZDB
 
 #if HAS_REMOTE_API
 

inst/include/date/tz_private.h

@@ -40,7 +40,7 @@ namespace date
 namespace detail
 {
 
-#if !USE_OS_TZDB
+#if !USE_BINARY_TZDB
 
 enum class tz {utc, local, standard};
 
@@ -256,7 +256,7 @@ struct zonelet
     zonelet& operator=(const zonelet&) = delete;
 };
 
-#else  // USE_OS_TZDB
+#else  // USE_BINARY_TZDB
 
 struct ttinfo
 {
@@ -303,7 +303,7 @@ struct transition
     }
 };
 
-#endif  // USE_OS_TZDB
+#endif  // USE_BINARY_TZDB
 
 }  // namespace detail