strptime improvement: support %F (emscripten-core#6383)

caiiiycuk · kripken · commit a278c1f5b61d · 2018-04-02T11:11:23.000-07:00
diff --git a/src/library.js b/src/library.js
@@ -2550,6 +2550,7 @@ LibraryManager.library = {
       '%c':  '%x\\s+%X',
       '%D':  '%m\\/%d\\/%y',
       '%e':  '%d',
+      '%F':  '%Y-%m-%d',
       '%h':  '%b',
       '%R':  '%H\\:%M',
       '%r':  '%I\\:%M\\:%S\\s%p',
diff --git a/tests/strptime_symmetry.cpp b/tests/strptime_symmetry.cpp
@@ -0,0 +1,41 @@
+#include <string>
+#include <time.h>
+#include <cstring>
+#include <cstdio>
+
+bool parseAndCompare(const std::string& time, std::string expectedTime) {
+  char actualTimeBuffer[256];
+
+  struct tm tm;
+  memset(&tm, 0, sizeof(struct tm));
+  static const char* format = "%FT%T%z";
+  strptime(time.c_str(), format, &tm);
+       
+  sprintf(actualTimeBuffer,
+    "%04d-%02d-%02dT%02d:%02d:%02d", 
+    tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday, 
+    tm.tm_hour, tm.tm_min, tm.tm_sec);
+
+  std::string actualTime = actualTimeBuffer;
+  printf("%s: %s == %s, %s\n", time.c_str(), actualTime.c_str(), expectedTime.c_str(),
+    actualTime == expectedTime ? "true" : "false");
+
+  return actualTime == expectedTime;
+}
+
+int main(int argc, char** argv) {
+  bool testPassed = 
+    parseAndCompare("2018-03-27T19:33:09+0000", "2018-03-27T19:33:09") &&
+    parseAndCompare("2018-03-27T19:33:09-0735", "2018-03-27T19:33:09") &&
+    parseAndCompare("2018-03-27T19:33:09+1043", "2018-03-27T19:33:09") &&
+    parseAndCompare("1900-01-01T00:00:00+0000", "1900-01-01T00:00:00") &&
+    parseAndCompare("2018-12-31T23:59:59+0000", "2018-12-31T23:59:59");
+
+  if (testPassed) {
+    printf("TEST PASSED\n");
+  } else {
+    printf("TEST FAILED\n");
+  }
+
+  return 0;
+}
diff --git a/tests/test_other.py b/tests/test_other.py
@@ -4479,6 +4479,10 @@ def test_strftime_zZ(self):
     Popen([PYTHON, EMCC, 'src.cpp']).communicate()
     self.assertContained('ok!', run_js('a.out.js'))
 
+  def test_strptime_symmetry(self):
+    Building.emcc(path_from_root('tests','strptime_symmetry.cpp'), output_filename='a.out.js')
+    self.assertContained('TEST PASSED', run_js('a.out.js'))    
+
   def test_truncate_from_0(self):
     open('src.cpp', 'w').write(r'''
 #include <cerrno>
