--- parser3/src/classes/string.C 2001/11/09 11:59:13 1.89 +++ parser3/src/classes/string.C 2001/12/15 21:28:18 1.92 @@ -4,7 +4,7 @@ Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) Author: Alexander Petrosyan (http://paf.design.ru) - $Id: string.C,v 1.89 2001/11/09 11:59:13 paf Exp $ + $Id: string.C,v 1.92 2001/12/15 21:28:18 paf Exp $ */ #include "classes.h" @@ -84,7 +84,7 @@ static void _double(Request& r, const St Temp_lang temp_lang(r, String::UL_PASS_APPENDED); char *buf=format(pool, r.self->as_double(), - r.process(fmt).as_string().cstr(String::UL_UNSPECIFIED)); + r.process(fmt).as_string().cstr(String::UL_UNSPECIFIED, r.connection)); String result(pool); result.APPEND_CLEAN(buf, 0, @@ -245,7 +245,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( &method_name, regexp.as_string(), options, &table, @@ -258,7 +258,7 @@ static void _match(Request& r, const Str else result=new(pool) VBool(pool, matched); } else { // replace - Value& replacement_code=params->as_junction(2, "replacement code must be code"); + Value& replacement_code=params->as_junction(2, "replacement param must be code"); String& dest=*new(pool) String(pool); Replace_action_info replace_action_info={ @@ -267,7 +267,7 @@ static void _match(Request& r, const Str &replacement_code, &src }; - src.match(r.pcre_tables(), + src.match( &method_name, r.process(regexp).as_string(), options, &table, @@ -283,7 +283,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, kind))); } static void _upper(Request& r, const String& method_name, MethodParams *params) {