--- parser3/src/classes/string.C 2009/04/10 11:31:06 1.170 +++ parser3/src/classes/string.C 2009/04/17 09:05:33 1.173 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char * const IDENT_STRING_C="$Date: 2009/04/10 11:31:06 $"; +static const char * const IDENT_STRING_C="$Date: 2009/04/17 09:05:33 $"; #include "classes.h" #include "pa_vmethod_frame.h" @@ -116,7 +116,7 @@ static void _bool(Request& r, MethodPara rethrow; // we have a problem when no default } - r.write_no_lang(*new VBool(converted)); + r.write_no_lang(VBool::get(converted)); } /*not static*/void _string_format(Request& r, MethodParams& params) { @@ -376,11 +376,10 @@ static void _match(Request& r, MethodPar regexp.as_string(), options, search_action, 0, matches_count); - // r.write_assign_lang(*new VTable(table)); if(table){ r.write_assign_lang(*new VTable(table)); } else { - r.write_assign_lang(*new VInt(matches_count)); + r.write_no_lang(*new VInt(matches_count)); } } else { // replace @@ -399,7 +398,7 @@ static void _match(Request& r, MethodPar *replacement_code.get_junction()->method_frame, match_var_name, vtable); src.match(r.charsets.source(), - r.process_to_string(regexp), options, + regexp.as_string(), options, replace_action, &info, matches_count); r.write_assign_lang(result);