--- parser3/src/classes/double.C 2001/03/13 11:52:44 1.14 +++ parser3/src/classes/double.C 2001/03/30 05:51:11 1.19 @@ -3,7 +3,7 @@ Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) Author: Alexander Petrosyan (http://design.ru/paf) - $Id: double.C,v 1.14 2001/03/13 11:52:44 paf Exp $ + $Id: double.C,v 1.19 2001/03/30 05:51:11 paf Exp $ */ #include "pa_request.h" @@ -14,22 +14,22 @@ // global var -VClass *double_class; +VStateless_class *double_class; // methods static void _int(Request& r, const String&, Array *) { Pool& pool=r.pool(); VDouble *vdouble=static_cast(r.self); - Value& value=*new(pool) VInt(pool, (int)vdouble->get_double()); - r.wcontext->write(value, String::Untaint_lang::NO /*always object, not string*/); + Value& value=*new(pool) VInt(pool, (int)vdouble->as_double()); + r.write_no_lang(value); } static void _double(Request& r, const String&, Array *) { Pool& pool=r.pool(); VDouble *vdouble=static_cast(r.self); - Value& value=*new(pool) VDouble(pool, vdouble->get_double()); - r.wcontext->write(value, String::Untaint_lang::NO /*always object, not string*/); + Value& value=*new(pool) VDouble(pool, vdouble->as_double()); + r.write_no_lang(value); } typedef void (*vdouble_op_func_ptr)(VDouble& vdouble, double param); @@ -47,7 +47,7 @@ static void vdouble_op(Request& r, Array r.process( *static_cast(params->get(0)), 0/*no name*/, - false/*don't doubleercept string*/).get_double():1; + false/*don't intercept string*/).as_double():1/*used in inc/dec*/; (*func)(*vdouble, param); } @@ -57,26 +57,28 @@ static void _mul(Request& r, const Strin static void _div(Request& r, const String&, Array *params) { vdouble_op(r, params, &__div); } static void _mod(Request& r, const String&, Array *params) { vdouble_op(r, params, &__mod); } -void initialize_double_class(Pool& pool, VClass& vclass) { +// initialize + +void initialize_double_class(Pool& pool, VStateless_class& vclass) { // ^double.int[] - vclass.add_native_method("int", _int, 0, 0); + vclass.add_native_method("int", Method::CT_DYNAMIC, _int, 0, 0); // ^double.double[] - vclass.add_native_method("double", _double, 0, 0); + vclass.add_native_method("double", Method::CT_DYNAMIC, _double, 0, 0); // ^double.inc[] // ^double.inc[offset] - vclass.add_native_method("inc", _inc, 0, 1); + vclass.add_native_method("inc", Method::CT_DYNAMIC, _inc, 0, 1); // ^double.dec[] // ^double.dec[offset] - vclass.add_native_method("dec", _dec, 0, 1); + vclass.add_native_method("dec", Method::CT_DYNAMIC, _dec, 0, 1); // ^double.mul[k] - vclass.add_native_method("mul", _mul, 1, 1); + vclass.add_native_method("mul", Method::CT_DYNAMIC, _mul, 1, 1); // ^double.div[d] - vclass.add_native_method("div", _div, 1, 1); + vclass.add_native_method("div", Method::CT_DYNAMIC, _div, 1, 1); // ^double.mod[offset] - vclass.add_native_method("mod", _mod, 1, 1); + vclass.add_native_method("mod", Method::CT_DYNAMIC, _mod, 1, 1); // ^double.format[] - vclass.add_native_method("format", _string_format, 1, 1); + vclass.add_native_method("format", Method::CT_DYNAMIC, _string_format, 1, 1); }