--- parser3/src/classes/hashfile.C 2016/10/06 19:41:36 1.59 +++ parser3/src/classes/hashfile.C 2017/01/13 13:50:28 1.61 @@ -12,7 +12,7 @@ #include "pa_vhashfile.h" #include "pa_vhash.h" -volatile const char * IDENT_HASHFILE_C="$Id: hashfile.C,v 1.59 2016/10/06 19:41:36 moko Exp $"; +volatile const char * IDENT_HASHFILE_C="$Id: hashfile.C,v 1.61 2017/01/13 13:50:28 moko Exp $"; // class @@ -58,7 +58,7 @@ static void _hash(Request& r, MethodPara // write out result VHash& result=*new VHash(*self.get_hash()); - r.write_no_lang(result); + r.write(result); } static void _delete(Request& r, MethodParams& params) { @@ -107,19 +107,19 @@ static bool one_foreach_cycle( } Value& sv_processed=info.r->process(*info.body_code); - Request::Skip lskip=info.r->get_skip(); info.r->set_skip(Request::SKIP_NOTHING); + TempSkip4Delimiter skip(*info.r); const String* s_processed=sv_processed.get_string(); if(info.delim_maybe_code && s_processed && !s_processed->is_empty()) { // delimiter set and we have body if(info.need_delim) // need delim & iteration produced string? - info.r->write_pass_lang(info.r->process(*info.delim_maybe_code)); + info.r->write(info.r->process(*info.delim_maybe_code)); else info.need_delim=true; } - info.r->write_pass_lang(sv_processed); + info.r->write(sv_processed); - return lskip==Request::SKIP_BREAK; + return skip.check_break(); } static void _foreach(Request& r, MethodParams& params) { InCycle temp(r);