Adapt nyan to new specification

nyan/CMakeLists.txt

@@ -65,9 +65,12 @@ add_library(nyan SHARED
 	transaction.cpp
 	type.cpp
 	util.cpp
+	value_token.cpp
 	value/boolean.cpp
 	value/container.cpp
+	value/dict.cpp
 	value/file.cpp
+	value/none.cpp
 	value/number.cpp
 	value/object.cpp
 	value/orderedset.cpp

nyan/api_error.cpp

@@ -1,4 +1,4 @@
-// Copyright 2019-2019 the nyan authors, LGPLv3+. See copying.md for legal info.
+// Copyright 2019-2020 the nyan authors, LGPLv3+. See copying.md for legal info.
 
 #include "api_error.h"
 
@@ -8,40 +8,40 @@
 namespace nyan {
 
 APIError::APIError(const std::string &msg)
-	:
-	Error{msg} {}
+    :
+    Error{msg} {}
 
 
 InvalidObjectError::InvalidObjectError()
-	:
-	APIError("uninitialized object was used") {}
+    :
+    APIError("uninitialized object was used") {}
 
 
 MemberTypeError::MemberTypeError(const fqon_t &objname, const memberid_t &member,
                                  const std::string &real_type, const std::string &wrong_type)
-	:
-	APIError{
-	(static_cast<const std::ostringstream&>(
-		std::ostringstream{} << "type mismatch for member " << objname + "." << member
-		<< ": tried to convert real type " << real_type << " to " << wrong_type)
-	).str()},
-	name{objname},
-	member{member},
-	real_type{real_type},
-	wrong_type{wrong_type} {}
+    :
+    APIError{
+    (static_cast<const std::ostringstream&>(
+        std::ostringstream{} << "type mismatch for member " << objname + "." << member
+        << ": tried to convert real type " << real_type << " to " << wrong_type)
+    ).str()},
+    objname{objname},
+    member{member},
+    real_type{real_type},
+    wrong_type{wrong_type} {}
 
 
 ObjectNotFoundError::ObjectNotFoundError(const fqon_t &obj_name)
-	:
-	APIError{"object not found: " + obj_name},
-	name{obj_name} {}
+    :
+    APIError{"object not found: " + obj_name},
+    objname{obj_name} {}
 
 
 MemberNotFoundError::MemberNotFoundError(const fqon_t &obj_name,
                                          const memberid_t &member_name)
-	:
-	APIError{"Could not find member " + obj_name + "." + member_name},
-	obj_name{obj_name},
-	name{member_name} {}
+    :
+    APIError{"Could not find member " + obj_name + "." + member_name},
+    objname{obj_name},
+    name{member_name} {}
 
 } // namespace nyan

nyan/api_error.h

@@ -1,4 +1,4 @@
-// Copyright 2019-2019 the nyan authors, LGPLv3+. See copying.md for legal info.
+// Copyright 2019-2020 the nyan authors, LGPLv3+. See copying.md for legal info.
 #pragma once
 
 #include "error.h"
@@ -11,7 +11,7 @@ namespace nyan {
  */
 class APIError : public Error {
 public:
-	APIError(const std::string &msg);
+    APIError(const std::string &msg);
 };
 
 
@@ -22,7 +22,7 @@ class APIError : public Error {
  */
 class InvalidObjectError : public APIError {
 public:
-	InvalidObjectError();
+    InvalidObjectError();
 };
 
 
@@ -31,14 +31,29 @@ class InvalidObjectError : public APIError {
  */
 class MemberTypeError : public APIError {
 public:
-	MemberTypeError(const fqon_t &objname, const memberid_t &member,
-	                const std::string &real_type, const std::string &wrong_type);
+    MemberTypeError(const fqon_t &objname, const memberid_t &member,
+                    const std::string &real_type, const std::string &wrong_type);
 
 protected:
-	fqon_t name;
-	memberid_t member;
-	std::string real_type;
-	std::string wrong_type;
+    /**
+     * Name (identifier) of the object the member is part of.
+     */
+    fqon_t objname;
+
+    /**
+     * Name (identifier) of the member.
+     */
+    memberid_t member;
+
+    /**
+     * Type that the member should have assigned.
+     */
+    std::string real_type;
+
+    /**
+     * Type that the member has actually assigned.
+     */
+    std::string wrong_type;
 };
 
 
@@ -47,10 +62,13 @@ class MemberTypeError : public APIError {
  */
 class ObjectNotFoundError : public APIError {
 public:
-	ObjectNotFoundError(const fqon_t &objname);
+    ObjectNotFoundError(const fqon_t &objname);
 
 protected:
-	fqon_t name;
+    /**
+     * Name (identifier) of the object.
+     */
+    fqon_t objname;
 };
 
 
@@ -59,12 +77,19 @@ class ObjectNotFoundError : public APIError {
  */
 class MemberNotFoundError : public APIError {
 public:
-	MemberNotFoundError(const fqon_t &objname,
-	                    const memberid_t &membername);
+    MemberNotFoundError(const fqon_t &objname,
+                        const memberid_t &membername);
 
 protected:
-	fqon_t obj_name;
-	memberid_t name;
+    /**
+     * Name (identifier) of the object the member is part of.
+     */
+    fqon_t objname;
+
+    /**
+     * Name (identifier) of the member.
+     */
+    memberid_t name;
 };
 
 } // namespace nyan