--- parser3/src/classes/op.C 2002/04/15 06:45:55 1.82 +++ parser3/src/classes/op.C 2003/02/04 14:04:46 1.127.2.7 @@ -1,18 +1,19 @@ /** @file Parser: parser @b operators. - Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) - - $Id: op.C,v 1.82 2002/04/15 06:45:55 paf Exp $ */ +static const char* IDENT_OP_C="$Date: 2003/02/04 14:04:46 $"; + #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,45 +21,41 @@ // defines -#define OP_CLASS_NAME "OP" #define CASE_DEFAULT_VALUE "DEFAULT" // class -class MOP : public Methoded { +class VClassMAIN: public VClass { public: - MOP(Pool& pool); -public: // Methoded - bool used_directly() { return true; } - void configure_user(Request& r); - -private: - String main_sql_name; - String main_sql_drivers_name; + VClassMAIN(Pool& apool); }; +// helpers + +Hash Hash untaint_lang_name2enum; + // methods -static void _if(Request& r, const String&, MethodParams *params) { - Value& condition_code=params->as_junction(0, "condition must be expression"); +static void _if(Request& r, StringPtr /*method_name*/, MethodParams& params) { + Value& condition_code=params.as_junction(0, "condition must be expression"); bool condition=r.process_to_value(condition_code, - 0/*no name*/, + /*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"))); - 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(1, "'then' parameter must be code"))); + else if(params.count()>2) + 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) { +static void _untaint(Request& r, StringPtr method_name, MethodParams& params) { Pool& pool=r.pool(); uchar lang; - if(params->size()==1) + if(params.count()==1) lang=String::UL_AS_IS; // mark as simply 'tainted'. useful in html from sql else { - const String& lang_name=params->as_string(0, "lang must be string"); + const String& lang_name=params.as_string(0, "lang must be string"); lang=untaint_lang_name2enum->get_int(lang_name); if(!lang) throw Exception(0, @@ -67,21 +64,21 @@ static void _untaint(Request& r, const S } { - Value& vbody=params->as_junction(params->size()-1, "body must be code"); + Value& vbody=params.as_junction(params.count()-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 } } -static void _taint(Request& r, const String&, MethodParams *params) { +static void _taint(Request& r, StringPtr /*method_name*/, MethodParams& params) { Pool& pool=r.pool(); uchar lang; - if(params->size()==1) + if(params.count()==1) lang=String::UL_TAINTED; // mark as simply 'tainted'. useful in table:set else { - const String& lang_name=params->as_string(0, "lang must be string"); + const String& lang_name=params.as_string(0, "lang must be string"); lang=untaint_lang_name2enum->get_int(lang_name); if(!lang) throw Exception(0, @@ -90,9 +87,9 @@ static void _taint(Request& r, const Str } { - Value& vbody=params->as_no_junction(params->size()-1, "body must not be code"); + Value& vbody=params.as_no_junction(params.count()-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 @@ -100,60 +97,81 @@ 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(); +static void _process(Request& r, StringPtr method_name, MethodParams& params) { + Pool& pool=r.pool(); const Method *main_method; + Value& target_self=params.count()>1? + params.as_no_junction(0, "target must not be code") + :r.get_method_frame()->caller()->self(); { + Value& vjunction=params.as_junction(params.count()-1, "body must be code"); + + VStateless_class *target_class=target_self.get_last_derived_class(); + if(!target_class) + throw Exception("parser.runtime", + &method_name, + "no target class"); + + // evaluate source to process + const String& source=r.process_to_string(vjunction); + // 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(*target_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); + Temp_method temp_method_auto(*target_class, *auto_method_name, 0); - // 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 - r.use_buf( + r.use_buf(*target_class, source.cstr(String::UL_UNSPECIFIED, r.connection(0)), - place, - &self_class); + *new(pool) String(pool, heap_place, place_size, true /*tainted*/), + heap_place); // main_method - main_method=self_class.get_method(*main_method_name); + main_method=target_class->get_method(r.main_method_name); } // after restoring current-request-lang // maybe-execute @main[] if(main_method) { + // temporarily set method_frame's self to target_self + Temp_method_frame_self tmfs(*r.get_method_frame(), target_self); // execute! r.execute(*main_method->parser_code); } } -static void _rem(Request& r, const String&, MethodParams *params) { - params->as_junction(0, "body must be code"); +static void _rem(Request& r, StringPtr /*method_name*/, MethodParams& params) { + params.as_junction(0, "body must be code"); } -static void _while(Request& r, const String& method_name, MethodParams *params) { +static void _while(Request& r, StringPtr method_name, MethodParams& params) { Pool& pool=r.pool(); - Value& vcondition=params->as_junction(0, "condition must be expression"); - Value& body=params->as_junction(1, "body must be code"); + Value& vcondition=params.as_junction(0, "condition must be expression"); + Value& body=params.as_junction(1, "body must be code"); // while... int endless_loop_count=0; @@ -163,31 +181,29 @@ static void _while(Request& r, const Str &method_name, "endless loop detected"); - bool condition= - r.process_to_value( - vcondition, - 0/*no name*/, + 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)); } } -static void _use(Request& r, const String& method_name, MethodParams *params) { - Value& vfile=params->as_no_junction(0, "file name must not be code"); - r.use_file(vfile.as_string()); +static void _use(Request& r, StringPtr method_name, MethodParams& params) { + Value& vfile=params.as_no_junction(0, "file name must not be code"); + r.use_file(r.main_class, vfile.as_string()); } -static void _for(Request& r, const String& method_name, MethodParams *params) { +static void _for(Request& r, StringPtr method_name, MethodParams& params) { Pool& pool=r.pool(); - const String& var_name=params->as_string(0, "var name must be string"); - int from=params->as_int(1, "from must be int", r); - int to=params->as_int(2, "to must be int", r); - Value& body_code=params->as_junction(3, "body must be code"); - Value *delim_maybe_code=params->size()>4?¶ms->get(4):0; + const String& var_name=params.as_string(0, "var name must be string"); + int from=params.as_int(1, "from must be int", r); + int to=params.as_int(2, "to must be int", r); + Value& body_code=params.as_junction(3, "body must be code"); + Value *delim_maybe_code=params.count()>4?¶ms.get(4):0; if(to-from>=MAX_LOOPS) // too long loop? throw Exception("parser.runtime", @@ -196,49 +212,52 @@ static void _for(Request& r, const Strin bool need_delim=false; VInt *vint=new(pool) VInt(pool, 0); + r.get_method_frame()->caller()->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"); +static void _eval(Request& r, StringPtr method_name, MethodParams& params) { + Value& expr=params.as_junction(0, "need expression"); // evaluate expresion - Value *result=r.process_to_value(expr, - 0/*no name YET*/, + Value *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"); + if(params.count()>1) { + Value& fmt=params.as_no_junction(1, "fmt must not be code"); 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) { +static void _connect(Request& r, StringPtr method_name, MethodParams& params) { Pool& pool=r.pool(); #ifdef RESOURCES_DEBUG struct timeval mt[2]; #endif - Value& url=params->as_no_junction(0, "url must not be code"); - Value& body_code=params->as_junction(1, "body must be code"); + Value& url=params.as_no_junction(0, "url must not be code"); + Value& body_code=params.as_junction(1, "body must be code"); - Table *protocol2driver_and_client= - static_cast(r.classes_conf.get(r.OP.name())); + Table *protocol2driver_and_client=0; + if(Value *sql=r.main_class.get_element(*new(pool) String(pool, MAIN_SQL_NAME), r.main_class, false)) { + if(Value *element=sql->get_element(*new(pool) String(pool, MAIN_SQL_DRIVERS_NAME), *sql, false)) { + protocol2driver_and_client=element->get_table(); + } + } #ifdef RESOURCES_DEBUG //measure:before @@ -261,10 +280,10 @@ 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; + rethrow; } } @@ -274,31 +293,24 @@ struct Switch_data { Value *searching; Value *found; Value *_default; - Value *result; }; #endif -static void switch_postexecute(void *info) { - Switch_data& data=*static_cast(info); - - if(Value *code=data.found ? data.found : data._default) - data.result=&data.r->process_to_value(*code); -} -static void _switch(Request& r, const String&, MethodParams *params) { - Switch_data data={&r, &r.process_to_value(params->get(0))}; +static void _switch(Request& r, StringPtr /*method_name*/, MethodParams& params) { + Switch_data data={&r, &r.process_to_value(params.get(0))}; Temp_hash_value switch_data_setter(r.classes_conf, *switch_data_name, &data); + 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_to_nothing( - params->as_junction(1, "switch cases must be code"), - switch_postexecute, &data - ); - - if(data.result) - r.write_pass_lang(*data.result); + 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(*selected_code)); + } } -static void _case(Request& r, const String& method_name, MethodParams *params) { +static void _case(Request& r, StringPtr method_name, MethodParams& params) { Pool& pool=r.pool(); Switch_data *data=static_cast(r.classes_conf.get(*switch_data_name)); @@ -307,10 +319,15 @@ static void _case(Request& r, const Stri &method_name, "without switch"); - int count=params->size(); - Value *code=¶ms->as_junction(--count, "case result must be code"); + int count=params.count(); + 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) { data->_default=code; @@ -339,7 +356,7 @@ static void _case(Request& r, const Stri // consts -const int DATA_STRING_SERIALIZED_VERSION=0x0002; +const int DATA_STRING_SERIALIZED_VERSION=0x0003; // helper types @@ -364,6 +381,10 @@ struct Locked_process_and_cache_put_acti Value *body_code; const String *evaluated_body; }; #endif +/* @todo maybe network order worth spending some effort? + don't bothering myself with network byte order, + am not planning to be able to move resulting file across platforms +*/ static void locked_process_and_cache_put_action(int f, void *context) { Locked_process_and_cache_put_action_info& info= *static_cast(context); @@ -403,8 +424,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; } @@ -413,6 +436,7 @@ String *cache_get(Pool& pool, const Stri if(file_read(pool, file_spec, data, data_size, false/*as_text*/, + 0, 0, //no params&out_fields false/*fail_on_read_problem*/) && data_size/* ignore reads which are empty due to non-unary open+lockEX conflict with lockSH */) { @@ -432,27 +456,27 @@ String *cache_get(Pool& pool, const Stri return 0; } -static time_t as_expires(Request& r, const String& method_name, MethodParams *params, +static time_t as_expires(Request& r, StringPtr method_name, MethodParams& params, 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(); + Value& vlifespan_or_expires=params.get(index); + 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); + result=now+(time_t)params.as_double(index, "lifespan must be date or number", r); return result; } static const String as_file_spec(Request&r, MethodParams *params, int index) { - return r.absolute(params->as_string(index, "filespec must be string")); + return r.absolute(params.as_string(index, "filespec must be string")); } -static void _cache(Request& r, const String& method_name, MethodParams *params) { +static void _cache(Request& r, StringPtr method_name, MethodParams& params) { Pool& pool=r.pool(); time_t now=time(0); // ^cache[filename] ^cache(seconds) ^cache[expires date] - if(params->size()==1) { - if(params->get(0).is_string()) { // filename? + if(params.count()==1) { + if(params.get(0).is_string()) { // filename? cache_delete(as_file_spec(r, params, 0)); return; } @@ -472,12 +496,12 @@ static void _cache(Request& r, const Str } // file_spec, expires, body code - const String &file_spec=r.absolute(params->as_string(0, "filespec must be string")); + const String &file_spec=r.absolute(params.as_string(0, "filespec must be string")); Cache_data data; Temp_hash_value cache_data_setter(r.classes_conf, *cache_data_name, &data); data.expires=as_expires(r, method_name, params, 1, now); - Value& body_code=params->as_junction(2, "body must be code"); + Value& body_code=params.as_junction(2, "body must be code"); if(data.expires>now) { // valid 'expires' specified? try cached copy... // hence we don't hope to have unary create/lockEX @@ -533,26 +557,25 @@ static void _cache(Request& r, const Str } // also used in pa_request.C to pass param to @unhandled_exception -VHash& exception2vhash(Pool& pool, const Exception& e) { - VHash& result=*new(pool) VHash(pool); +VHashPtr exception2vhash(const Exception& e) { + VHashPtr result(new VHash)); 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); @@ -565,59 +588,55 @@ VHash& exception2vhash(Pool& pool, const return result; } -static void _try_operator(Request& r, const String& method_name, MethodParams *params) { +static void _try_operator(Request& r, StringPtr method_name, MethodParams& params) { Pool& pool=r.pool(); - 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; + Value& body_code=params.as_junction(0, "body_code must be code"); + Value& catch_code=params.as_junction(1, "catch_code must be code"); - // 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; + // taking snapshot of try-context + Request_context_saver try_context(r); try { - result=&r.process_to_value(body_code); + result=r.process(body_code); } 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); + Request_context_saver throw_context(r); // taking snapshot of throw-context [stack trace contains error] + try_context.restore(); // restoring try-context to perform catch-code + + VHashPtr 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) + if(!handled) { + throw_context.restore(); // restoring throw-context [exception were not handled] throw(e); // rethrow + } } - // write it out - r.write_pass_lang(*result); + // write out result + r.write_pass_lang(result); } -static void _throw_operator(Request& r, const String& method_name, MethodParams *params) { +static void _throw_operator(Request& r, StringPtr method_name, MethodParams& params) { Pool& pool=r.pool(); - if(params->size()==1) { - Value& param0=params->get(0); + if(params.count()==1) { + Value& param0=params.get(0); if(Hash *hash=param0.get_hash(&method_name)) { - const char *type=0; + const char* type=0; if(Value *value=static_cast(hash->get(*exception_type_part_name))) type=value->as_string().cstr(); const String *source=0; if(Value *value=static_cast(hash->get(*exception_source_part_name))) source=&value->as_string(); - const char *comment=0; + const char* comment=0; if(Value *value= static_cast(hash->get(*exception_comment_part_name))) comment=value->as_string().cstr(); @@ -630,20 +649,17 @@ static void _throw_operator(Request& r, &method_name, "one-param version has hash param"); } 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* 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.count()>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), - main_sql_name(apool, MAIN_SQL_NAME), - main_sql_drivers_name(apool, MAIN_SQL_DRIVERS_NAME) -{ - set_name(*NEW String(pool(), OP_CLASS_NAME)); +VClassMAIN::VClassMAIN(Pool& apool): VClass(apool) { + set_name(*NEW String(pool(), MAIN_CLASS_NAME)); // ^if(condition){code-when-true} // ^if(condition){code-when-true}{code-when-false} @@ -656,7 +672,7 @@ MOP::MOP(Pool& apool) : Methoded(apool), add_native_method("taint", Method::CT_ANY, _taint, 1, 2); // ^process[code] - add_native_method("process", Method::CT_ANY, _process, 1, 1); + add_native_method("process", Method::CT_ANY, _process, 1, 2); // ^rem{code} add_native_method("rem", Method::CT_ANY, _rem, 1, 10000); @@ -702,16 +718,23 @@ MOP::MOP(Pool& apool) : Methoded(apool), // constructor & configurator -Methoded *MOP_create(Pool& pool) { - return new(pool) MOP(pool); -} - -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(Table *protocol2library=element->get_table()) - r.classes_conf.put(name(), protocol2library); +VStateless_classPtr VClassMAIN_create() { + #define ULN(name, LANG) \ + untaint_lang_name2enum.put(StringPtr(new String(name)), (int)String::UL_##LANG); + ULN("as-is", AS_IS); + ULN("optimized-as-is", AS_IS|String::UL_OPTIMIZE_BIT); + ULN("file-spec", FILE_SPEC); + ULN("http-header", HTTP_HEADER); + ULN("mail-header", MAIL_HEADER); + ULN("uri", URI); + ULN("table", TABLE); + ULN("sql", SQL); + ULN("js", JS); + ULN("xml", XML); + ULN("optimized-xml", XML|String::UL_OPTIMIZE_BIT); + ULN("html", HTML); + ULN("optimized-html", HTML|String::UL_OPTIMIZE_BIT); + #undef ULN + + return VStateless_classPtr(new VClassMAIN); }