--- parser3/src/classes/int.C 2013/07/29 15:02:17 1.63 +++ parser3/src/classes/int.C 2016/11/01 23:10:40 1.67 @@ -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.63 2013/07/29 15:02:17 moko Exp $" IDENT_PA_VINT_H; +volatile const char * IDENT_INT_C="$Id: int.C,v 1.67 2016/11/01 23:10:40 moko Exp $" IDENT_PA_VINT_H; // externs @@ -28,23 +28,23 @@ public: // global variable -DECLARE_CLASS_VAR(int, new MInt, 0); +DECLARE_CLASS_VAR(int, new MInt); // methods static void _int(Request& r, MethodParams&) { VInt& vint=GET_SELF(r, VInt); - r.write_no_lang(*new VInt(vint.get_int())); + r.write(*new VInt(vint.get_int())); } static void _double(Request& r, MethodParams&) { VInt& vint=GET_SELF(r, VInt); - r.write_no_lang(*new VDouble(vint.as_double())); + r.write(*new VDouble(vint.as_double())); } static void _bool(Request& r, MethodParams&) { VInt& vint=GET_SELF(r, VInt); - r.write_no_lang(VBool::get(vint.as_bool())); + r.write(VBool::get(vint.as_bool())); } typedef void (*vint_op_func_ptr)(VInt& vint, double param); @@ -78,13 +78,13 @@ static void _sql(Request& r, MethodParam val=string->as_int(); else if(default_code) - val=r.process_to_value(*default_code).as_int(); + val=r.process(*default_code).as_int(); else { throw Exception(PARSER_RUNTIME, 0, "produced no result, but no default option specified"); } - r.write_no_lang(*new VInt(val)); + r.write(*new VInt(val)); } // constructor