--- parser3/src/classes/string.C 2001/03/12 22:21:01 1.9 +++ parser3/src/classes/string.C 2001/03/27 16:35:52 1.13 @@ -3,7 +3,7 @@ Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) Author: Alexander Petrosyan (http://design.ru/paf) - $Id: string.C,v 1.9 2001/03/12 22:21:01 paf Exp $ + $Id: string.C,v 1.13 2001/03/27 16:35:52 paf Exp $ */ #include "pa_request.h" @@ -13,26 +13,26 @@ // global var -VClass *string_class; +VStateless_class *string_class; // methods static void _length(Request& r, const String&, Array *) { Pool& pool=r.pool(); Value& value=*new(pool) VDouble(pool, r.self->as_string().size()); - r.wcontext->write(value, String::Untaint_lang::NO /*always object, not string*/); + r.write_no_lang(value); } static void _int(Request& r, const String&, Array *) { Pool& pool=r.pool(); - Value& value=*new(pool) VInt(pool, (int)r.self->get_double()); - r.wcontext->write(value, String::Untaint_lang::NO /*always object, not string*/); + Value& value=*new(pool) VInt(pool, (int)r.self->as_double()); + r.write_no_lang(value); } static void _double(Request& r, const String&, Array *) { Pool& pool=r.pool(); - Value& value=*new(pool) VDouble(pool, r.self->get_double()); - r.wcontext->write(value, String::Untaint_lang::NO /*always object, not string*/); + Value& value=*new(pool) VDouble(pool, r.self->as_double()); + r.write_no_lang(value); } void _string_format(Request& r, const String& method_name, Array *params) { @@ -43,14 +43,14 @@ void _string_format(Request& r, const St r.fail_if_junction_(true, fmt, method_name, "fmt must not be junction"); - char *buf=format(pool, r.self->get_double(), fmt.as_string().cstr()); + char *buf=format(pool, r.self->as_double(), fmt.as_string().cstr()); - String *string=new(pool) String(pool); - r.wcontext->write(string->APPEND_CONST(buf), - String::Untaint_lang::NO /*always object, not string*/); + r.write_no_lang(String(pool, buf)); } -void initialize_string_class(Pool& pool, VClass& vclass) { +// initialize + +void initialize_string_class(Pool& pool, VStateless_class& vclass) { // ^string.length[] vclass.add_native_method("length", _length, 0, 0);