--- parser3/src/classes/json.C	2010/09/01 22:14:28	1.4
+++ parser3/src/classes/json.C	2010/10/21 15:06:29	1.11
@@ -4,7 +4,7 @@
 	Copyright (c) 2010 ArtLebedev Group (http://www.artlebedev.com)
 */
 
-static const char * const IDENT_RESPONSE_C="$Date: 2010/09/01 22:14:28 $";
+static const char * const IDENT_RESPONSE_C="$Date: 2010/10/21 15:06:29 $";
 
 #include "classes.h"
 #include "pa_vmethod_frame.h"
@@ -21,8 +21,6 @@ static const char * const IDENT_RESPONSE
 class MJson: public Methoded {
 public:
 	MJson();
-public: // Methoded
-	bool used_directly() { return true; }
 };
 
 // global variable
@@ -94,7 +92,7 @@ String* json_string(Json *json, const JS
 
 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), value};
+	Value *params[]={new VString(key ? *key : String::Empty), value};
 
 	frame.store_params(params, 2);
 	r.execute_method(frame);
@@ -165,8 +163,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",
@@ -244,8 +242,130 @@ 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<char*>(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(Value& v, Json_options* options);
+
+const String& hash_json_string(HashStringValue &hash, Json_options* options) {
+	if(!hash.count())
+		return *new String("{}", String::L_AS_IS);
+
+	uint level = options->r->json_string_recoursion_go_down();
+
+	String& result = *new String("{\n", String::L_AS_IS);
+
+	if (options->indent){
+
+		String *delim=NULL;
+		options->indent=get_indent(level);
+		for(HashStringValue::Iterator i(hash); i; i.next() ){
+			if (delim){
+				result << *delim;
+			} else {
+				result << options->indent << "\"";
+				delim = new String(",\n", String::L_AS_IS); *delim << options->indent << "\"";
+			}
+			result << String(i.key(), String::L_JSON) << "\":" << value_json_string(*i.value(), options);
+		}
+		result << "\n" << (options->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.value(), options);
+			need_delim=true;
+		}
+		result << "\n}";
+
+	}
+
+	options->r->json_string_recoursion_go_up();
+	return result;
+}
+
+const String& value_json_string(Value& v, Json_options* options) {
+	if(options && options->methods)
+		if(Value* method=options->methods->get(v.type())){
+			Junction* junction=method->get_junction();
+			VMethodFrame frame(*junction->method, options->r->method_frame, junction->self);
+
+			Value *params[]={&v, (options->params) ? options->params : VVoid::get()};
+			frame.store_params(params, 2);
+
+			options->r->execute_method(frame);
+
+			return frame.result().as_string();
+		}
+
+	if(HashStringValue* hash=v.get_hash())
+		return hash_json_string(*hash, options);
+
+	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;
+			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' or 'object'");
+					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' or 'text'");
+					valid_options++;
+				} else if(Junction* junction=value->get_junction()){
+					if(!junction->method || !junction->method->params_names || junction->method->params_names->count() != 2)
+						throw Exception(PARSER_RUNTIME, 0, "$.%s must be parser method with 2 parameters", key.cstr());
+					methods->put(key, value);
+					valid_options++;
+				}
+			}
+			if(valid_options!=options->count())
+				throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION);
+			if(methods->count())
+				json.methods=methods;
+		}
+
+	r.write_pass_lang(value_json_string(params[0], &json));
+ }
+
 // 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);
 }