hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make (most) constant JSON::Value member functions available to constant objects, add constant equivalents where applicable.

Browse source
This commit is contained in:
Thulinma 2013-08-25 02:04:58 +02:00
parent 16343ed016
commit 07a4b61142
2 changed files with 78 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

74
lib/json.cpp
View file

@ -64,7 +64,7 @@ std::string JSON::Value::read_string(int separator, std::istream & fromstream){
return out; return out;
} }
std::string JSON::Value::string_escape(std::string val){ std::string JSON::Value::string_escape(const std::string val){
std::string out = "\""; std::string out = "\"";
for (unsigned int i = 0; i < val.size(); ++i){ for (unsigned int i = 0; i < val.size(); ++i){
switch (val[i]){ switch (val[i]){
@ -320,7 +320,7 @@ JSON::Value & JSON::Value::operator=(const unsigned int &rhs){
} }
/// Automatic conversion to long long int - returns 0 if not convertable. /// Automatic conversion to long long int - returns 0 if not convertable.
JSON::Value::operator long long int(){ JSON::Value::operator long long int() const{
if (myType == INTEGER){ if (myType == INTEGER){
return intVal; return intVal;
} }
@ -332,7 +332,7 @@ JSON::Value::operator long long int(){
/// Automatic conversion to std::string. /// Automatic conversion to std::string.
/// Returns the raw string value if available, otherwise calls toString(). /// Returns the raw string value if available, otherwise calls toString().
JSON::Value::operator std::string(){ JSON::Value::operator std::string() const{
if (myType == STRING){ if (myType == STRING){
return strVal; return strVal;
}else{ }else{
@ -346,7 +346,7 @@ JSON::Value::operator std::string(){
/// Automatic conversion to bool. /// Automatic conversion to bool.
/// Returns true if there is anything meaningful stored into this value. /// Returns true if there is anything meaningful stored into this value.
JSON::Value::operator bool(){ JSON::Value::operator bool() const{
if (myType == STRING){ if (myType == STRING){
return strVal != ""; return strVal != "";
} }
@ -369,15 +369,15 @@ JSON::Value::operator bool(){
} }
/// Explicit conversion to std::string. /// Explicit conversion to std::string.
const std::string JSON::Value::asString(){ const std::string JSON::Value::asString() const{
return (std::string) *this; return (std::string) *this;
} }
/// Explicit conversion to long long int. /// Explicit conversion to long long int.
const long long int JSON::Value::asInt(){ const long long int JSON::Value::asInt() const{
return (long long int) *this; return (long long int) *this;
} }
/// Explicit conversion to bool. /// Explicit conversion to bool.
const bool JSON::Value::asBool(){ const bool JSON::Value::asBool() const{
return (bool) *this; return (bool) *this;
} }
@ -385,7 +385,7 @@ const bool JSON::Value::asBool(){
/// Returns a direct reference for string type JSON::Value objects, /// Returns a direct reference for string type JSON::Value objects,
/// but a reference to a static empty string otherwise. /// but a reference to a static empty string otherwise.
/// \warning Only save to use when the JSON::Value is a string type! /// \warning Only save to use when the JSON::Value is a string type!
const std::string & JSON::Value::asStringRef(){ const std::string & JSON::Value::asStringRef() const{
static std::string ugly_buffer; static std::string ugly_buffer;
if (myType == STRING){ if (myType == STRING){
return strVal; return strVal;
@ -397,7 +397,7 @@ const std::string & JSON::Value::asStringRef(){
/// Returns a direct reference for string type JSON::Value objects, /// Returns a direct reference for string type JSON::Value objects,
/// a reference to an empty string otherwise. /// a reference to an empty string otherwise.
/// \warning Only save to use when the JSON::Value is a string type! /// \warning Only save to use when the JSON::Value is a string type!
const char * JSON::Value::c_str(){ const char * JSON::Value::c_str() const{
if (myType == STRING){ if (myType == STRING){
return strVal.c_str(); return strVal.c_str();
} }
@ -437,6 +437,24 @@ JSON::Value & JSON::Value::operator[](unsigned int i){
return arrVal[i]; return arrVal[i];
} }
/// Retrieves the JSON::Value at this position in the object.
/// Fails horribly if that values does not exist.
JSON::Value const & JSON::Value::operator[](const std::string i) const{
return objVal.at(i);
}
/// Retrieves the JSON::Value at this position in the object.
/// Fails horribly if that values does not exist.
JSON::Value const & JSON::Value::operator[](const char * i) const{
return objVal.at(i);
}
/// Retrieves the JSON::Value at this position in the array.
/// Fails horribly if that values does not exist.
JSON::Value const & JSON::Value::operator[](unsigned int i) const{
return arrVal[i];
}
/// Packs to a std::string for transfer over the network. /// Packs to a std::string for transfer over the network.
/// If the object is a container type, this function will call itself recursively and contain all contents. /// If the object is a container type, this function will call itself recursively and contain all contents.
/// As a side effect, this function clear the internal buffer of any object-types. /// As a side effect, this function clear the internal buffer of any object-types.
@ -582,7 +600,7 @@ std::string & JSON::Value::toNetPacked(){
/// Converts this JSON::Value to valid JSON notation and returns it. /// Converts this JSON::Value to valid JSON notation and returns it.
/// Makes absolutely no attempts to pretty-print anything. :-) /// Makes absolutely no attempts to pretty-print anything. :-)
std::string JSON::Value::toString(){ std::string JSON::Value::toString() const{
switch (myType){ switch (myType){
case INTEGER: { case INTEGER: {
std::stringstream st; std::stringstream st;
@ -597,7 +615,7 @@ std::string JSON::Value::toString(){
case ARRAY: { case ARRAY: {
std::string tmp = "["; std::string tmp = "[";
if (arrVal.size() > 0){ if (arrVal.size() > 0){
for (ArrIter it = ArrBegin(); it != ArrEnd(); it++){ for (ArrConstIter it = ArrBegin(); it != ArrEnd(); it++){
tmp += it->toString(); tmp += it->toString();
if (it + 1 != ArrEnd()){ if (it + 1 != ArrEnd()){
tmp += ","; tmp += ",";
@ -611,9 +629,9 @@ std::string JSON::Value::toString(){
case OBJECT: { case OBJECT: {
std::string tmp2 = "{"; std::string tmp2 = "{";
if (objVal.size() > 0){ if (objVal.size() > 0){
ObjIter it3 = ObjEnd(); ObjConstIter it3 = ObjEnd();
--it3; --it3;
for (ObjIter it2 = ObjBegin(); it2 != ObjEnd(); it2++){ for (ObjConstIter it2 = ObjBegin(); it2 != ObjEnd(); it2++){
tmp2 += string_escape(it2->first)+":"; tmp2 += string_escape(it2->first)+":";
tmp2 += it2->second.toString(); tmp2 += it2->second.toString();
if (it2 != it3){ if (it2 != it3){
@ -634,7 +652,7 @@ std::string JSON::Value::toString(){
/// Converts this JSON::Value to valid JSON notation and returns it. /// Converts this JSON::Value to valid JSON notation and returns it.
/// Makes an attempt at pretty-printing. /// Makes an attempt at pretty-printing.
std::string JSON::Value::toPrettyString(int indentation){ std::string JSON::Value::toPrettyString(int indentation) const{
switch (myType){ switch (myType){
case INTEGER: { case INTEGER: {
std::stringstream st; std::stringstream st;
@ -654,7 +672,7 @@ std::string JSON::Value::toPrettyString(int indentation){
case ARRAY: { case ARRAY: {
if (arrVal.size() > 0){ if (arrVal.size() > 0){
std::string tmp = "[\n" + std::string(indentation + 2, ' '); std::string tmp = "[\n" + std::string(indentation + 2, ' ');
for (ArrIter it = ArrBegin(); it != ArrEnd(); it++){ for (ArrConstIter it = ArrBegin(); it != ArrEnd(); it++){
tmp += it->toPrettyString(indentation + 2); tmp += it->toPrettyString(indentation + 2);
if (it + 1 != ArrEnd()){ if (it + 1 != ArrEnd()){
tmp += ", "; tmp += ", ";
@ -674,9 +692,9 @@ std::string JSON::Value::toPrettyString(int indentation){
shortMode = true; shortMode = true;
} }
std::string tmp2 = "{" + std::string((shortMode ? "" : "\n")); std::string tmp2 = "{" + std::string((shortMode ? "" : "\n"));
ObjIter it3 = ObjEnd(); ObjConstIter it3 = ObjEnd();
--it3; --it3;
for (ObjIter it2 = ObjBegin(); it2 != ObjEnd(); it2++){ for (ObjConstIter it2 = ObjBegin(); it2 != ObjEnd(); it2++){
tmp2 += (shortMode ? std::string("") : std::string(indentation + 2, ' ')) + string_escape(it2->first) + ":"; tmp2 += (shortMode ? std::string("") : std::string(indentation + 2, ' ')) + string_escape(it2->first) + ":";
tmp2 += it2->second.toPrettyString(indentation + 2); tmp2 += it2->second.toPrettyString(indentation + 2);
if (it2 != it3){ if (it2 != it3){
@ -800,8 +818,28 @@ JSON::ArrIter JSON::Value::ArrEnd(){
return arrVal.end(); return arrVal.end();
} }
/// Returns an iterator to the begin of the object map, if any.
JSON::ObjConstIter JSON::Value::ObjBegin() const{
return objVal.begin();
}
/// Returns an iterator to the end of the object map, if any.
JSON::ObjConstIter JSON::Value::ObjEnd() const{
return objVal.end();
}
/// Returns an iterator to the begin of the array, if any.
JSON::ArrConstIter JSON::Value::ArrBegin() const{
return arrVal.begin();
}
/// Returns an iterator to the end of the array, if any.
JSON::ArrConstIter JSON::Value::ArrEnd() const{
return arrVal.end();
}
/// Returns the total of the objects and array size combined. /// Returns the total of the objects and array size combined.
unsigned int JSON::Value::size(){ unsigned int JSON::Value::size() const{
return objVal.size() + arrVal.size(); return objVal.size() + arrVal.size();
} }

33
lib/json.h
View file

@ -24,6 +24,8 @@ namespace JSON {
typedef std::map<std::string, Value>::iterator ObjIter; typedef std::map<std::string, Value>::iterator ObjIter;
typedef std::deque<Value>::iterator ArrIter; typedef std::deque<Value>::iterator ArrIter;
typedef std::map<std::string, Value>::const_iterator ObjConstIter;
typedef std::deque<Value>::const_iterator ArrConstIter;
/// A JSON::Value is either a string or an integer, but may also be an object, array or null. /// A JSON::Value is either a string or an integer, but may also be an object, array or null.
class Value{ class Value{
@ -34,7 +36,7 @@ namespace JSON {
std::deque<Value> arrVal; std::deque<Value> arrVal;
std::map<std::string, Value> objVal; std::map<std::string, Value> objVal;
std::string read_string(int separator, std::istream & fromstream); std::string read_string(int separator, std::istream & fromstream);
std::string string_escape(std::string val); static std::string string_escape(const std::string val);
int c2hex(int c); int c2hex(int c);
static void skipToEnd(std::istream & fromstream); static void skipToEnd(std::istream & fromstream);
public: public:
@ -58,24 +60,27 @@ namespace JSON {
Value & operator=(const unsigned int &rhs); Value & operator=(const unsigned int &rhs);
Value & operator=(const bool &rhs); Value & operator=(const bool &rhs);
//converts to basic types //converts to basic types
operator long long int(); operator long long int() const;
operator std::string(); operator std::string() const;
operator bool(); operator bool() const;
const std::string asString(); const std::string asString() const;
const long long int asInt(); const long long int asInt() const;
const bool asBool(); const bool asBool() const;
const std::string & asStringRef(); const std::string & asStringRef() const;
const char * c_str(); const char * c_str() const;
//array operator for maps and arrays //array operator for maps and arrays
Value & operator[](const std::string i); Value & operator[](const std::string i);
Value & operator[](const char * i); Value & operator[](const char * i);
Value & operator[](unsigned int i); Value & operator[](unsigned int i);
Value const & operator[](const std::string i) const;
Value const & operator[](const char * i) const;
Value const & operator[](unsigned int i) const;
//handy functions and others //handy functions and others
std::string toPacked(); std::string toPacked();
void netPrepare(); void netPrepare();
std::string & toNetPacked(); std::string & toNetPacked();
std::string toString(); std::string toString() const;
std::string toPrettyString(int indentation = 0); std::string toPrettyString(int indentation = 0) const;
void append(const Value & rhs); void append(const Value & rhs);
void prepend(const Value & rhs); void prepend(const Value & rhs);
void shrink(unsigned int size); void shrink(unsigned int size);
@ -91,7 +96,11 @@ namespace JSON {
ObjIter ObjEnd(); ObjIter ObjEnd();
ArrIter ArrBegin(); ArrIter ArrBegin();
ArrIter ArrEnd(); ArrIter ArrEnd();
unsigned int size(); ObjConstIter ObjBegin() const;
ObjConstIter ObjEnd() const;
ArrConstIter ArrBegin() const;
ArrConstIter ArrEnd() const;
unsigned int size() const;
void null(); void null();
}; };