--- parser3/src/classes/string.C 2001/09/06 06:11:13 1.74 +++ parser3/src/classes/string.C 2001/10/11 10:21:44 1.80 @@ -2,10 +2,10 @@ Parser: @b string parser class. Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) - Author: Alexander Petrosyan (http://design.ru/paf) + + $Id: string.C,v 1.80 2001/10/11 10:21:44 parser Exp $ */ -static const char *RCSId="$Id: string.C,v 1.74 2001/09/06 06:11:13 parser Exp $"; #include "classes.h" #include "pa_request.h" @@ -51,7 +51,7 @@ static void _int(Request& r, const Strin rethrow_me=e; converted=0; } else - converted=params->as_int(0, r); // (default) + converted=params->as_int(0, "default must be int", r); // (default) } PEND_CATCH if(convert_problem) @@ -76,7 +76,7 @@ static void _double(Request& r, const St rethrow_me=e; converted=0; } else - converted=params->as_double(0, r); // (default) + converted=params->as_double(0, "default must be double", r); // (default) } PEND_CATCH if(convert_problem) @@ -107,7 +107,7 @@ static void _double(Request& r, const St static void _left(Request& r, const String&, MethodParams *params) { Pool& pool=r.pool(); - size_t n=(size_t)r.process(params->get(0)).as_double(); + size_t n=(size_t)params->as_int(0, "n must be int", r); const String& string=*static_cast(r.self)->get_string(); r.write_assign_lang(*new(pool) VString(string.mid(0, n))); @@ -116,7 +116,7 @@ static void _left(Request& r, const Stri static void _right(Request& r, const String&, MethodParams *params) { Pool& pool=r.pool(); - size_t n=(size_t)r.process(params->get(0)).as_double(); + size_t n=(size_t)params->as_int(0, "n must be int", r); const String& string=*static_cast(r.self)->get_string(); r.write_assign_lang(*new(pool) VString(string.mid(string.size()-n, string.size()))); @@ -125,8 +125,8 @@ static void _right(Request& r, const Str static void _mid(Request& r, const String&, MethodParams *params) { Pool& pool=r.pool(); - size_t p=(size_t)r.process(params->get(0)).as_double(); - size_t n=(size_t)r.process(params->get(1)).as_double(); + size_t p=(size_t)params->as_int(0, "p must be int", r); + size_t n=(size_t)params->as_int(1, "n must be int", r); const String& string=*static_cast(r.self)->get_string(); r.write_assign_lang(*new(pool) VString(string.mid(p, p+n))); @@ -254,7 +254,7 @@ static void _match(Request& r, const Str Table *table; if(params->size()<3) { // search bool was_global; - bool matched=src.match(r.pcre_tables, + bool matched=src.match(r.pcre_tables(), &method_name, regexp.as_string(), options, &table, @@ -276,7 +276,7 @@ static void _match(Request& r, const Str &replacement_code, &src }; - src.match(r.pcre_tables, + src.match(r.pcre_tables(), &method_name, r.process(regexp).as_string(), options, &table, @@ -292,7 +292,7 @@ static void change_case(Request& r, cons Pool& pool=r.pool(); const String& src=*static_cast(r.self)->get_string(); - r.write_assign_lang(*new(pool) VString(src.change_case(pool, r.pcre_tables, + r.write_assign_lang(*new(pool) VString(src.change_case(pool, r.pcre_tables(), kind))); } static void _upper(Request& r, const String& method_name, MethodParams *params) { @@ -410,7 +410,7 @@ static void _sql(Request& r, const Strin "default option must be code"); string=r.process(*vdefault).get_string(); if(!string) - string=empty_string; + string=new(pool) String(pool); } else PTHROW(0, 0, &method_name, @@ -438,6 +438,19 @@ static void _replace(Request& r, const S Dictionary dict(*table); r.write_assign_lang(*new(pool) VString(src.replace(pool, dict))); } + +static void _save(Request& r, const String& method_name, MethodParams *params) { + Pool& pool=r.pool(); + Value& vfile_name=params->as_no_junction(0, + "file name must not be code"); + + const String& src=*static_cast(r.self)->get_string(); + + // write + file_write(pool, r.absolute(vfile_name.as_string()), + src.cstr(String::UL_AS_IS), src.size(), true); +} + // constructor MString::MString(Pool& apool) : Methoded(apool) { @@ -487,6 +500,9 @@ MString::MString(Pool& apool) : Methoded // ^string.replace[table] add_native_method("replace", Method::CT_DYNAMIC, _replace, 1, 1); + + // ^string.save[file] + add_native_method("save", Method::CT_DYNAMIC, _save, 1, 1); } // global variable