--- parser3/src/classes/json.C 2010/08/31 13:30:13 1.2 +++ parser3/src/classes/json.C 2012/05/29 21:57:01 1.22 @@ -1,12 +1,9 @@ /** @file Parser: @b json parser class. - Copyright (c) 2001-2005 ArtLebedev Group (http://www.artlebedev.com) - Author: Alexandr Petrosian (http://paf.design.ru) + Copyright (c) 2000-2012 Art. Lebedev Studio (http://www.artlebedev.com) */ -static const char * const IDENT_RESPONSE_C="$Date: 2010/08/31 13:30:13 $"; - #include "classes.h" #include "pa_vmethod_frame.h" @@ -17,13 +14,17 @@ static const char * const IDENT_RESPONSE #include "pa_charsets.h" #include "JSON_parser.h" +#ifdef XML +#include "pa_vxdoc.h" +#endif + +volatile const char * IDENT_JSON_C="$Id: json.C,v 1.22 2012/05/29 21:57:01 moko Exp $"; + // class class MJson: public Methoded { public: MJson(); -public: // Methoded - bool used_directly() { return true; } }; // global variable @@ -32,46 +33,86 @@ DECLARE_CLASS_VAR(json, new MJson, 0); // methods struct Json { - Stack stack; - Stack key_stack; + Stack stack; + Stack key_stack; - String::Body key; + String* key; Value* result; - Junction* hook; + Junction* hook_object; + Junction* hook_array; + Request* request; + Charset *charset; bool handle_double; -public: - Json(Charset* acharset): stack(), key_stack(), key(), result(NULL), hook(NULL), charset(acharset), handle_double(true){} + enum Distinct { D_EXCEPTION, D_FIRST, D_LAST, D_ALL } distinct; + + Json(Charset* acharset): stack(), key_stack(), key(NULL), result(NULL), hook_object(NULL), hook_array(NULL), request(NULL), charset(acharset), handle_double(true), distinct(D_EXCEPTION){} + + bool set_distinct(const String &value){ + if (value == "first") distinct = D_FIRST; + else if (value == "last") distinct = D_LAST; + else if (value == "all") distinct = D_ALL; + else return false; + return true; + } }; static void set_json_value(Json *json, Value *value){ - Value *top = json->stack.top_value(); - if(json->key.is_empty()){ - top->put_element(String(format(top->get_hash()->count(), 0)), value, true); + VHash *top = json->stack.top_value(); + if(json->key == NULL){ + top->hash().put(String(format(top->get_hash()->count(), 0)), value); } else { - top->put_element(String(json->key, String::L_TAINTED), value, true); - json->key=String::Body(); + switch (json->distinct){ + case Json::D_EXCEPTION: + if (top->hash().put_dont_replace(*json->key, value)) + throw Exception(PARSER_RUNTIME, json->key, "duplicate key"); + break; + case Json::D_FIRST: + top->hash().put_dont_replace(*json->key, value); + break; + case Json::D_LAST: + top->hash().put(*json->key, value); + break; + case Json::D_ALL: + if (top->hash().put_dont_replace(*json->key, value)){ + for(int i=2;;i++){ + String key; + key << *json->key << "_" << format(i, 0); + if (!top->hash().put_dont_replace(key, value)) break; + } + } + break; + } + json->key=NULL; } } -String::Body json_string(Json *json, const JSON_value* value){ - return json->charset !=NULL ? - Charset::transcode(String::Body(value->vu.str.value, value->vu.str.length), UTF8_charset, *json->charset) : - String::Body(pa_strdup(value->vu.str.value, value->vu.str.length), value->vu.str.length); +String* json_string(Json *json, const JSON_value* value){ + String::C result = json->charset !=NULL ? + Charset::transcode(String::C(value->vu.str.value, value->vu.str.length), UTF8_charset, *json->charset) : + String::C(pa_strdup(value->vu.str.value, value->vu.str.length), value->vu.str.length); + return new String(result.str, String::L_TAINTED, result.length); } -static Value *json_hook(Junction *hook, String::Body key, Value* value){ - return value; +static Value *json_hook(Request &r, Junction *hook, String* key, Value* value){ + VMethodFrame frame(*hook->method, r.method_frame, hook->self); + Value *params[]={new VString(key ? *key : String::Empty), value}; + + frame.store_params(params, 2); + r.execute_method(frame); + + return &frame.result().as_value(); } static int json_callback(Json *json, int type, const JSON_value* value) { switch(type) { case JSON_T_OBJECT_BEGIN:{ - Value *v = new VHash(); - if (json->hook){ + VHash *v = new VHash(); + if (json->hook_object){ json->key_stack.push(json->key); + json->key=NULL; } else { if (json->stack.count()) set_json_value(json, v); } @@ -79,9 +120,9 @@ static int json_callback(Json *json, int break; } case JSON_T_OBJECT_END:{ - if (json->hook){ - String::Body key = json->key_stack.pop(); - json->result = json_hook(json->hook, key, json->stack.pop()); + if (json->hook_object){ + String* key = json->key_stack.pop(); + json->result = json_hook(*json->request, json->hook_object, key, json->stack.pop()); if (json->stack.count()){ json->key = key; @@ -93,30 +134,46 @@ static int json_callback(Json *json, int break; } case JSON_T_ARRAY_BEGIN:{ - Value *v = new VHash(); - set_json_value(json, v); + VHash *v = new VHash(); + if (json->hook_array){ + json->key_stack.push(json->key); + json->key=NULL; + } else { + if (json->stack.count()) set_json_value(json, v); + } json->stack.push(v); break; } case JSON_T_ARRAY_END: - json->stack.pop(); + // libjson supports array at top level, we too + if (json->hook_array){ + String* key = json->key_stack.pop(); + json->result = json_hook(*json->request, json->hook_array, key, json->stack.pop()); + + if (json->stack.count()){ + json->key = key; + set_json_value(json, json->result); + } + } else { + json->result = json->stack.pop(); + } break; case JSON_T_KEY: json->key = json_string(json, value); - break; + break; case JSON_T_INTEGER: - set_json_value(json, new VInt((int)value->vu.integer_value)); + set_json_value(json, new VDouble((double)value->vu.integer_value)); break; case JSON_T_FLOAT: if (json->handle_double){ - set_json_value(json, new VDouble( String(json_string(json, value), String::L_TAINTED).as_double() )); + set_json_value(json, new VDouble( json_string(json, value)->as_double() )); break; } // else is JSON_T_STRING case JSON_T_STRING: - set_json_value(json, new VString(*new String(json_string(json, value), String::L_TAINTED))); + set_json_value(json, new VString(*json_string(json, value))); break; case JSON_T_NULL: - set_json_value(json, new VVoid()); + set_json_value(json, VVoid::get()); break; case JSON_T_TRUE: set_json_value(json, &VBool::get(true)); @@ -128,8 +185,8 @@ static int json_callback(Json *json, int return 1; } -static char* json_error_message(int error_code){ - static char* error_messages[] = { +static const char* json_error_message(int error_code){ + static const char* error_messages[] = { NULL, "invalid char", "invalid keyword", @@ -146,8 +203,9 @@ static char* json_error_message(int erro } static void _parse(Request& r, MethodParams& params) { - //Json json = Json(r.charsets.source().isUTF8() ? (Charset*)NULL : &(r.charsets.source())); - Json& json = *new Json(r.charsets.source().isUTF8() ? (Charset*)NULL : &(r.charsets.source())); + const String& json_string=params.as_string(0, "json must be string"); + + Json json(r.charsets.source().isUTF8() ? NULL : &(r.charsets.source())); JSON_config config; init_JSON_config(&config); @@ -162,30 +220,42 @@ static void _parse(Request& r, MethodPar if(HashStringValue* options=params.as_hash(1)) { int valid_options=0; if(Value* value=options->get("depth")) { - config.depth=value->as_int(); + config.depth=r.process_to_value(*value).as_int(); valid_options++; } if(Value* value=options->get("double")) { - json.handle_double=value->as_bool(); + json.handle_double=r.process_to_value(*value).as_bool(); + valid_options++; + } + if(Value* value=options->get("distinct")) { + const String& sdistinct=value->as_string(); + if (!json.set_distinct(sdistinct)) + throw Exception(PARSER_RUNTIME, &sdistinct, "must be 'first', 'last' or 'all'"); valid_options++; } if(Value* value=options->get("object")) { - json.hook=value->get_junction(); - if (!json.hook || !json.hook->method || !json.hook->method->params_names || !(json.hook->method->params_names->count() == 2)){ + json.hook_object=value->get_junction(); + json.request=&r; + if (!json.hook_object || !json.hook_object->method || !json.hook_object->method->params_names || !(json.hook_object->method->params_names->count() == 2)) throw Exception(PARSER_RUNTIME, 0, "$.object must be parser method with 2 parameters"); - } + valid_options++; + } + if(Value* value=options->get("array")) { + json.hook_array=value->get_junction(); + json.request=&r; + if (!json.hook_array || !json.hook_array->method || !json.hook_array->method->params_names || !(json.hook_array->method->params_names->count() == 2)) + throw Exception(PARSER_RUNTIME, 0, "$.array must be parser method with 2 parameters"); valid_options++; } if(valid_options!=options->count()) throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION); } - struct JSON_parser_struct* jc = new_JSON_parser(&config); - - const String& json_string=r.process_to_string(params[0]); // we accept both {} and [] const String::Body json_body = json_string.cstr_to_string_body_untaint(String::L_JSON, 0, &(r.charsets)); const char *json_cstr = json.charset != NULL ? Charset::transcode(json_body, *json.charset, UTF8_charset).cstr() : json_body.cstr(); + struct JSON_parser_struct* jc = new_JSON_parser(&config); + for (const char *c=json_cstr; *c; c++){ if (!JSON_parser_char(jc, *((const unsigned char *)c))) { throw Exception("json.parse", 0, "%s at byte %d", json_error_message(JSON_parser_get_last_error(jc)), c-json_cstr); @@ -201,8 +271,157 @@ static void _parse(Request& r, MethodPar if (json.result) r.write_no_lang(*json.result); } +char *get_indent(uint level){ + static char* cache[ANTI_ENDLESS_JSON_STRING_RECOURSION]={}; + if (!cache[level]){ + char *result = static_cast(pa_gc_malloc_atomic(level+1)); + memset(result, '\t', level); + result[level]='\0'; + return cache[level]=result; + } + return cache[level]; +} + +const String& value_json_string(String::Body key, Value& v, Json_options& options); + +const String* Json_options::hash_json_string(HashStringValue &hash) { + if(!hash.count()) + return new String("{}", String::L_AS_IS); + + uint level = r->json_string_recoursion_go_down(); + + String& result = *new String("{\n", String::L_AS_IS); + + if (indent){ + + String *delim=NULL; + indent=get_indent(level); + for(HashStringValue::Iterator i(hash); i; i.next() ){ + if (delim){ + result << *delim; + } else { + result << indent << "\""; + delim = new String(",\n", String::L_AS_IS); *delim << indent << "\""; + } + result << String(i.key(), String::L_JSON) << "\":" << value_json_string(i.key(), *i.value(), *this); + } + result << "\n" << (indent=get_indent(level-1)) << "}"; + + } else { + + bool need_delim=false; + for(HashStringValue::Iterator i(hash); i; i.next() ){ + result << (need_delim ? ",\n\"" : "\""); + result << String(i.key(), String::L_JSON) << "\":" << value_json_string(i.key(), *i.value(), *this); + need_delim=true; + } + result << "\n}"; + + } + + r->json_string_recoursion_go_up(); + return &result; +} + +static bool based_on(HashStringValue::key_type key, HashStringValue::value_type /*value*/, Value* v) { + return v->is(key.cstr()); +} + +const String& value_json_string(String::Body key, Value& v, Json_options& options) { + if(options.methods) { + Value* method=options.methods->get(v.type()); + if(!method){ + method=options.methods->first_that(based_on, &v); + options.methods->put(key, method ? method : VVoid::get()); + } + if(method && !method->is_void()) { + Junction* junction=method->get_junction(); + VMethodFrame frame(*junction->method, options.r->method_frame, junction->self); + + Value *params[]={new VString(*new String(key, String::L_JSON)), &v, options.params ? options.params : VVoid::get()}; + frame.store_params(params, 3); + + options.r->execute_method(frame); + + return frame.result().as_string(); + } + } + + options.key=key; + return *v.get_json_string(options); +} + +static void _string(Request& r, MethodParams& params) { + Json_options json(&r); + + if(params.count() == 2) + if(HashStringValue* options=params.as_hash(1)) { + json.params=params.get(1); + HashStringValue* methods=new HashStringValue(); + int valid_options=0; + HashStringValue* vvalue; + for(HashStringValue::Iterator i(*options); i; i.next() ){ + String::Body key=i.key(); + Value* value=i.value(); + if(key == "skip-unknown"){ + json.skip_unknown=r.process_to_value(*value).as_bool(); + valid_options++; + } else if(key == "date" && value->is_string()){ + const String& svalue=value->as_string(); + if(!json.set_date_format(svalue)) + throw Exception(PARSER_RUNTIME, &svalue, "must be 'sql-string', 'gmt-string' or 'unix-timestamp'"); + valid_options++; + } else if(key == "indent"){ + json.indent=r.process_to_value(*value).as_bool() ? "":NULL; + valid_options++; + } else if(key == "table" && value->is_string()){ + const String& svalue=value->as_string(); + if(!json.set_table_format(svalue)) + throw Exception(PARSER_RUNTIME, &svalue, "must be 'array', 'object' or 'compact'"); + valid_options++; + } else if(key == "file" && value->is_string()){ + const String& svalue=value->as_string(); + if(!json.set_file_format(svalue)) + throw Exception(PARSER_RUNTIME, &svalue, "must be 'base64', 'text' or 'stat'"); + valid_options++; +#ifdef XML + } else if(key == "xdoc" && (vvalue = value->get_hash())){ + json.xdoc_options=new XDocOutputOptions(r, vvalue); + valid_options++; +#endif + } else if(Junction* junction=value->get_junction()){ + if(!junction->method || !junction->method->params_names || junction->method->params_names->count() != 3) + throw Exception(PARSER_RUNTIME, 0, "$.%s must be parser method with 3 parameters", key.cstr()); + methods->put(key, value); + valid_options++; + } + } + + if(valid_options!=options->count()) + throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION); + + // special handling for $._default + if(VHash* vhash=static_cast(params[1].as(VHASH_TYPE))) + if(Value* value=vhash->get_default()) { + Junction* junction=value->get_junction(); + if(!junction || !junction->method || !junction->method->params_names || junction->method->params_names->count() != 3) + throw Exception(PARSER_RUNTIME, 0, "$.%s must be parser method with 3 parameters", HASH_DEFAULT_ELEMENT_NAME); + json.default_method=value; + } + + if(methods->count()) + json.methods=methods; + } + + const String& result_string=value_json_string(String::Body(), params[0], json); + String::Body result_body=result_string.cstr_to_string_body_untaint(String::L_JSON, 0, &r.charsets); + r.write_pass_lang(*new String(result_body, String::L_AS_IS)); + } + // constructor MJson::MJson(): Methoded("json") { add_native_method("parse", Method::CT_STATIC, _parse, 1, 2); + + add_native_method("string", Method::CT_ANY, _string, 1, 2); }