Further improvements to HDF5 I/O, and TESTS

autogen/prototype.json

@@ -11,7 +11,10 @@
         "   Optional (defaults to GNDStk).",
         "",
         "JSONDir",
-        "   Directory where the listed .json input files are located",
+        "   Directory where the .json input files are located",
+        "",
+        "JSONFiles",
+        "   The .json input files",
         "",
         "TO AUTOGENERATE THE PROTOTYPE IN THE REAL GNDStk HIERARCHY",
         "   Set Path to ../.. if you run json2class.exe from within",

autogen/v1.9.json

@@ -1,5 +1,5 @@
 {
-    "GNDSDir": "test",
+    "Path": "../..",
     "Version": "v1.9",
 
     "JSONDir": "v1.9",

src/GNDStk.hpp

@@ -28,6 +28,7 @@
 #include <cmath>
 #include <cstdint>
 #include <cstdio>
+#include <cstring>
 #include <fstream>
 #include <iomanip>
 #include <iostream>

src/GNDStk/Component.hpp

@@ -94,6 +94,26 @@ class Component : public BlockData<hasBlockData,DATATYPE>
       }
    }
 
+   // has
+   // Usable in C++ "compile-time if" (a.k.a. "if constexpr") statements
+   template<
+      class EXTRACTOR, class THIS = DERIVED,
+      class = decltype(std::declval<EXTRACTOR>()(THIS{}))
+   >
+   static constexpr bool has(const Lookup<false,EXTRACTOR> &)
+   {
+      return true;
+   }
+
+   template<
+      class EXTRACTOR, bool F,
+      class = std::enable_if_t<F == false>
+   >
+   static constexpr bool has(const Lookup<F,EXTRACTOR> &)
+   {
+      return false;
+   }
+
    // Component << string
    // Meaning: read the string's content (currently XML, JSON, or HDF5) into
    // an object of the Component's DERIVED class. Uses Node's << string, which

src/GNDStk/HDF5.hpp

@@ -9,7 +9,10 @@
 class HDF5 {
 public:
 
-   static inline bool flat = true;
+   // todo: It's possible that we'll want these to be non-static, so that they
+   // can differ between HDF5 objects. That might, however, constitute excessive
+   // generality. Think about this.
+   static inline bool reduced = true;
    static inline bool typed = true;
 
    // data

src/GNDStk/HDF5/src/detail.hpp

@@ -13,9 +13,21 @@ inline std::string guessType(std::istringstream &iss, const std::string &type)
    iss.clear();
    iss.seekg(0);
 
+   // Below, the extra test involving iss.peek() proved to be necessary in
+   // a couple of situations. Without it, a "date" string like, for example,
+   // 2011-10-15, actually reads into three ints: 2011, -10, and -15, so that
+   // the type guesser thinks "array of ints". One might have thought that
+   // the >> operator would want whitespace between successive ints, but it
+   // doesn't. :-/ A similar thing happened with, for example, a "version"
+   // string like "8.0.1", which without the extra test looked to the type
+   // guesser as two doubles. To fix this, we now directly check that after
+   // any value is successfully read, we see either whitespace or EOF. (The
+   // EOF check is done first; it's no doubt faster, and we anticipate that
+   // many times we're checking short strings with just one value in them,
+   // so that the EOF is likely to be there.)
    T value; std::size_t count = 0;
    for ( ; !iss.eof() ; ++count)
-      if (!(iss >> value))
+      if (!(iss >> value && (iss.peek() == EOF || isspace(iss.peek()))))
          return "";
    return count ? count > 1 ? type+"s" : type : "";
 }