--- parser3/src/classes/int.C 2012/03/16 09:24:07 1.60 +++ parser3/src/classes/int.C 2016/03/31 21:46:20 1.65 @@ -1,7 +1,7 @@ /** @file Parser: @b int parser class. - Copyright (c) 2001-2012 Art. Lebedev Studio (http://www.artlebedev.com) + Copyright (c) 2001-2015 Art. Lebedev Studio (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ @@ -13,7 +13,7 @@ #include "pa_vint.h" #include "pa_vbool.h" -volatile const char * IDENT_INT_C="$Id: int.C,v 1.60 2012/03/16 09:24:07 moko Exp $" IDENT_PA_VINT_H; +volatile const char * IDENT_INT_C="$Id: int.C,v 1.65 2016/03/31 21:46:20 moko Exp $" IDENT_PA_VINT_H; // externs @@ -28,33 +28,21 @@ public: // global variable -DECLARE_CLASS_VAR(int, new MInt, 0); +DECLARE_CLASS_VAR(int, new MInt); // methods -static void _int(Request& r, MethodParams& params) { - // just checking (default) syntax validity, never really using it here, just for string.int compatibility - if(params.count()>0) - params.as_int(0, "default must be int", r); - +static void _int(Request& r, MethodParams&) { VInt& vint=GET_SELF(r, VInt); r.write_no_lang(*new VInt(vint.get_int())); } -static void _double(Request& r, MethodParams& params) { - // just checking (default) syntax validity, never really using it here, just for string.double compatibility - if(params.count()>0) - params.as_double(0, "default must be double", r); - +static void _double(Request& r, MethodParams&) { VInt& vint=GET_SELF(r, VInt); r.write_no_lang(*new VDouble(vint.as_double())); } -static void _bool(Request& r, MethodParams& params) { - // just checking (default) syntax validity, never really using it here, just for string.bool compatibility - if(params.count()>0) - params.as_bool(0, "default must be bool", r); - +static void _bool(Request& r, MethodParams&) { VInt& vint=GET_SELF(r, VInt); r.write_no_lang(VBool::get(vint.as_bool())); } @@ -81,14 +69,12 @@ static void _div(Request& r, MethodParam static void _mod(Request& r, MethodParams& params) { vint_op(r, params, &__mod); } // from string.C -extern -const String* sql_result_string(Request& r, MethodParams& params, - HashStringValue*& options, Value*& default_code); +extern const String* sql_result_string(Request& r, MethodParams& params, Value*& default_code); + static void _sql(Request& r, MethodParams& params) { int val; - HashStringValue* options; Value* default_code=0; - if(const String* string=sql_result_string(r, params, options, default_code)) + if(const String* string=sql_result_string(r, params, default_code)) val=string->as_int(); else if(default_code) @@ -105,12 +91,13 @@ static void _sql(Request& r, MethodParam MInt::MInt(): Methoded("int") { // ^int.int[] + // ^int.int[default for ^string.int compatibility] add_native_method("int", Method::CT_DYNAMIC, _int, 0, 1); - // ^int.double[] + // ^int.double[default for ^string.double compatibility] add_native_method("double", Method::CT_DYNAMIC, _double, 0, 1); - - // ^double.bool[] + // ^int.bool[] + // ^int.bool[default for ^string.bool compatibility] add_native_method("bool", Method::CT_DYNAMIC, _bool, 0, 1); // ^int.inc[]