Merge pull request #5 from terbshaeusser/develop

Release 0.2

Author: terbshaeusser

Example/main.cpp

@@ -3,17 +3,28 @@
 #include <iostream>
 
 static void print(const cppcson::Value &value, bool isRoot, int32_t indent) {
-  if (value.isNull()) {
-    std::cout << "null";
-  } else if (value.isBool()) {
+  switch (value.getKind()) {
+  case cppcson::Value::Kind::Bool: {
     std::cout << value.asBool();
-  } else if (value.isInt()) {
+    break;
+  }
+  case cppcson::Value::Kind::Int: {
     std::cout << value.asInt();
-  } else if (value.isFloat()) {
+    break;
+  }
+  case cppcson::Value::Kind::Float: {
     std::cout << value.asFloat();
-  } else if (value.isString()) {
+    break;
+  }
+  case cppcson::Value::Kind::String: {
     std::cout << cppcson::escape(value.asString());
-  } else if (value.isArray()) {
+    break;
+  }
+  case cppcson::Value::Kind::Null: {
+    std::cout << "null";
+    break;
+  }
+  case cppcson::Value::Kind::Array: {
     std::cout << "[";
 
     indent += 2;
@@ -24,23 +35,32 @@ static void print(const cppcson::Value &value, bool isRoot, int32_t indent) {
     indent -= 2;
 
     std::cout << std::endl << std::string(indent, ' ') << "]";
-  } else if (value.isObject()) {
+    break;
+  }
+  case cppcson::Value::Kind::Object: {
     if (!isRoot) {
       indent += 2;
     }
 
     auto skipNewline = isRoot;
 
-    for (auto &key : value.keys()) {
-      if (skipNewline) {
-        skipNewline = false;
-      } else {
-        std::cout << std::endl;
-      }
+    if (value.getItemCount() == 0) {
+      std::cout << "{}";
+    } else {
+      for (auto &key : value.keys()) {
+        if (skipNewline) {
+          skipNewline = false;
+        } else {
+          std::cout << std::endl;
+        }
 
-      std::cout << std::string(indent, ' ') << cppcson::escapeKey(key) << ": ";
-      print(value.item(key), false, indent);
+        std::cout << std::string(indent, ' ') << cppcson::escapeKey(key)
+                  << ": ";
+        print(value.item(key), false, indent);
+      }
     }
+    break;
+  }
   }
 }
 

Include/cppcson.hpp

@@ -116,9 +116,10 @@ class Keys {
 class Value {
   friend class Parser;
 
-private:
+public:
   enum class Kind { Bool, Int, Float, String, Null, Array, Object };
 
+private:
   union NonStrValue {
     bool boolValue;
     int64_t intValue;
@@ -177,6 +178,8 @@ class Value {
 
   const std::string &getPath() const;
 
+  Kind getKind() const;
+
   bool isBool() const;
 
   bool isInt() const;

README.md

@@ -8,13 +8,21 @@ Features:
 * Meta information for parsed values (line, column etc.)
 * Proper error reporting
 * No dependencies
+* Thread safe
+* Support for \u escapes in strings
 
 Tested on:
 
 * Linux g++ 8.3.0
 * macOS Clang 10.0.1
 * Windows Visual Studio 2019
 
+Note:
+
+* The parser interprets the input as encoded in UTF-8. To use other Unicode
+encodings such as UTF-16, have a look on
+[utf8streams](https://github.com/terbshaeusser/utf8streams).
+
 ## Requirements
 
 * CMake (version 3.10 or later)

Source/cppcson.cpp

@@ -256,6 +256,8 @@ const Location &Value::getLocation() const { return location; }
 
 const std::string &Value::getPath() const { return path; }
 
+Value::Kind Value::getKind() const { return kind; }
+
 bool Value::isBool() const { return kind == Kind::Bool; }
 
 bool Value::isInt() const { return kind == Kind::Int; }