--- parser3/src/classes/string.C 2001/03/29 17:11:39 1.17 +++ parser3/src/classes/string.C 2001/04/03 08:23:06 1.24 @@ -1,9 +1,11 @@ -/* - Parser +/** @file + 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.17 2001/03/29 17:11:39 paf Exp $ + $Id: string.C,v 1.24 2001/04/03 08:23:06 paf Exp $ */ #include "pa_request.h" @@ -36,19 +38,21 @@ static void _double(Request& r, const St r.write_no_lang(value); } -void _string_format(Request& r, const String& method_name, Array *params) { +/// ^string.format{format} +/*not static*/void _string_format(Request& r, const String& method_name, Array *params) { Pool& pool=r.pool(); Value& fmt=*static_cast(params->get(0)); - // forcing [this param type] - r.fail_if_junction_(true, fmt, method_name, "fmt must not be junction"); + // forcing {this param type} + r.fail_if_junction_(false, fmt, method_name, "fmt must be junction"); - char *buf=format(pool, r.self->as_double(), fmt.as_string().cstr()); + Temp_lang temp_lang(r, String::UL_PASS_APPENDED); + char *buf=format(pool, r.self->as_double(), r.process(fmt).as_string().cstr()); r.write_no_lang(String(pool, buf)); } -void _left(Request& r, const String&, Array *params) { +static void _left(Request& r, const String&, Array *params) { Pool& pool=r.pool(); size_t n=(size_t)r.process(*static_cast(params->get(0))).as_double(); @@ -57,7 +61,7 @@ void _left(Request& r, const String&, Ar r.write_assign_lang(*new(pool) VString(string.piece(0, n))); } -void _right(Request& r, const String&, Array *params) { +static void _right(Request& r, const String&, Array *params) { Pool& pool=r.pool(); size_t n=(size_t)r.process(*static_cast(params->get(0))).as_double(); @@ -66,7 +70,7 @@ void _right(Request& r, const String&, A r.write_assign_lang(*new(pool) VString(string.piece(string.size()-n, string.size()))); } -void _mid(Request& r, const String&, Array *params) { +static void _mid(Request& r, const String&, Array *params) { Pool& pool=r.pool(); size_t p=(size_t)r.process(*static_cast(params->get(0))).as_double(); @@ -76,7 +80,7 @@ void _mid(Request& r, const String&, Arr r.write_assign_lang(*new(pool) VString(string.piece(p, p+n))); } -void _pos(Request& r, const String& method_name, Array *params) { +static void _pos(Request& r, const String& method_name, Array *params) { Pool& pool=r.pool(); Value& substr=*static_cast(params->get(0)); @@ -87,63 +91,101 @@ void _pos(Request& r, const String& meth r.write_assign_lang(*new(pool) VInt(pool, string.pos(substr.as_string()))); } -void _lsplit(Request& r, const String& method_name, Array *params) { +static void split_list(Request& r, const String& method_name, Array *params, + const String& string, + Array& result) { Pool& pool=r.pool(); Value& delim_value=*static_cast(params->get(0)); // forcing [this param type] r.fail_if_junction_(true, delim_value, method_name, "delimiter must not be junction"); - const String& delim=delim_value.as_string(); - + + string.split(result, 0, delim_value.as_string(), String::UL_CLEAN, -1); +} + +static void _lsplit(Request& r, const String& method_name, Array *params) { + Pool& pool=r.pool(); const String& string=*static_cast(r.self)->get_string(); - Table& result=*new(pool) Table(pool, &string, 0); + Array& row=*new(pool) Array(pool); + split_list(r, method_name, params, string, row); - int pos_before=string.pos(delim); - if(pos_before>=0) { - { - Array& row=*new(pool) Array(pool, 1); - result+=&(row+=&string.piece(0, pos_before)); - } - size_t pos_after=pos_before+delim.size(); - if(pos_after(r.self)->get_string(); + + Array list(pool); + split_list(r, method_name, params, string, list); + + Array& row=*new(pool) Array(pool); + for(int i=list.size(); --i>=0; ) + row+=list.get(i); + + Table& table=*new(pool) Table(pool, &string, + 0/*nameless*/, 1/*row preallocate(and only)*/); + table+=&row; + + r.write_no_lang(*new(pool) VTable(pool, &table)); +} + +/// ^string.match{regexp}[options] +static void _match(Request& r, const String& method_name, Array *params) { + Pool& pool=r.pool(); + const String& string=*static_cast(r.self)->get_string(); + + Value& regexp=*static_cast(params->get(0)); + // forcing {this param type} + r.fail_if_junction_(false, regexp, method_name, "regexp must be junction"); + + Value& options=*static_cast(params->get(1)); + // forcing {this param type} + r.fail_if_junction_(true, options, method_name, "options must not be junction"); + + Temp_lang temp_lang(r, String::UL_PASS_APPENDED); + Table& table=string.match(&method_name, + r.process(regexp).as_string(), options.as_string()); + + r.write_no_lang(*new(pool) VTable(pool, &table)); } // initialize void initialize_string_class(Pool& pool, VStateless_class& vclass) { // ^string.length[] - vclass.add_native_method("length", _length, 0, 0); + vclass.add_native_method("length", Method::CT_DYNAMIC, _length, 0, 0); // ^string.int[] - vclass.add_native_method("int", _int, 0, 0); + vclass.add_native_method("int", Method::CT_DYNAMIC, _int, 0, 0); // ^string.double[] - vclass.add_native_method("double", _double, 0, 0); + vclass.add_native_method("double", Method::CT_DYNAMIC, _double, 0, 0); - // ^string.format[] - vclass.add_native_method("format", _string_format, 1, 1); + // ^string.format{format} + vclass.add_native_method("format", Method::CT_DYNAMIC, _string_format, 1, 1); // ^string.left(n) - vclass.add_native_method("left", _left, 1, 1); + vclass.add_native_method("left", Method::CT_DYNAMIC, _left, 1, 1); // ^string.right(n) - vclass.add_native_method("right", _right, 1, 1); + vclass.add_native_method("right", Method::CT_DYNAMIC, _right, 1, 1); // ^string.mid(p;n) - vclass.add_native_method("mid", _mid, 2, 2); + vclass.add_native_method("mid", Method::CT_DYNAMIC, _mid, 2, 2); // ^string.pos[substr] - vclass.add_native_method("pos", _pos, 1, 1); + vclass.add_native_method("pos", Method::CT_DYNAMIC, _pos, 1, 1); // ^string.lsplit[delim] - vclass.add_native_method("lsplit", _lsplit, 1, 1); + vclass.add_native_method("lsplit", Method::CT_DYNAMIC, _lsplit, 1, 1); + // ^string.rsplit[delim] + vclass.add_native_method("rsplit", Method::CT_DYNAMIC, _rsplit, 1, 1); + + // ^string.match{regexp}[options] + vclass.add_native_method("match", Method::CT_DYNAMIC, _match, 2, 2); }