--- parser3/src/classes/int.C 2001/10/09 07:06:00 1.35 +++ parser3/src/classes/int.C 2003/02/04 14:04:46 1.49.2.2 @@ -1,12 +1,12 @@ /** @file Parser: @b int parser class. - Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) - Author: Alexander Petrosyan (http://design.ru/paf) - - $Id: int.C,v 1.35 2001/10/09 07:06:00 parser Exp $ + Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com) + Author: Alexandr Petrosian (http://paf.design.ru) */ +static const char* IDENT_INT_C="$Date: 2003/02/04 14:04:46 $"; + #include "classes.h" #include "pa_request.h" #include "pa_vdouble.h" @@ -14,11 +14,7 @@ // externs -void _string_format(Request& r, const String& method_name, MethodParams *); - -// defines - -#define INT_CLASS_NAME "int" +void _string_format(Request& r, StringPtr method_name, MethodParams& ); // class @@ -31,20 +27,24 @@ public: // Methoded // methods -static void _int(Request& r, const String& method_name, MethodParams *) { +static void _int(Request& r, StringPtr method_name, MethodParams& params) { Pool& pool=r.pool(); - VInt *vint=static_cast(r.self); - Value& result=*new(pool) VInt(pool, vint->get_int()); - result.set_name(method_name); - r.write_no_lang(result); + // just checking (default) syntax validity, never really using it here, just for string.int compatibility + if(params.count()>0) + params.as_junction(0, "default must be int"); + + VInt *vint=static_cast(r.get_self()); + r.write_no_lang(*new(pool) VInt(pool, vint->get_int())); } -static void _double(Request& r, const String& method_name, MethodParams *) { +static void _double(Request& r, StringPtr method_name, MethodParams& params) { Pool& pool=r.pool(); - VInt *vint=static_cast(r.self); - Value& result=*new(pool) VDouble(pool, vint->as_double()); - result.set_name(method_name); - r.write_no_lang(result); + // just checking (default) syntax validity, never really using it here, just for string.doube compatibility + if(params.count()>0) + params.as_junction(0, "default must be double"); + + VInt *vint=static_cast(r.get_self()); + r.write_no_lang(*new(pool) VDouble(pool, vint->as_double())); } typedef void (*vint_op_func_ptr)(VInt& vint, double param); @@ -57,62 +57,50 @@ static void __mod(VInt& vint, double par static void vint_op(Request& r, MethodParams *params, vint_op_func_ptr func) { - VInt *vint=static_cast(r.self); - double param=params->size()?params->as_double(0, "param must be numerical", r):1; + VInt *vint=static_cast(r.get_self()); + double param=params.count()?params.as_double(0, "param must be numerical", r):1; (*func)(*vint, param); } -static void _inc(Request& r, const String&, MethodParams *params) { vint_op(r, params, &__inc); } -static void _dec(Request& r, const String&, MethodParams *params) { vint_op(r, params, &__dec); } -static void _mul(Request& r, const String&, MethodParams *params) { vint_op(r, params, &__mul); } -static void _div(Request& r, const String&, MethodParams *params) { vint_op(r, params, &__div); } -static void _mod(Request& r, const String&, MethodParams *params) { vint_op(r, params, &__mod); } +static void _inc(Request& r, StringPtr /*method_name*/, MethodParams& params) { vint_op(r, params, &__inc); } +static void _dec(Request& r, StringPtr /*method_name*/, MethodParams& params) { vint_op(r, params, &__dec); } +static void _mul(Request& r, StringPtr /*method_name*/, MethodParams& params) { vint_op(r, params, &__mul); } +static void _div(Request& r, StringPtr /*method_name*/, MethodParams& params) { vint_op(r, params, &__div); } +static void _mod(Request& r, StringPtr /*method_name*/, MethodParams& params) { vint_op(r, params, &__mod); } // from string.C extern -const String* sql_result_string(Request& r, const String& method_name, - MethodParams *params, - Hash *&options); +const String* sql_result_string(Request& r, StringPtr method_name, MethodParams& params, + Hash *& options, Value *& default_code); -static void _sql(Request& r, const String& method_name, MethodParams *params) { +static void _sql(Request& r, StringPtr method_name, MethodParams& params) { Pool& pool=r.pool(); int val; Hash *options; - if(const String *string=sql_result_string(r, method_name, params, options)) + Value *default_code; + if(const String *string=sql_result_string(r, method_name, params, options, default_code)) val=string->as_int(); else - if(options) { - if(Value *vdefault=(Value *)options->get(*sql_default_name)) - val=r.process(*vdefault).as_int(); - else { - PTHROW(0, 0, - &method_name, - "produced no result, but no default option specified"); - val=0; //calm, compiler - } - } else { - PTHROW(0, 0, + if(default_code) + val=r.process_to_value(*default_code).as_int(); + else { + throw Exception("parser.runtime", &method_name, - "produced no result, but no options (no default) specified"); + "produced no result, but no default option specified"); val=0; //calm, compiler } - VInt& result=*new(pool) VInt(pool, val); - result.set_name(method_name); - r.write_assign_lang(result); + r.write_no_lang(*new(pool) VInt(pool, val)); } // constructor -MInt::MInt(Pool& apool) : Methoded(apool) { - set_name(*NEW String(pool(), INT_CLASS_NAME)); - - +MInt::MInt(Pool& apool) : Methoded(apool, "int") { // ^int.int[] - add_native_method("int", Method::CT_DYNAMIC, _int, 0, 0); + add_native_method("int", Method::CT_DYNAMIC, _int, 0, 1); // ^int.double[] - add_native_method("double", Method::CT_DYNAMIC, _double, 0, 0); + add_native_method("double", Method::CT_DYNAMIC, _double, 0, 1); // ^int.inc[] // ^int.inc[offset]