--- parser3/src/classes/string.C 2025/10/05 19:41:27 1.263 +++ parser3/src/classes/string.C 2026/04/25 13:38:46 1.267 @@ -1,7 +1,7 @@ /** @file Parser: @b string parser class. - Copyright (c) 2001-2024 Art. Lebedev Studio (http://www.artlebedev.com) + Copyright (c) 2001-2026 Art. Lebedev Studio (https://www.artlebedev.com) Authors: Konstantin Morshnev , Alexandr Petrosian */ @@ -22,7 +22,7 @@ #include "pa_vregex.h" #include "pa_charsets.h" -volatile const char * IDENT_STRING_C="$Id: string.C,v 1.263 2025/10/05 19:41:27 moko Exp $"; +volatile const char * IDENT_STRING_C="$Id: string.C,v 1.267 2026/04/25 13:38:46 moko Exp $"; // class @@ -65,31 +65,28 @@ static const String match_var_name(MATCH // methods static void _length(Request& r, MethodParams&) { - double result=GET_SELF(r, VString).string().length(r.charsets.source()); + double result=(double)GET_SELF(r, VString).string().length(r.charsets.source()); r.write(*new VDouble(result)); } static void _int(Request& r, MethodParams& params) { const String& self_string=GET_SELF(r, VString).string(); - int converted; if(self_string.is_empty()) { if(params.count()>0) - converted=params.as_int(0, "default must be int", r); // (default) + r.write(*new VInt(params.as_wint(0, "default must be int", r))); // (default) else throw Exception(PARSER_RUNTIME, 0, "unable to convert empty string without default specified"); } else { try { - converted=self_string.as_int(); + r.write(*new VInt(self_string.as_wint())); } catch(...) { // convert problem if(params.count()>0) - converted=params.as_int(0, "default must be int", r); // (default) + r.write(*new VInt(params.as_wint(0, "default must be int", r))); // (default) else rethrow; // we have a problem when no default } } - - r.write(*new VInt(converted)); } static void _double(Request& r, MethodParams& params) {