Add Variant operators for Dictionary and Array

libriscv · Sep 11, 2024 · 1ca559f · 1ca559f
1 parent 8e91614
commit 1ca559f
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/program/cpp/api/array.hpp b/program/cpp/api/array.hpp
@@ -64,6 +64,10 @@ inline Variant::Variant(const Array& a) {
 	v.i = a.get_variant_index();
 }
 
+inline Variant::operator Array() const {
+	return as_array();
+}
+
 class ArrayIterator {
 public:
 	ArrayIterator(const Array &array, unsigned idx) : m_array(array), m_idx(idx) {}

diff --git a/program/cpp/api/dictionary.hpp b/program/cpp/api/dictionary.hpp
@@ -49,6 +49,10 @@ inline Variant::Variant(const Dictionary &d) {
 	v.i = d.get_variant_index();
 }
 
+inline Variant::operator Dictionary() const {
+	return as_dictionary();
+}
+
 struct DictAccessor {
 	DictAccessor(const Dictionary &dict, const Variant &key) : m_dict(dict), m_key(key) {}
 

diff --git a/program/cpp/api/string.hpp b/program/cpp/api/string.hpp
@@ -53,10 +53,7 @@ inline Variant::Variant(const String &s) {
 }
 
 inline Variant::operator String() const {
-	if (m_type != STRING) {
-		api_throw("std::bad_cast", "Failed to cast Variant to String", this);
-	}
-	return String::from_variant_index(v.i);
+	return as_string();
 }
 
 inline String Variant::as_string() const {

diff --git a/program/cpp/api/variant.hpp b/program/cpp/api/variant.hpp
@@ -158,6 +158,8 @@ struct Variant
 	operator std::string() const; // String for STRING and PACKED_BYTE_ARRAY
 	operator std::u32string() const; // u32string for STRING, STRING_NAME
 	operator String() const;
+	operator Array() const;
+	operator Dictionary() const;
 
 	Object as_object() const;
 	Node as_node() const;