@@ -17,7 +17,6 @@
1717namespace PureScript {
1818
1919#define COPY_DATA(src) \
20− type = src.type; \
2120 switch (type) { \
2221 case Type::Integer: i = src.i; break; \
2322 case Type::Double: d = src.d; break; \
@@ -37,7 +36,6 @@ namespace PureScript {
3736 }
3837
3938#define MOVE_DATA(src) \
40− type = src.type; \
4139 switch (type) { \
4240 case Type::Integer: i = src.i; break; \
4341 case Type::Double: d = src.d; break; \
@@ -56,32 +54,34 @@ namespace PureScript {
5654 default: assert(false && "Unsupported type in move"); \
5755 }
5856
59−any::any(const any& other) {
57+any::any(const any& other) : type(other.type) {
6058 COPY_DATA(other);
6159}
6260
63−any::any(any&& other) noexcept {
61+any::any(any&& other) noexcept : type(other.type) {
6462 MOVE_DATA(other);
6563}
6664
6765auto any::operator=(const any& rhs) -> any& {
66+ type = rhs.type;
6867 COPY_DATA(rhs);
6968 return *this;
7069}
7170
7271// Takes ownership -- might need to reconsider this
7372auto any::operator=(any& rhs) noexcept -> any& {
73+ type = rhs.type;
7474 MOVE_DATA(rhs);
7575 return *this;
7676}
7777
7878auto any::operator=(any&& rhs) noexcept -> any& {
79+ type = rhs.type;
7980 MOVE_DATA(rhs);
8081 return *this;
8182}
8283
8384any::~any() {
84− // std::cout << "destroy" << std::endl;
8585 switch (type) {
8686 case Type::Integer: ; break;
8787 case Type::Double: ; break;
@@ -225,10 +225,6 @@ any::operator string() const {
225225 return cast<string>();
226226}
227227
228−any::operator std::string() const {
229− return cast<string>();
230−}
231−
232228any::operator const map&() const {
233229 RETURN_VALUE(Type::Map, m, *)
234230}
@@ -257,16 +253,38 @@ auto any::extractValue(const any& a) -> const any& {
257253 return a;
258254}
259255
260−auto any::operator[](const map_key_t& rhs) const -> const any& {
261− RETURN_VALUE(Type::Map, m->at(rhs),)
256+auto any::operator[](const char rhs[]) const -> const any& {
257+ const any& val = extractValue(*this);
258+ assert(val.type == Type::Map);
259+ for (any::map::const_iterator it = val.m->begin(), end = val.m->end(); it != end; ++it) {
260+ if (it->first == rhs || strcmp(it->first, rhs) == 0) {
261+ return it->second;
262+ }
263+ }
264+ throw runtime_error("map key not found");
262265}
263266
264267auto any::operator[](const vector::size_type rhs) const -> const any& {
265− RETURN_VALUE(Type::Vector, v->at(rhs),)
268+ const any& val = extractValue(*this);
269+ assert(val.type == Type::Vector);
270+ return (*val.v)[rhs];
266271}
267272
268273auto any::operator[](const any& rhs) const -> const any& {
269− RETURN_VALUE(Type::Vector, v->at(rhs.cast<long>()),)
274+ const any& val = extractValue(*this);
275+ assert(val.type == Type::Vector);
276+ return (*val.v)[rhs.cast<long>()];
277+}
278+
279+auto any::contains(const char key[]) const -> bool {
280+ const any& val = extractValue(*this);
281+ assert(val.type == Type::Map);
282+ for (any::map::const_iterator it = val.m->begin(), end = val.m->end(); it != end; ++it) {
283+ if (it->first == key || strcmp(it->first, key) == 0) {
284+ return true;
285+ }
286+ }
287+ return false;
270288}
271289
272290//-----------------------------------------------------------------------------