--- parser3/src/classes/op.C 2002/04/15 12:03:31 1.85 +++ parser3/src/classes/op.C 2002/10/14 13:53:20 1.112 @@ -3,16 +3,17 @@ Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) - - $Id: op.C,v 1.85 2002/04/15 12:03:31 paf Exp $ */ +static const char* IDENT_OP_C="$Date: 2002/10/14 13:53:20 $"; + #include "classes.h" #include "pa_common.h" #include "pa_request.h" #include "pa_vint.h" #include "pa_sql_connection.h" #include "pa_vdate.h" +#include "pa_vmethod_frame.h" // limits @@ -20,7 +21,6 @@ // defines -#define OP_CLASS_NAME "OP" #define CASE_DEFAULT_VALUE "DEFAULT" // class @@ -70,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_to_value(vbody)); // process marking tainted with that lang + r.write_pass_lang(r.process(vbody)); // process marking tainted with that lang } } @@ -92,7 +92,7 @@ static void _taint(Request& r, const Str { Value& vbody=params->as_no_junction(params->size()-1, "body must not be code"); - String result(r.pool()); + String& result=*new(pool) String(pool); result.append( vbody.as_string(), // process marking tainted with that lang lang, true); // force result language to specified @@ -101,41 +101,50 @@ static void _taint(Request& r, const Str } static void _process(Request& r, const String& method_name, MethodParams *params) { - // calculate pseudo file name of processed chars - // would be something like "/some/file(4) process" - char place[MAX_STRING]; -#ifndef NO_STRING_ORIGIN - const Origin& origin=method_name.origin(); - snprintf(place, MAX_STRING, "%s(%d) %s", - origin.file, 1+origin.line, - method_name.cstr()); -#else - strncpy(place, method_name.cstr(), MAX_STRING-1); place[MAX_STRING-1]=0; -#endif - - VStateless_class& self_class=*r.self->get_class(); + Pool& pool=r.pool(); + VStateless_class& self_class=*r.get_self()->get_class(); const Method *main_method; { // temporary remove language change Temp_lang temp_lang(r, String::UL_PASS_APPENDED); // temporary zero @main so to maybe-replace it in processed code - Temp_method temp_method_main(self_class, *main_method_name, 0); + Temp_method temp_method_main(self_class, r.main_method_name, 0); // temporary zero @auto so it wouldn't be auto-called in Request::use_buf Temp_method temp_method_auto(self_class, *auto_method_name, 0); // evaluate source to process - const String& source= - r.process_to_string(params->as_junction(0, "body must be code")); + 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 r.use_buf( source.cstr(String::UL_UNSPECIFIED, r.connection(0)), - place, + *new(pool) String(pool, heap_place, place_size, true /*tainted*/), + heap_place, &self_class); // main_method - main_method=self_class.get_method(*main_method_name); + main_method=self_class.get_method(r.main_method_name); } // after restoring current-request-lang // maybe-execute @main[] @@ -163,16 +172,14 @@ static void _while(Request& r, const Str &method_name, "endless loop detected"); - bool condition= - r.process_to_value( - vcondition, + bool condition=r.process_to_value(vcondition, /*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_to_value(body)); + r.write_pass_lang(r.process(body)); } } @@ -196,25 +203,25 @@ static void _for(Request& r, const Strin bool need_delim=false; VInt *vint=new(pool) VInt(pool, 0); + r.get_method_frame()->put_element(var_name, vint, false); for(int i=from; i<=to; i++) { vint->set_int(i); - r.root->put_element(var_name, vint); - 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_to_string(*delim_maybe_code)); + 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); } } 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_to_value(expr, + Value *value_result=r.process_to_value(expr, /*0/*no name YET* /,*/ true/*don't intercept string*/).as_expr_result(); if(params->size()>1) { @@ -222,11 +229,10 @@ static void _eval(Request& r, const Stri Pool& pool=r.pool(); String& string=*new(pool) String(pool); - string.APPEND_CONST(format(pool, result->as_double(), fmt.as_string().cstr())); - result=new(pool) VString(string); - } - result->set_name(method_name); - r.write_no_lang(*result); + string.APPEND_CONST(format(pool, value_result->as_double(), fmt.as_string().cstr())); + r.write_no_lang(string); + } else + r.write_no_lang(*value_result); } static void _connect(Request& r, const String& method_name, MethodParams *params) { @@ -261,7 +267,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_to_value(body_code)); + r.write_assign_lang(r.process(body_code)); } catch(...) { // process problem connection->mark_to_rollback(); /*re*/throw; @@ -286,8 +292,8 @@ 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()); - r.write_pass_lang(r.process_to_value(*selected_code)); + //selected_code->get_junction()->change_context(cases_code.get_junction()); + r.write_pass_lang(r.process(*selected_code)); } } @@ -305,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)); @@ -401,8 +407,10 @@ const String *locked_process_and_cache_p "cache_put", locked_process_and_cache_put_action, &info, false/*as_text*/, false/*do_append*/, - false/*block*/) ? info.evaluated_body: 0; - if(data.expires==0) + false/*block*/, + false/*fail on lock problem*/) ? info.evaluated_body: 0; + time_t now=time(0); + if(data.expires<=now) cache_delete(file_spec); return result; } @@ -434,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); @@ -534,23 +542,22 @@ static void _cache(Request& r, const Str VHash& exception2vhash(Pool& pool, const Exception& e) { VHash& result=*new(pool) VHash(pool); Hash& hash=result.hash(0); - if(const char *type=e.type()) + if(const char *type=e.type(true)) hash.put(*exception_type_part_name, new(pool) VString(*new(pool) String(pool, type))); if(const String *asource=e.problem_source()) { String& source=*new(pool) String(pool); source.append(*asource, String::UL_TAINTED, true/*forced*/); - result.set_name(source); hash.put(*exception_source_part_name, new(pool) VString(source)); #ifndef NO_STRING_ORIGIN const Origin& origin=source.origin(); - hash.put(*new(pool) String(pool, "file"), + hash.put(*new(pool) String(pool, "file", 0, true), new(pool) VString(*new(pool) String(pool, origin.file))); hash.put(*new(pool) String(pool, "lineno"), new(pool) VInt(pool, 1+origin.line)); #endif } - if(const char *ecomment=e.comment()) { + if(const char *ecomment=e.comment(true)) { int comment_size=strlen(ecomment); char *pcomment=(char *)pool.malloc(comment_size); memcpy(pcomment, ecomment, comment_size); @@ -569,38 +576,29 @@ static void _try_operator(Request& r, co Value& body_code=params->as_junction(0, "body_code must be code"); Value& catch_code=params->as_junction(1, "catch_code must be code"); - Value *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; + StringOrValue result; try { - result=&r.process_to_value(body_code); + 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); - result=&r.process_to_value(catch_code); + 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 } // write it out - r.write_pass_lang(*result); + r.write_pass_lang(result); } static void _throw_operator(Request& r, const String& method_name, MethodParams *params) { @@ -630,19 +628,17 @@ static void _throw_operator(Request& r, } else { const char *type=params->as_string(0, "type must be string").cstr(); const String& source=params->as_string(1, "source must be string"); - const char *comment=params->as_string(2, "comment must be string").cstr(); - throw Exception(type, &source, comment); + const char *comment=params->size()>2?params->as_string(2, "comment must be string").cstr():0; + throw Exception(type, &source, "%s", comment?comment:""); } } // constructor -MOP::MOP(Pool& apool) : Methoded(apool), +MOP::MOP(Pool& apool) : Methoded(apool, "OP"), main_sql_name(apool, MAIN_SQL_NAME), main_sql_drivers_name(apool, MAIN_SQL_DRIVERS_NAME) { - set_name(*NEW String(pool(), OP_CLASS_NAME)); - // ^if(condition){code-when-true} // ^if(condition){code-when-true}{code-when-false} add_native_method("if", Method::CT_ANY, _if, 2, 3); @@ -708,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); }