--- parser3/src/classes/string.C 2009/07/07 05:47:43 1.185 +++ parser3/src/classes/string.C 2009/08/08 13:30:20 1.188 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char * const IDENT_STRING_C="$Date: 2009/07/07 05:47:43 $"; +static const char * const IDENT_STRING_C="$Date: 2009/08/08 13:30:20 $"; #include "classes.h" #include "pa_vmethod_frame.h" @@ -292,7 +292,7 @@ static void split_with_options(Request& if(!bits) { const String* options=0; if(params_count>1) - options=¶ms.as_string(1, "options must not be code"); + options=¶ms.as_string(1, OPTIONS_MUST_NOT_BE_CODE); bits=split_options(options); } @@ -369,12 +369,12 @@ static void _match(Request& r, MethodPar size_t params_count=params.count(); Value& regexp=params.as_no_junction(0, "regexp must not be code"); - Value* options=(params_count>1)?¶ms.as_no_junction(1, "options must not be code"):0; + Value* options=(params_count>1)?¶ms.as_no_junction(1, OPTIONS_MUST_NOT_BE_CODE):0; VRegex* vregex; VRegexCleaner vrcleaner; - if(Value* value=regexp.as(VREGEX_TYPE, false)){ + if(Value* value=regexp.as(VREGEX_TYPE)){ if(options && options->is_defined()) throw Exception(PARSER_RUNTIME, 0, @@ -630,8 +630,8 @@ static void _save(Request& r, MethodPara } // write - String::Body sbody=src.cstr_to_string_body_untaint(String::L_AS_IS, r.connection(false/*no error if none*/)); - file_write(r.absolute(file_name), sbody.cstr(), sbody.length(), true, do_append); + String::Body sbody=src.cstr_to_string_body_untaint(String::L_AS_IS, r.connection(false/*no error if none*/)); + file_write(r.absolute(file_name), sbody.cstr(), sbody.length(), true, do_append); } static void _normalize(Request& r, MethodParams&) {