--- parser3/src/classes/string.C 2010/05/17 22:57:12 1.193 +++ parser3/src/classes/string.C 2012/01/08 05:58:27 1.201 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char * const IDENT_STRING_C="$Date: 2010/05/17 22:57:12 $"; +static const char * const IDENT_STRING_C="$Date: 2012/01/08 05:58:27 $"; #include "classes.h" #include "pa_vmethod_frame.h" @@ -27,14 +27,23 @@ static const char * const IDENT_STRING_C class MString: public Methoded { public: MString(); -public: // Methoded - bool used_directly() { return true; } }; // global variable DECLARE_CLASS_VAR(string, new MString, 0); +// void class, inherited from string and thus should be inited afterwards + +class MVoid: public Methoded { +public: + MVoid(); +}; + +// void global variable should be after string global variable + +DECLARE_CLASS_VAR(void, new MVoid, 0); + // defines for statics #define MATCH_VAR_NAME "match" @@ -62,7 +71,7 @@ static void _int(Request& r, MethodParam if(self_string.is_empty()) throw Exception(PARSER_RUNTIME, 0, - "parameter is empty string, error converting"); + "unable to convert empty string without default specified"); converted=self_string.as_int(); } catch(...) { // convert problem if(params.count()>0) @@ -80,7 +89,7 @@ static void _double(Request& r, MethodPa if(self_string.is_empty()) throw Exception(PARSER_RUNTIME, 0, - "parameter is empty string, error converting"); + "unable to convert empty string without default specified"); converted=self_string.as_double(); } catch(...) { // convert problem if(params.count()>0) @@ -99,7 +108,7 @@ static void _bool(Request& r, MethodPara if(self_string.is_empty()) throw Exception(PARSER_RUNTIME, 0, - "parameter is empty string, error converting"); + "unable to convert empty string without default specified"); try { converted=self_string.as_bool(); @@ -525,35 +534,28 @@ const String* sql_result_string(Request& ulong limit=SQL_NO_LIMIT; ulong offset=0; default_code=0; - if(params.count()>1) { - Value& voptions=params.as_no_junction(1, "options must be hash, not code"); - if(voptions.is_defined() && !voptions.is_string()) - if((options=voptions.get_hash())) { - int valid_options=0; - if(Value* vbind=options->get(sql_bind_name)) { - valid_options++; - bind=vbind->get_hash(); - } - if(Value* vlimit=options->get(sql_limit_name)) { - valid_options++; - limit=(ulong)r.process_to_value(*vlimit).as_double(); - } - if(Value* voffset=options->get(sql_offset_name)) { - valid_options++; - offset=(ulong)r.process_to_value(*voffset).as_double(); - } - if((default_code=options->get(sql_default_name))) { - valid_options++; - } - if(valid_options!=options->count()) - throw Exception(PARSER_RUNTIME, - 0, - "called with invalid option"); - } else - throw Exception(PARSER_RUNTIME, - 0, - "options must be hash"); - } else + if(params.count()>1) + if((options=params.as_hash(1))) { + int valid_options=0; + if(Value* vbind=options->get(sql_bind_name)) { + valid_options++; + bind=vbind->get_hash(); + } + if(Value* vlimit=options->get(sql_limit_name)) { + valid_options++; + limit=(ulong)r.process_to_value(*vlimit).as_double(); + } + if(Value* voffset=options->get(sql_offset_name)) { + valid_options++; + offset=(ulong)r.process_to_value(*voffset).as_double(); + } + if((default_code=options->get(sql_default_name))) { + valid_options++; + } + if(valid_options!=options->count()) + throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION); + } + else options=0; SQL_Driver::Placeholder* placeholders=0; @@ -603,14 +605,24 @@ static void _sql(Request& r, MethodParam static void _replace(Request& r, MethodParams& params) { const String& src=GET_SELF(r, VString).string(); - Table* table=params.as_no_junction(0, PARAM_MUST_NOT_BE_CODE).get_table(); - if(!table) - throw Exception(PARSER_RUNTIME, - 0, - "parameter must be table"); + if(params.count()==1) { + // ^string.replace[table] + Table* table=params.as_no_junction(0, PARAM_MUST_NOT_BE_CODE).get_table(); + if(!table) + throw Exception(PARSER_RUNTIME, + 0, + "parameter must be table"); + Dictionary dict(*table); + r.write_assign_lang(src.replace(dict)); + } else { + // ^string.replace[from-string;to-string] + Dictionary dict( + params.as_string(0, "from must be string"), + params.as_string(1, "to must be string") + ); + r.write_assign_lang(src.replace(dict)); + } - Dictionary dict(*table); - r.write_assign_lang(src.replace(dict)); } static void _save(Request& r, MethodParams& params) { @@ -630,9 +642,7 @@ static void _save(Request& r, MethodPara valid_options++; } if(valid_options != options->count()) - throw Exception(PARSER_RUNTIME, - 0, - INVALID_OPTION_PASSED); + throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION); } else { const String& mode=params.as_string(0, "mode must be string"); if(mode==MODE_APPEND){ @@ -689,16 +699,6 @@ static void _trim(Request& r, MethodPara r.write_assign_lang(src.trim(kind, chars, &r.charsets.source())); } -static void _append(Request& r, MethodParams& params) { - // c=a+b - VString& va=GET_SELF(r, VString); - const String& a=va.string(); - const String& b=params.as_string(0, PARAMETER_MUST_BE_STRING); - String& c=*new String(a); - c.append(b, String::L_PASS_APPENDED); - va.set_string(c); -} - static void _base64(Request& r, MethodParams& params) { if(params.count()) { // decode: ^string:base64[encoded] @@ -792,7 +792,7 @@ MString::MString(): Methoded("string") { add_native_method("sql", Method::CT_STATIC, _sql, 1, 2); // ^string.replace[table] - add_native_method("replace", Method::CT_DYNAMIC, _replace, 1, 1); + add_native_method("replace", Method::CT_DYNAMIC, _replace, 1, 2); // ^string.save[append][file] // ^string.save[file] @@ -805,9 +805,6 @@ MString::MString(): Methoded("string") { // ^string.trim[[start|both|end][;chars]] add_native_method("trim", Method::CT_DYNAMIC, _trim, 0, 2); - // ^string.append[string] - add_native_method("append", Method::CT_DYNAMIC, _append, 1, 1); - // ^string.base64[] << encode // ^string:base64[encoded string] << decode add_native_method("base64", Method::CT_ANY, _base64, 0, 1);