--- parser3/src/classes/op.C 2002/04/15 10:35:21 1.83 +++ parser3/src/classes/op.C 2002/04/15 12:03:31 1.85 @@ -4,7 +4,7 @@ Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) - $Id: op.C,v 1.83 2002/04/15 10:35:21 paf Exp $ + $Id: op.C,v 1.85 2002/04/15 12:03:31 paf Exp $ */ #include "classes.h" @@ -46,9 +46,9 @@ static void _if(Request& r, const String /*0/*no name* /,*/ false/*don't intercept string*/).as_bool(); if(condition) - r.write_pass_lang(r.process_to_value(params->as_junction(1, "'then' parameter must be code"))); + r.write_pass_lang(r.process(params->as_junction(1, "'then' parameter must be code"))); else if(params->size()>2) - r.write_pass_lang(r.process_to_value(params->as_junction(2, "'else' parameter must be code"))); + r.write_pass_lang(r.process(params->as_junction(2, "'else' parameter must be code"))); } static void _untaint(Request& r, const String& method_name, MethodParams *params) { @@ -283,10 +283,7 @@ static void _switch(Request& r, const St Value& cases_code=params->as_junction(1, "switch cases must be code"); // execution of found ^case[...]{code} must be in context of ^switch[...]{code} // because of stacked WWrapper used there as wcontext - r.process( - cases_code, - true/*intercept_string*/ - ); + r.process(cases_code, true/*intercept_string*/); if(Value *selected_code=data.found ? data.found : data._default) { // setting code context, would execute in ^switch[...]{>>context<<} selected_code->get_junction()->change_context(cases_code.get_junction());