From cc06bc334a39d78d5bd580438f3a92863a2b78df Mon Sep 17 00:00:00 2001 From: Sean Middleditch Date: Sat, 16 Jan 2010 20:15:33 -0800 Subject: [PATCH] cleanup code --- Makefile | 2 +- janssonxx.h | 151 ++++++--------- janssonxx.tcc | 582 ++++++++++++++++++++++++++++++++++++++++++++-------------- 3 files changed, 497 insertions(+), 238 deletions(-) diff --git a/Makefile b/Makefile index 21f68e6..9352227 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ JANSSON_LIBS := $(shell pkg-config --libs jansson) all: test -test-bin: test.cc janssonxx.h Makefile +test-bin: test.cc janssonxx.h janssonxx.tcc Makefile $(CXX) -o $@ -g -O0 -Wall $(JANSSON_CFLAGS) $< $(JANSSON_LIBS) test: test-bin diff --git a/janssonxx.h b/janssonxx.h index bac4317..f040ec2 100644 --- a/janssonxx.h +++ b/janssonxx.h @@ -16,12 +16,13 @@ #include namespace jansson { - // include in the jansson namespace -# include + // include Jansson C library in the jansson namespace + #include class Iterator; class Value; + // implementation details; do not use directly namespace _private { class ElementProxy; class PropertyProxy; @@ -40,20 +41,20 @@ namespace jansson { ValueBase(json_t* json) : _Base(json) {} // assignment operator - ValueBase& operator=(const Value& value) { _Base::operator=(value); return *this; } + inline ValueBase& operator=(const Value& value); // check value type - bool is_undefined() const { return _Base::as_json() == 0; } - bool is_object() const { return json_is_object(_Base::as_json()); } - bool is_array() const { return json_is_array(_Base::as_json()); } - bool is_string() const { return json_is_string(_Base::as_json()); } - bool is_integer() const { return json_is_integer(_Base::as_json()); } - bool is_real() const { return json_is_real(_Base::as_json()); } - bool is_number() const { return json_is_number(_Base::as_json()); } - bool is_true() const { return json_is_true(_Base::as_json()); } - bool is_false() const { return json_is_false(_Base::as_json()); } - bool is_boolean() const { return json_is_boolean(_Base::as_json()); } - bool is_null() const { return json_is_null(_Base::as_json()); } + inline bool is_undefined() const; + inline bool is_object() const; + inline bool is_array() const; + inline bool is_string() const; + inline bool is_integer() const; + inline bool is_real() const; + inline bool is_number() const; + inline bool is_true() const; + inline bool is_false() const; + inline bool is_boolean() const; + inline bool is_null() const; // get size of array or object inline unsigned int size() const; @@ -121,6 +122,12 @@ namespace jansson { // insert an item into an array at a given index inline _Base& insert_at(unsigned int index, const Value& value); + + // write the value to a file + inline int save_file(const char* path, int flags = 0) const; + + // write the value to a string (caller must deallocate with free()!) + inline char* save_string(int flags = 0) const; }; // represents any JSON value, private base @@ -136,27 +143,17 @@ namespace jansson { explicit Basic(json_t* value) : _value(json_incref(value)) {} // free Value resources - ~Basic() { json_decref(_value); } + inline ~Basic(); // copy an existing Value - Basic& operator=(const Basic& e) { - if (&e != this) { - json_decref(_value); - _value = json_incref(e._value); - } - return *this; - } + inline Basic& operator=(const Basic& e); // get the underlying json_t - json_t* as_json() const { return _value; } + inline json_t* as_json() const; protected: // take ownership of a json_t (does not increase reference count) - static Basic _take(json_t* json) { - Basic v; - v._value = json; - return v; - } + static inline Basic _take(json_t* json); private: // internal value pointer @@ -173,7 +170,7 @@ namespace jansson { inline ElementProxy& operator=(const Value& value); // get the proxied element - json_t* as_json() const { return json_array_get(_array, _index); } + inline json_t* as_json() const; private: // array object we wrap @@ -193,7 +190,7 @@ namespace jansson { inline PropertyProxy& operator=(const Value& value); // get the proxied element - json_t* as_json() const { return json_object_get(_object, _key); } + inline json_t* as_json() const; private: // array object we wrap @@ -224,86 +221,63 @@ namespace jansson { explicit Value(json_t* json) : _private::ValueBase<_private::Basic>(json) {} // construct Value from input - static inline Value from(const char* value) { return Value::_take(json_string(value)); } - static inline Value from(const std::string& value) { return from(value.c_str()); } - static inline Value from(bool value) { return Value::_take(value ? json_true() : json_false()); } - static inline Value from(signed int value) { return Value::_take(json_integer(value)); } - static inline Value from(unsigned int value) { return Value::_take(json_integer(value)); } - static inline Value from(signed short value) { return Value::_take(json_integer(value)); } - static inline Value from(unsigned short value) { return Value::_take(json_integer(value)); } - static inline Value from(signed long value) { return Value::_take(json_integer(value)); } - static inline Value from(unsigned long value) { return Value::_take(json_integer(value)); } - static inline Value from(float value) { return Value::_take(json_real(value)); } - static inline Value from(double value) { return Value::_take(json_real(value)); } + static inline Value from(const char* value); + static inline Value from(const std::string& value); + static inline Value from(bool value); + static inline Value from(signed int value); + static inline Value from(unsigned int value); + static inline Value from(signed short value); + static inline Value from(unsigned short value); + static inline Value from(signed long value); + static inline Value from(unsigned long value); + static inline Value from(float value); + static inline Value from(double value); // create a new empty object - static inline Value object() { return Value::_take(json_object()); } + static inline Value object(); // create a new empty array - static inline Value array() { return Value::_take(json_array()); } + static inline Value array(); // create a new null value - static inline Value null() { return Value::_take(json_null()); } + static inline Value null(); // load a file as a JSON value - static Value load_file(const char* path, json_error_t* error = 0) { - return Value::_take(json_load_file(path, error)); - } + static inline Value load_file(const char* path, json_error_t* error = 0); // load a string as a JSON value - static Value load_string(const char* string, json_error_t* error = 0) { - return Value::_take(json_loads(string, error)); - } - - // write the value to a file - int save_file(const char* path, int flags = 0) const { - return json_dump_file(as_json(), path, flags); - } - - // write the value to a string (caller must deallocate with free()!) - char* save_string(int flags = 0) const { - return json_dumps(as_json(), flags); - } + static inline Value load_string(const char* string, json_error_t* error = 0); }; // iterators over a JSON object class Iterator { public: // construct a new iterator for a given object - Iterator(const Value& value) : _object(value), _iter(0) { - _iter = json_object_iter(_object.as_json()); - } + inline Iterator(const Value& value); // construct a new iterator for a given object - Iterator(const _private::ValueBase<_private::PropertyProxy>& value) : _object(value.as_json()), _iter(0) { - _iter = json_object_iter(_object.as_json()); - } + inline Iterator(const _private::ValueBase<_private::PropertyProxy>& value); // increment iterator - void next() { - _iter = json_object_iter_next(_object.as_json(), _iter); - } + inline void next(); - Iterator& operator++() { next(); return *this; } + inline Iterator& operator++(); // test if iterator is still valid - bool valid() const { return _iter != 0; } - operator bool() const { return valid(); } + inline bool valid() const; + + inline operator bool() const; // get key - const char* ckey() const { - return json_object_iter_key(_iter); - } + inline const char* ckey() const; - std::string key() const { return ckey(); } + inline std::string key() const; // get value - const Value value() const { - return Value(json_object_iter_value(_iter)); - } + inline const Value value() const; // dereference value - const Value operator*() const { return value(); } + inline const Value operator*() const; private: // disallow copying @@ -320,23 +294,10 @@ namespace jansson { } // namespace jansson // stream JSON value out -std::ostream& operator<<(std::ostream& os, const jansson::Value& value) { - char* tmp = value.save_string(); - if (tmp != 0) { - os << tmp; - free(tmp); - } - return os; -} +inline std::ostream& operator<<(std::ostream& os, const jansson::Value& value); // read JSON value -std::istream& operator>>(std::istream& is, jansson::Value& value) { - std::stringstream tmp; - while (is) - tmp << static_cast(is.get()); - value = jansson::Value::load_string(tmp.str().c_str()); - return is; -} +inline std::istream& operator>>(std::istream& is, jansson::Value& value); #include "janssonxx.tcc" diff --git a/janssonxx.tcc b/janssonxx.tcc index 2ba753e..cdbadd8 100644 --- a/janssonxx.tcc +++ b/janssonxx.tcc @@ -1,158 +1,456 @@ -// get size of array or object -template -unsigned int jansson::_private::ValueBase<_Base>::size() const { - if (is_object()) - return json_object_size(_Base::as_json()); - else - return json_array_size(_Base::as_json()); -} +namespace jansson { + namespace _private { + // assignment operator + template + ValueBase<_Base>& ValueBase<_Base>::operator=(const Value& value) { + _Base::operator=(value); + return *this; + } -// get value at array index (const version) -template -const jansson::Value jansson::_private::ValueBase<_Base>::at(unsigned int index) const { - return jansson::Value(json_array_get(_Base::as_json(), index)); -} + // check value type + template + bool ValueBase<_Base>::is_undefined() const { + return _Base::as_json() == 0; + } -template -const jansson::Value jansson::_private::ValueBase<_Base>::operator[](signed int index) const { return at(index); } -template -const jansson::Value jansson::_private::ValueBase<_Base>::operator[](unsigned int index) const { return at(index); } -template -const jansson::Value jansson::_private::ValueBase<_Base>::operator[](signed short index) const { return at(index); } -template -const jansson::Value jansson::_private::ValueBase<_Base>::operator[](unsigned short index) const { return at(index); } -template -const jansson::Value jansson::_private::ValueBase<_Base>::operator[](signed long index) const { return at(index); } -template -const jansson::Value jansson::_private::ValueBase<_Base>::operator[](unsigned long index) const { return at(index); } - -// get value at array index (non-const version) -template -jansson::_private::ValueBase jansson::_private::ValueBase<_Base>::at(unsigned int index) { - return ElementProxy(_Base::as_json(), index); -} + template + bool ValueBase<_Base>::is_object() const { + return json_is_object(_Base::as_json()); + } -template -jansson::_private::ValueBase jansson::_private::ValueBase<_Base>::operator[](signed int index) { return at(index); } -template -jansson::_private::ValueBase jansson::_private::ValueBase<_Base>::operator[](unsigned int index) { return at(index); } -template -jansson::_private::ValueBase jansson::_private::ValueBase<_Base>::operator[](signed short index) { return at(index); } -template -jansson::_private::ValueBase jansson::_private::ValueBase<_Base>::operator[](unsigned short index) { return at(index); } -template -jansson::_private::ValueBase jansson::_private::ValueBase<_Base>::operator[](signed long index) { return at(index); } -template -jansson::_private::ValueBase jansson::_private::ValueBase<_Base>::operator[](unsigned long index) { return at(index); } - -// get object property (const version) -template -const jansson::Value jansson::_private::ValueBase<_Base>::get(const char* key) const { - return jansson::Value(json_object_get(_Base::as_json(), key)); -} + template + bool ValueBase<_Base>::is_array() const { + return json_is_array(_Base::as_json()); + } -template -const jansson::Value jansson::_private::ValueBase<_Base>::get(const std::string& key) const { return get(key.c_str()); } -template -const jansson::Value jansson::_private::ValueBase<_Base>::operator[](const char* key) const { return get(key); } -template -const jansson::Value jansson::_private::ValueBase<_Base>::operator[](const std::string& key) const { return get(key.c_str()); } - -// get object property (non-const version) -template -jansson::_private::ValueBase jansson::_private::ValueBase<_Base>::get(const char* key) { - return PropertyProxy(_Base::as_json(), key); -} + template + bool ValueBase<_Base>::is_string() const { + return json_is_string(_Base::as_json()); + } -template -jansson::_private::ValueBase jansson::_private::ValueBase<_Base>::get(const std::string& key) { return get(key.c_str()); } -template -jansson::_private::ValueBase jansson::_private::ValueBase<_Base>::operator[](const char* key) { return get(key); } -template -jansson::_private::ValueBase jansson::_private::ValueBase<_Base>::operator[](const std::string& key) { return get(key.c_str()); } - -// clear all array/object values -template -void jansson::_private::ValueBase<_Base>::clear() { - if (is_object()) - json_object_clear(_Base::as_json()); - else - json_array_clear(_Base::as_json()); -} + template + bool ValueBase<_Base>::is_integer() const { + return json_is_integer(_Base::as_json()); + } -// get value cast to specified type -template -const char* jansson::_private::ValueBase<_Base>::as_cstring() const { return json_string_value(_Base::as_json()); } -template -std::string jansson::_private::ValueBase<_Base>::as_string() const { - const char* tmp = as_cstring(); - return tmp == 0 ? "" : tmp; -} -template -int jansson::_private::ValueBase<_Base>::as_integer() const { return json_integer_value(_Base::as_json()); } -template -double jansson::_private::ValueBase<_Base>::as_real() const { return json_real_value(_Base::as_json()); } -template -double jansson::_private::ValueBase<_Base>::as_number() const { return json_number_value(_Base::as_json()); } -template -bool jansson::_private::ValueBase<_Base>::as_boolean() const { return is_true(); } - -// set an object property (converts value to object is not one already) -template - _Base& jansson::_private::ValueBase<_Base>::set_key(const char* key, const jansson::Value& value) { - json_object_set(_Base::as_json(), key, value._Base::as_json()); - return *this; -} + template + bool ValueBase<_Base>::is_real() const { + return json_is_real(_Base::as_json()); + } -template - _Base& jansson::_private::ValueBase<_Base>::set_key(const std::string& key, const jansson::Value& value) { - return set_key(key.c_str(), value); -} + template + bool ValueBase<_Base>::is_number() const { + return json_is_number(_Base::as_json()); + } -// set an array index (converts value to object is not one already) -template - _Base& jansson::_private::ValueBase<_Base>::set_at(unsigned int index, const jansson::Value& value) { - if (index == size()) - json_array_append(_Base::as_json(), value._Base::as_json()); - else - json_array_set(_Base::as_json(), index, value._Base::as_json()); - return *this; -} + template + bool ValueBase<_Base>::is_true() const { + return json_is_true(_Base::as_json()); + } -// delete an object key -template - _Base& jansson::_private::ValueBase<_Base>::del_key(const char* key) { - json_object_del(_Base::as_json(), key); - return *this; -} + template + bool ValueBase<_Base>::is_false() const { + return json_is_false(_Base::as_json()); + } -template - _Base& jansson::_private::ValueBase<_Base>::del_key(const std::string& key) { - return del_key(key.c_str()); -} + template + bool ValueBase<_Base>::is_boolean() const { + return json_is_boolean(_Base::as_json()); + } -// delete an item from an array by index -template - _Base& jansson::_private::ValueBase<_Base>::del_at(unsigned int index) { - json_array_remove(_Base::as_json(), index); - return *this; -} + template + bool ValueBase<_Base>::is_null() const { + return json_is_null(_Base::as_json()); + } -// insert an item into an array at a given index -template - _Base& jansson::_private::ValueBase<_Base>::insert_at(unsigned int index, const jansson::Value& value) { - json_array_insert(_Base::as_json(), index, value._Base::as_json()); - return *this; -} + // get size of array or object + template + unsigned int ValueBase<_Base>::size() const { + if (is_object()) + return json_object_size(_Base::as_json()); + else + return json_array_size(_Base::as_json()); + } + + // get value at array index (const version) + template + const Value ValueBase<_Base>::at(unsigned int index) const { + return Value(json_array_get(_Base::as_json(), index)); + } + + template + const Value ValueBase<_Base>::operator[](signed int index) const { return at(index); } + template + const Value ValueBase<_Base>::operator[](unsigned int index) const { return at(index); } + template + const Value ValueBase<_Base>::operator[](signed short index) const { return at(index); } + template + const Value ValueBase<_Base>::operator[](unsigned short index) const { return at(index); } + template + const Value ValueBase<_Base>::operator[](signed long index) const { return at(index); } + template + const Value ValueBase<_Base>::operator[](unsigned long index) const { return at(index); } + + // get value at array index (non-const version) + template + ValueBase ValueBase<_Base>::at(unsigned int index) { + return ElementProxy(_Base::as_json(), index); + } + + template + ValueBase ValueBase<_Base>::operator[](signed int index) { + return at(index); + } + + template + ValueBase ValueBase<_Base>::operator[](unsigned int index) { + return at(index); + } + + template + ValueBase ValueBase<_Base>::operator[](signed short index) { + return at(index); + } + + template + ValueBase ValueBase<_Base>::operator[](unsigned short index) { + return at(index); + } + + template + ValueBase ValueBase<_Base>::operator[](signed long index) { + return at(index); + } + + template + ValueBase ValueBase<_Base>::operator[](unsigned long index) { + return at(index); + } + + // get object property (const version) + template + const Value ValueBase<_Base>::get(const char* key) const { + return Value(json_object_get(_Base::as_json(), key)); + } + + template + const Value ValueBase<_Base>::get(const std::string& key) const { + return get(key.c_str()); + } + + template + const Value ValueBase<_Base>::operator[](const char* key) const { + return get(key); + } + + template + const Value ValueBase<_Base>::operator[](const std::string& key) const { + return get(key.c_str()); + } + + // get object property (non-const version) + template + ValueBase ValueBase<_Base>::get(const char* key) { + return PropertyProxy(_Base::as_json(), key); + } + + template + ValueBase ValueBase<_Base>::get(const std::string& key) { + return get(key.c_str()); + } + + template + ValueBase ValueBase<_Base>::operator[](const char* key) { + return get(key); + } + + template + ValueBase ValueBase<_Base>::operator[](const std::string& key) { + return get(key.c_str()); + } + + // clear all array/object values + template + void ValueBase<_Base>::clear() { + if (is_object()) + json_object_clear(_Base::as_json()); + else + json_array_clear(_Base::as_json()); + } + + // get value cast to specified type + template + const char* ValueBase<_Base>::as_cstring() const { + return json_string_value(_Base::as_json()); + } + + template + std::string ValueBase<_Base>::as_string() const { + const char* tmp = as_cstring(); + return tmp == 0 ? "" : tmp; + } + + template + int ValueBase<_Base>::as_integer() const { + return json_integer_value(_Base::as_json()); + } + + template + double ValueBase<_Base>::as_real() const { + return json_real_value(_Base::as_json()); + } + + template + double ValueBase<_Base>::as_number() const { + return json_number_value(_Base::as_json()); + } + + template + bool ValueBase<_Base>::as_boolean() const { + return is_true(); + } + + // set an object property (converts value to object is not one already) + template + _Base& ValueBase<_Base>::set_key(const char* key, const Value& value) { + json_object_set(_Base::as_json(), key, value._Base::as_json()); + return *this; + } + + template + _Base& ValueBase<_Base>::set_key(const std::string& key, const Value& value) { + return set_key(key.c_str(), value); + } + + // set an array index (converts value to object is not one already) + template + _Base& ValueBase<_Base>::set_at(unsigned int index, const Value& value) { + if (index == size()) + json_array_append(_Base::as_json(), value._Base::as_json()); + else + json_array_set(_Base::as_json(), index, value._Base::as_json()); + return *this; + } + + // delete an object key + template + _Base& ValueBase<_Base>::del_key(const char* key) { + json_object_del(_Base::as_json(), key); + return *this; + } + + template + _Base& ValueBase<_Base>::del_key(const std::string& key) { + return del_key(key.c_str()); + } + + // delete an item from an array by index + template + _Base& ValueBase<_Base>::del_at(unsigned int index) { + json_array_remove(_Base::as_json(), index); + return *this; + } + + // insert an item into an array at a given index + template + _Base& ValueBase<_Base>::insert_at(unsigned int index, const Value& value) { + json_array_insert(_Base::as_json(), index, value._Base::as_json()); + return *this; + } + + // write the value to a file + template + int ValueBase<_Base>::save_file(const char* path, int flags) const { + return json_dump_file(_Base::as_json(), path, flags); + } + + // write the value to a string (caller must deallocate with free()!) + template + char* ValueBase<_Base>::save_string(int flags) const { + return json_dumps(_Base::as_json(), flags); + } + + Basic::~Basic() { + json_decref(_value); + } + + // copy an existing Value + Basic& Basic::operator=(const Basic& e) { + if (&e != this) { + json_decref(_value); + _value = json_incref(e._value); + } + return *this; + } + + // get the underlying json_t + json_t* Basic::as_json() const { + return _value; + } + + // take ownership of a json_t (does not increase reference count) + Basic Basic::_take(json_t* json) { + Basic v; + v._value = json; + return v; + } + + // assign value to proxied array element + ElementProxy& ElementProxy::operator=(const Value& value) { + json_array_set(_array, _index, value.as_json()); + return *this; + } + + // get the proxied element + json_t* ElementProxy::as_json() const { + return json_array_get(_array, _index); + } + + // assign value to proxied object property + PropertyProxy& PropertyProxy::operator=(const Value& value) { + json_object_set(_object, _key, value.as_json()); + return *this; + } + + json_t* PropertyProxy::as_json() const { + return json_object_get(_object, _key); + } + + } // namespace jansson::_private + + // construct Value from input + Value Value::from(const char* value) { + return Value::_take(json_string(value)); + } + + Value Value::from(const std::string& value) { + return Value::from(value.c_str()); + } + + Value Value::from(bool value) { + return Value::_take(value ? json_true() : json_false()); + } + + Value Value::from(signed int value) { + return Value::_take(json_integer(value)); + } + + Value Value::from(unsigned int value) { + return Value::_take(json_integer(value)); + } + + Value Value::from(signed short value) { + return Value::_take(json_integer(value)); + } + + Value Value::from(unsigned short value) { + return Value::_take(json_integer(value)); + } + + Value Value::from(signed long value) { + return Value::_take(json_integer(value)); + } + + Value Value::from(unsigned long value) { + return Value::_take(json_integer(value)); + } + + Value Value::from(float value) { + return Value::_take(json_real(value)); + } + + Value Value::from(double value) { + return Value::_take(json_real(value)); + } + + // create a new empty object + Value Value::object() { + return Value::_take(json_object()); + } + + // create a new empty array + Value Value::array() { + return Value::_take(json_array()); + } + + // create a new null value + Value Value::null() { + return Value::_take(json_null()); + } + + // load a file as a JSON value + Value Value::load_file(const char* path, json_error_t* error) { + return Value::_take(json_load_file(path, error)); + } + + // load a string as a JSON value + Value Value::load_string(const char* string, json_error_t* error) { + return Value::_take(json_loads(string, error)); + } + + // construct a new iterator for a given object + Iterator::Iterator(const Value& value) : _object(value), _iter(0) { + _iter = json_object_iter(_object.as_json()); + } + + // construct a new iterator for a given object + Iterator::Iterator(const _private::ValueBase<_private::PropertyProxy>& value) : + _object(value.as_json()), _iter(0) { + _iter = json_object_iter(_object.as_json()); + } + + // increment iterator + void Iterator::next() { + _iter = json_object_iter_next(_object.as_json(), _iter); + } + + Iterator& Iterator::operator++() { next(); return *this; } + + // test if iterator is still valid + bool Iterator::valid() const { + return _iter != 0; + } + + Iterator::operator bool() const { + return valid(); + } + + // get key + const char* Iterator::ckey() const { + return json_object_iter_key(_iter); + } + + std::string Iterator::key() const { + return ckey(); + } + + // get value + const Value Iterator::value() const { + return Value(json_object_iter_value(_iter)); + } + + // dereference value + const Value Iterator::operator*() const { + return value(); + } + +} // namespace jansson -// assign value to proxied array element -jansson::_private::ElementProxy& jansson::_private::ElementProxy::operator=(const Value& value) { - json_array_set(_array, _index, value.as_json()); - return *this; +// stream JSON value out +std::ostream& operator<<(std::ostream& os, const jansson::Value& value) { + char* tmp = value.save_string(); + if (tmp != 0) { + os << tmp; + free(tmp); + } + return os; } -// assign value to proxied object property -jansson::_private::PropertyProxy& jansson::_private::PropertyProxy::operator=(const Value& value) { - json_object_set(_object, _key, value.as_json()); - return *this; +// read JSON value +std::istream& operator>>(std::istream& is, jansson::Value& value) { + std::stringstream tmp; + while (is) + tmp << static_cast(is.get()); + value = jansson::Value::load_string(tmp.str().c_str()); + return is; } -- 2.7.4