--- parser3/src/classes/op.C 2002/08/01 11:26:44 1.98 +++ parser3/src/classes/op.C 2002/10/14 13:53:20 1.112 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_OP_C="$Id: op.C,v 1.98 2002/08/01 11:26:44 paf Exp $"; +static const char* IDENT_OP_C="$Date: 2002/10/14 13:53:20 $"; #include "classes.h" #include "pa_common.h" @@ -13,6 +13,7 @@ static const char* IDENT_OP_C="$Id: op.C #include "pa_vint.h" #include "pa_sql_connection.h" #include "pa_vdate.h" +#include "pa_vmethod_frame.h" // limits @@ -101,23 +102,7 @@ static void _taint(Request& r, const Str static void _process(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); - // calculate pseudo file name of processed chars - // would be something like "/some/file(4) process" - char local_place[MAX_STRING]; -#ifndef NO_STRING_ORIGIN - const Origin& origin=method_name.origin(); - size_t place_size=snprintf(local_place, MAX_STRING, "%s(%d) %s", - origin.file?origin.file:"unknown_file", 1+origin.line, - method_name.cstr())+1; -#else - strncpy(local_place, method_name.cstr(), MAX_STRING-1); place[MAX_STRING-1]=0; - size_t place_size=strlen(local_place)+1; -#endif - char *heap_place=(char *)r.malloc(place_size); - memcpy(heap_place, local_place, place_size); - - - VStateless_class& self_class=*r.self->get_class(); + VStateless_class& self_class=*r.get_self()->get_class(); const Method *main_method; { // temporary remove language change @@ -129,6 +114,26 @@ static void _process(Request& r, const S // evaluate source to process const String& source=r.process_to_string(params->as_junction(0, "body must be code")); + // calculate pseudo file name of processed chars + // would be something like "/some/file(4) process" + char local_place[MAX_STRING]; +#ifndef NO_STRING_ORIGIN + const Origin& source_origin=source.origin(); + const Origin& method_origin=method_name.origin(); + size_t place_size; + if(source_origin.file==method_origin.file) + place_size=snprintf(local_place, MAX_STRING, "%s(%d) %s", // same file + source_origin.file?source_origin.file:"unknown_file", 1+source_origin.line, + method_name.cstr())+1; + else // different files ^process{external__file_text__or__sql} + place_size=snprintf(local_place, MAX_STRING, "%s", + source_origin.file?source_origin.file:"unknown_file")+1; +#else + strncpy(local_place, method_name.cstr(), MAX_STRING-1); place[MAX_STRING-1]=0; + size_t place_size=strlen(local_place)+1; +#endif + char *heap_place=(char *)r.malloc(place_size); + memcpy(heap_place, local_place, place_size); // process source code, append processed methods to 'self' class // maybe-define new @main @@ -198,18 +203,18 @@ static void _for(Request& r, const Strin bool need_delim=false; VInt *vint=new(pool) VInt(pool, 0); - r.root->put_element(var_name, vint); + r.get_method_frame()->put_element(var_name, vint, false); for(int i=from; i<=to; i++) { vint->set_int(i); - StringOrValue processed_body=r.process(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? + StringOrValue sv_processed=r.process(body_code); + const String *s_processed=sv_processed.get_string(); + if(delim_maybe_code && s_processed && s_processed->size()) { // delimiter set and we have body + if(need_delim) // need delim & iteration produced string? r.write_pass_lang(r.process(*delim_maybe_code)); need_delim=true; } - r.write_pass_lang(processed_body); + r.write_pass_lang(sv_processed); } } @@ -287,7 +292,7 @@ static void _switch(Request& r, const St 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()); + //selected_code->get_junction()->change_context(cases_code.get_junction()); r.write_pass_lang(r.process(*selected_code)); } } @@ -306,7 +311,7 @@ static void _case(Request& r, const Stri // 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); + //code->get_junction()->change_context(0); for(int i=0; iget(i)); @@ -404,7 +409,8 @@ const String *locked_process_and_cache_p false/*do_append*/, false/*block*/, false/*fail on lock problem*/) ? info.evaluated_body: 0; - if(data.expires==0) + time_t now=time(0); + if(data.expires<=now) cache_delete(file_spec); return result; } @@ -436,8 +442,8 @@ static time_t as_expires(Request& r, con int index, time_t now) { time_t result; Value& vlifespan_or_expires=params->get(index); - if(strcmp(vlifespan_or_expires.type(), VDATE_TYPE)==0) - result=static_cast(vlifespan_or_expires).get_time(); + if(Value *vdate=vlifespan_or_expires.as(VDATE_TYPE, false)) + result=static_cast(vdate)->get_time(); else result=now+(time_t)params->as_double(index, "lifespan must be date or number", r); @@ -571,31 +577,22 @@ static void _try_operator(Request& r, co Value& catch_code=params->as_junction(1, "catch_code must be code"); StringOrValue result; - - // taking snapshot of request processing status - //int ssexception_trace=r.exception_trace.top_index(); - int sstack=r.stack.top_index(); - Value *sself=r.self, *sroot=r.root, *srcontext=r.rcontext; - WContext *swcontext=r.wcontext; try { + Request_context_saver context_saved(r); // taking snapshot of request processing status, restoring it at } result=r.process(body_code); + context_saved.restore(); // manually restoring context } catch(const Exception& e) { - // restoring request processing status - //r.exception_trace.top_index(ssexception_trace); - r.stack.top_index(sstack); - r.self=sself; r.root=sroot, r.rcontext=srcontext; r.wcontext=swcontext; - - VHash& vhash=exception2vhash(pool, e); 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); + Value *method_frame=junction->method_frame; + Value *saved_exception_var_value=method_frame->get_element(*exception_var_name, method_frame, false); + junction->method_frame->put_element(*exception_var_name, &vhash, false); result=r.process(catch_code); bool handled=false; if(Value *value=static_cast(vhash.hash(0).get(*exception_handled_part_name))) handled=value->as_bool(); - junction->root->put_element(*exception_var_name, saved_exception_var_value); + junction->method_frame->put_element(*exception_var_name, saved_exception_var_value, false); if(!handled) throw(e); // rethrow @@ -707,8 +704,8 @@ void MOP::configure_user(Request& r) { Pool& pool=r.pool(); // $MAIN:SQL.drivers - if(Value *sql=r.main_class->get_element(main_sql_name)) - if(Value *element=sql->get_element(main_sql_drivers_name)) + if(Value *sql=r.main_class->get_element(main_sql_name, r.main_class, false)) + if(Value *element=sql->get_element(main_sql_drivers_name, sql, false)) if(Table *protocol2library=element->get_table()) r.classes_conf.put(name(), protocol2library); }