@@ -2,6 +2,8 @@ CXXFLAGS=-Werror -Wall jsonxx_test: jsonxx_test.cc jsonxx.o +jsonxx.o: jsonxx.h jsonxx.cc + test: jsonxx_test ./jsonxx_test Makefile @@ -134,6 +134,7 @@ bool Value::parse(std::istream& input) { return true; } if (parse_number(input, &integer_value_)) { + type_ = INTEGER_; return true; } @@ -148,16 +149,24 @@ bool Value::parse(std::istream& input) { return false; } +Array::~Array() { + for (unsigned int i = 0; i < values_.size(); ++i) { + delete values_[i]; + } +} + bool Array::parse(std::istream& input) { if (!match("[", input)) { return false; } do { - Value v; - if (!v.parse(input)) { + Value* v = new Value(); + if (!v->parse(input)) { + delete v; break; } + values_.push_back(v); } while (match(",", input)); if (!match("]", input)) { jsonxx.cc @@ -2,6 +2,7 @@ #include <cassert> #include <iostream> +#include <vector> namespace jsonxx { @@ -11,9 +12,23 @@ class Object { bool parse(std::istream& input); }; +class Value; + class Array { public: + ~Array(); bool parse(std::istream& input); + + unsigned int size() { return values_.size(); } + + template <typename T> + bool is(unsigned int i); + + template <typename T> + T& get(unsigned int i); + + private: + std::vector<Value*> values_; }; // A value could be a number, an array, a string, an object, a @@ -28,7 +43,7 @@ class Value { template<typename T> bool is(); template<typename T> - T get(); + T& get(); private: Value(const Value&); Value& operator=(const Value&); @@ -46,6 +61,18 @@ class Value { }; }; +template <typename T> +bool Array::is(unsigned int i) { + assert(i < size()); + return values_[i]->is<T>(); +} + +template <typename T> +T& Array::get(unsigned int i) { + assert(i < size()); + return values_[i]->get<T>(); +} + template<> inline bool Value::is<Value::Null>() { return type_ == NULL_; @@ -62,15 +89,26 @@ inline bool Value::is<std::string>() { } template<> -inline bool Value::get<bool>() { +inline bool Value::is<long>() { + return type_ == INTEGER_; +} + +template<> +inline bool& Value::get<bool>() { assert(is<bool>()); return bool_value_; } template<> -inline std::string Value::get<std::string>() { +inline std::string& Value::get<std::string>() { assert(is<std::string>()); return *string_value_; } +template<> +inline long& Value::get<long>() { + assert(is<long>()); + return integer_value_; +} + } // namespace jsonxx jsonxx.h @@ -104,5 +104,9 @@ int main() { istringstream input(teststr); Array v; assert(v.parse(input)); + assert(v.is<std::string>(0)); + assert("field1" == v.get<std::string>(0)); + assert(v.is<long>(1)); + assert(6 == v.get<long>(1)); } } jsonxx_test.cc 4e519afbba3e7c67c509b757501b7f0fc5a660bc Hong Jiang hjiang@glaptop.local http://github.com/hjiang/jsonxx/commit/357da1eb054dd119a8ab87eb6eedd6cd321b2212 357da1eb054dd119a8ab87eb6eedd6cd321b2212 2008-12-04T18:05:00-08:00 2008-12-04T18:05:00-08:00 Added accessors for Array. 27c5a9457c25a0beecb6919272175349ad7af323 Hong Jiang hjiang@glaptop.local