From 25fb41044ca080b794cbf4e85ff10e74e571ea24 Mon Sep 17 00:00:00 2001 From: Andreas Stöckel Date: Sat, 18 Oct 2014 00:56:14 +0000 Subject: improved Variant.cpp, added ScriptEngine.hpp containing the script engine abstraction layer git-svn-id: file:///var/local/svn/basicwriter@72 daaaf23c-2e50-4459-9457-1e69db5a47bf --- src/core/script/Variant.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'src/core/script/Variant.cpp') diff --git a/src/core/script/Variant.cpp b/src/core/script/Variant.cpp index 623b396..a379735 100644 --- a/src/core/script/Variant.cpp +++ b/src/core/script/Variant.cpp @@ -24,9 +24,12 @@ namespace script { std::ostream& operator<< (std::ostream& os, const Variant &v) { switch (v.type) { - case VariantType::none: + case VariantType::null: os << "null"; break; + case VariantType::boolean: + os << (v.booleanValue ? "true" : "false"); + break; case VariantType::integer: os << v.integerValue; break; @@ -34,12 +37,12 @@ std::ostream& operator<< (std::ostream& os, const Variant &v) os << v.numberValue; break; case VariantType::string: - os << "\"" << v.stringValue << "\""; + os << "\"" << v.getStringValue() << "\""; break; case VariantType::array: { bool first = true; os << "["; - for (auto &v2 : v.arrayValue) { + for (auto &v2 : v.getArrayValue()) { if (!first) { os << ", "; } @@ -52,7 +55,7 @@ std::ostream& operator<< (std::ostream& os, const Variant &v) case VariantType::map: { bool first = true; os << "{"; - for (auto &v2 : v.mapValue) { + for (auto &v2 : v.getMapValue()) { if (!first) { os << ", "; } -- cgit v1.2.3