--- parser3/src/classes/string.C 2003/04/08 13:58:30 1.125.2.15.2.24 +++ parser3/src/classes/string.C 2003/07/24 11:31:20 1.126 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_STRING_C="$Date: 2003/04/08 13:58:30 $"; +static const char* IDENT_STRING_C="$Date: 2003/07/24 11:31:20 $"; #include "classes.h" #include "pa_vmethod_frame.h" @@ -128,7 +128,7 @@ static void _pos(Request& r, MethodParam Value& substr=params.as_no_junction(0, "substr must not be code"); const String& string=GET_SELF(r, VString).string(); - r.write_assign_lang(*new VInt(string.pos(substr.as_string()))); + r.write_assign_lang(*new VInt((int)string.pos(substr.as_string()))); } static void split_list(Request& r, @@ -163,8 +163,8 @@ static int split_options(const String* o int result=0; if(options) { for(Split_option *o=split_option; o->keyL; o++) - if(options->pos(o->keyL)>=0 - || (o->keyU && options->pos(o->keyU)>=0)) { + if(options->pos(o->keyL)!=STRING_NOT_FOUND + || (o->keyU && options->pos(o->keyU)!=STRING_NOT_FOUND)) { if(result & o->checkBit) throw Exception("parser.runtime", options, @@ -311,7 +311,7 @@ static void _match(Request& r, MethodPar String result; VTable* vtable=new VTable; - Replace_action_info info; + Replace_action_info info={0}; info.request=&r; info.src=&src; info.dest=&result;