--- parser3/src/classes/op.C 2002/03/29 11:28:40 1.80 +++ parser3/src/classes/op.C 2002/04/15 10:35:21 1.83 @@ -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.80 2002/03/29 11:28:40 paf Exp $ + $Id: op.C,v 1.83 2002/04/15 10:35:21 paf Exp $ */ #include "classes.h" @@ -21,6 +21,7 @@ // defines #define OP_CLASS_NAME "OP" +#define CASE_DEFAULT_VALUE "DEFAULT" // class @@ -41,13 +42,13 @@ private: static void _if(Request& r, const String&, MethodParams *params) { Value& condition_code=params->as_junction(0, "condition must be expression"); - bool condition=r.process(condition_code, - 0/*no name*/, + bool condition=r.process_to_value(condition_code, + /*0/*no name* /,*/ false/*don't intercept string*/).as_bool(); if(condition) - r.write_pass_lang(r.process(params->as_junction(1, "'then' parameter must be code"))); + r.write_pass_lang(r.process_to_value(params->as_junction(1, "'then' parameter must be code"))); else if(params->size()>2) - r.write_pass_lang(r.process(params->as_junction(2, "'else' parameter must be code"))); + r.write_pass_lang(r.process_to_value(params->as_junction(2, "'else' parameter must be code"))); } static void _untaint(Request& r, const String& method_name, MethodParams *params) { @@ -69,7 +70,7 @@ static void _untaint(Request& r, const S Value& vbody=params->as_junction(params->size()-1, "body must be code"); Temp_lang temp_lang(r, lang); // set temporarily specified ^untaint[language; - r.write_pass_lang(r.process(vbody)); // process marking tainted with that lang + r.write_pass_lang(r.process_to_value(vbody)); // process marking tainted with that lang } } @@ -124,7 +125,7 @@ static void _process(Request& r, const S // evaluate source to process const String& source= - r.process(params->as_junction(0, "body must be code")).as_string(); + r.process_to_string(params->as_junction(0, "body must be code")); // process source code, append processed methods to 'self' class // maybe-define new @main @@ -163,15 +164,15 @@ static void _while(Request& r, const Str "endless loop detected"); bool condition= - r.process( + r.process_to_value( vcondition, - 0/*no name*/, + /*0/*no name* /,*/ false/*don't intercept string*/).as_bool(); if(!condition) // ...condition is true break; // write processed body - r.write_pass_lang(r.process(body)); + r.write_pass_lang(r.process_to_value(body)); } } @@ -199,11 +200,11 @@ static void _for(Request& r, const Strin vint->set_int(i); r.root->put_element(var_name, vint); - Value& processed_body=r.process(body_code); + Value& processed_body=r.process_to_value(body_code); if(delim_maybe_code) { // delimiter set? const String *string=processed_body.get_string(); if(need_delim && string && string->size()) // need delim & iteration produced string? - r.write_pass_lang(r.process(*delim_maybe_code)); + r.write_pass_lang(r.process_to_string(*delim_maybe_code)); need_delim=true; } r.write_pass_lang(processed_body); @@ -213,8 +214,8 @@ static void _for(Request& r, const Strin static void _eval(Request& r, const String& method_name, MethodParams *params) { Value& expr=params->as_junction(0, "need expression"); // evaluate expresion - Value *result=r.process(expr, - 0/*no name YET*/, + Value *result=r.process_to_value(expr, + /*0/*no name YET* /,*/ true/*don't intercept string*/).as_expr_result(); if(params->size()>1) { Value& fmt=params->as_no_junction(1, "fmt must not be code"); @@ -260,7 +261,7 @@ r.sql_connect_time+=t[1]-t[0]; Temp_connection temp_connection(r, connection.get()); // execute body try { - r.write_assign_lang(r.process(body_code)); + r.write_assign_lang(r.process_to_value(body_code)); } catch(...) { // process problem connection->mark_to_rollback(); /*re*/throw; @@ -269,19 +270,28 @@ r.sql_connect_time+=t[1]-t[0]; #ifndef DOXYGEN struct Switch_data { + Request *r; Value *searching; Value *found; Value *_default; }; #endif static void _switch(Request& r, const String&, MethodParams *params) { - Switch_data data={&r.process(params->get(0))}; + Switch_data data={&r, &r.process_to_value(params->get(0))}; Temp_hash_value switch_data_setter(r.classes_conf, *switch_data_name, &data); - r.process(params->as_junction(1, "switch cases must be code")); // and ignore result - - if(Value *code=data.found ? data.found : data._default) - r.write_pass_lang(r.process(*code)); + 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*/ + ); + 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()); + r.write_pass_lang(r.process_to_value(*selected_code)); + } } static void _case(Request& r, const String& method_name, MethodParams *params) { @@ -295,10 +305,15 @@ static void _case(Request& r, const Stri int count=params->size(); Value *code=¶ms->as_junction(--count, "case result must be code"); + + // killing context for safety, would execute in ^switch[...]{>>context<<} + // reason: context is stacked, and it would become invalid afterwards + code->get_junction()->change_context(0); + for(int i=0; iget(i)); + Value& value=r.process_to_value(params->get(i)); - if(value.as_string() == *case_default_value) { + if(value.as_string() == CASE_DEFAULT_VALUE) { data->_default=code; break; } @@ -310,6 +325,11 @@ static void _case(Request& r, const Stri matches=data->searching->as_double() == value.as_double(); if(matches) { + if(data->found) + throw Exception("parser.runtime", + &method_name, + "duplicate found"); + data->found=code; break; } @@ -341,8 +361,8 @@ struct Cache_data { }; struct Locked_process_and_cache_put_action_info { Request *r; - Value *body; Cache_data *data; + Value *body_code; const String *evaluated_body; }; #endif static void locked_process_and_cache_put_action(int f, void *context) { @@ -350,16 +370,13 @@ static void locked_process_and_cache_put *static_cast(context); // body->process - info.body=&info.r->process(*info.body); + info.evaluated_body=&info.r->process_to_string(*info.body_code); // expiration time not spoiled by ^cache(0) or something? if(info.data->expires > time(0)) { - // result->string - const String& data_string=info.body->as_string(); - // string -serialize> buffer void *data; size_t data_size; - data_string.serialize( + info.evaluated_body->serialize( sizeof(Data_string_serialized_prolog), data, data_size); Data_string_serialized_prolog& prolog= @@ -372,22 +389,22 @@ static void locked_process_and_cache_put } else // expired! info.data->expires=0; // flag it so that could be easily checked by caller } -Value *locked_process_and_cache_put(Request& r, +const String *locked_process_and_cache_put(Request& r, Value& body_code, Cache_data& data, const String& file_spec) { Locked_process_and_cache_put_action_info info={ &r, - &body_code, - &data + &data, + &body_code }; - Value *result=file_write_action_under_lock( + const String *result=file_write_action_under_lock( file_spec, "cache_put", locked_process_and_cache_put_action, &info, false/*as_text*/, false/*do_append*/, - false/*block*/) ? info.body : 0; + false/*block*/) ? info.evaluated_body: 0; if(data.expires==0) cache_delete(file_spec); return result; @@ -489,7 +506,8 @@ static void _cache(Request& r, const Str } // non-blocked lock; process; cache it - if(Value *processed_body=locked_process_and_cache_put(r, body_code, data, file_spec)) { + if(const String*processed_body= + locked_process_and_cache_put(r, body_code, data, file_spec)) { // write it out r.write_assign_lang(*processed_body); // happy with it @@ -506,7 +524,7 @@ static void _cache(Request& r, const Str // instructed not to cache; forget cached copy cache_delete(file_spec); // process - Value& processed_body=r.process(body_code); + const String& processed_body=r.process_to_string(body_code); // write it out r.write_assign_lang(processed_body); // happy with it @@ -562,7 +580,7 @@ static void _try_operator(Request& r, co Value *sself=r.self, *sroot=r.root, *srcontext=r.rcontext; WContext *swcontext=r.wcontext; try { - result=&r.process(body_code); + result=&r.process_to_value(body_code); } catch(const Exception& e) { // restoring request processing status //r.exception_trace.top_index(ssexception_trace); @@ -575,7 +593,7 @@ static void _try_operator(Request& r, co Junction *junction=catch_code.get_junction(); Value *saved_exception_var_value=junction->root->get_element(*exception_var_name); junction->root->put_element(*exception_var_name, &vhash); - result=&r.process(catch_code); + result=&r.process_to_value(catch_code); bool handled=false; if(Value *value=static_cast(vhash.hash(0).get(*exception_handled_part_name))) handled=value->as_bool();