--- parser3/src/classes/json.C 2011/11/30 06:15:26 1.16 +++ parser3/src/classes/json.C 2012/05/27 22:33:59 1.19 @@ -1,11 +1,9 @@ /** @file Parser: @b json parser class. - Copyright (c) 2010 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2000-2012 Art. Lebedev Studio (http://www.artlebedev.com) */ -static const char * const IDENT_RESPONSE_C="$Date: 2011/11/30 06:15:26 $"; - #include "classes.h" #include "pa_vmethod_frame.h" @@ -20,6 +18,8 @@ static const char * const IDENT_RESPONSE #include "pa_vxdoc.h" #endif +volatile const char * IDENT_JSON_C="$Id: json.C,v 1.19 2012/05/27 22:33:59 misha Exp $"; + // class class MJson: public Methoded { @@ -173,7 +173,7 @@ static int json_callback(Json *json, int 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)); @@ -385,7 +385,7 @@ static void _string(Request& r, MethodPa } 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'"); + throw Exception(PARSER_RUNTIME, &svalue, "must be 'base64', 'text' or 'stat'"); valid_options++; #ifdef XML } else if(key == "xdoc" && (vvalue = value->get_hash())){