--- parser3/src/classes/op.C 2003/02/14 17:28:19 1.127.2.11 +++ parser3/src/classes/op.C 2003/02/26 11:29:56 1.127.2.17 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_OP_C="$Date: 2003/02/14 17:28:19 $"; +static const char* IDENT_OP_C="$Date: 2003/02/26 11:29:56 $"; #include "classes.h" #include "pa_vmethod_frame.h" @@ -55,7 +55,6 @@ static StringPtr exception_source_part_n static StringPtr exception_comment_part_name(new String(EXCEPTION_COMMENT_PART_NAME)); static StringPtr exception_handled_part_name(new String(EXCEPTION_HANDLED_PART_NAME)); - // helpers class Untaint_lang_name2enum: public Hash { @@ -82,26 +81,26 @@ public: // methods -static void _if(Request& r, StringPtr /*method_name*/, MethodParams& params) { - ValuePtr condition_code=params.as_junction(0, "condition must be expression"); +static void _if(Request& r, StringPtr /*method_name*/, MethodParams* params) { + ValuePtr condition_code=params->as_junction(0, "condition must be expression"); 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"))); - else if(params.count()>2) - r.write_pass_lang(r.process(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, StringPtr method_name, MethodParams& params) { +static void _untaint(Request& r, StringPtr method_name, MethodParams* params) { Pool& pool=r.pool(); uchar lang; - if(params.count()==1) + if(params->count()==1) lang=String::UL_AS_IS; // mark as simply 'tainted'. useful in html from sql else { - StringPtr lang_name=params.as_string(0, "lang must be string"); + StringPtr lang_name=params->as_string(0, "lang must be string"); lang=untaint_lang_name2enum.get(lang_name); if(!lang) throw Exception(0, @@ -110,21 +109,21 @@ static void _untaint(Request& r, StringP } { - ValuePtr vbody=params.as_junction(params.count()-1, "body must be code"); + ValuePtr 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(vbody)); // process marking tainted with that lang } } -static void _taint(Request& r, StringPtr /*method_name*/, MethodParams& params) { +static void _taint(Request& r, StringPtr /*method_name*/, MethodParams* params) { Pool& pool=r.pool(); uchar lang; - if(params.count()==1) + if(params->count()==1) lang=String::UL_TAINTED; // mark as simply 'tainted'. useful in table:set else { - StringPtr lang_name=params.as_string(0, "lang must be string"); + StringPtr lang_name=params->as_string(0, "lang must be string"); lang=untaint_lang_name2enum.get(lang_name); if(!lang) throw Exception(0, @@ -133,7 +132,7 @@ static void _taint(Request& r, StringPtr } { - ValuePtr vbody=params.as_no_junction(params.count()-1, "body must not be code"); + ValuePtr vbody=params->as_no_junction(params->count()-1, "body must not be code"); String result; result.append( @@ -143,14 +142,15 @@ static void _taint(Request& r, StringPtr } } -static void _process(Request& r, StringPtr method_name, MethodParams& params) { +static void _process(Request& r, StringPtr method_name, MethodParams* params) { Pool& pool=r.pool(); - const Method *main_method; - ValuePtr target_self=params.count()>1? - params.as_no_junction(0, "target must not be code") + StringPtr source; // must be declared here to prevent premature destruction + MethodPtr main_method; + ValuePtr target_self=params->count()>1? + params->as_no_junction(0, "target must not be code") :ValuePtr(&r.get_method_frame()->caller()->self()); { - ValuePtr vjunction=params.as_junction(params.count()-1, "body must be code"); + ValuePtr vjunction=params->as_junction(params->count()-1, "body must be code"); VStateless_class *target_class=target_self->get_last_derived_class(); if(!target_class) @@ -159,7 +159,7 @@ static void _process(Request& r, StringP "no target class"); // evaluate source to process - StringPtr source=r.process_to_string(vjunction); + source=r.process_to_string(vjunction); // temporary remove language change Temp_lang temp_lang(r, String::UL_PASS_APPENDED); @@ -178,7 +178,7 @@ static void _process(Request& r, StringP 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; + method_name->cstr().get())+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; @@ -186,13 +186,12 @@ static void _process(Request& r, StringP 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); + char *heap_place=pool.copy(local_place, place_size); // process source code, append processed methods to 'self' class // maybe-define new @main r.use_buf(*target_class, - source->cstr(String::UL_UNSPECIFIED, r.connection(StringPtr(0))), + source->cstr(pool, String::UL_UNSPECIFIED, r.connection(StringPtr(0))), StringPtr(new String(heap_place, place_size, true /*tainted*/)), heap_place); @@ -209,15 +208,15 @@ static void _process(Request& r, StringP } } -static void _rem(Request& r, StringPtr /*method_name*/, 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, StringPtr method_name, MethodParams& params) { +static void _while(Request& r, StringPtr method_name, MethodParams* params) { Pool& pool=r.pool(); - ValuePtr vcondition=params.as_junction(0, "condition must be expression"); - ValuePtr body=params.as_junction(1, "body must be code"); + ValuePtr vcondition=params->as_junction(0, "condition must be expression"); + ValuePtr body=params->as_junction(1, "body must be code"); // while... int endless_loop_count=0; @@ -238,19 +237,19 @@ static void _while(Request& r, StringPtr } } -static void _use(Request& r, StringPtr method_name, MethodParams& params) { +static void _use(Request& r, StringPtr method_name, MethodParams* params) { Pool& pool=r.pool(); - ValuePtr vfile=params.as_no_junction(0, "file name must not be code"); + ValuePtr vfile=params->as_no_junction(0, "file name must not be code"); r.use_file(*r.main_class, vfile->as_string(&pool)); } -static void _for(Request& r, StringPtr method_name, MethodParams& params) { +static void _for(Request& r, StringPtr method_name, MethodParams* params) { Pool& pool=r.pool(); - StringPtr 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); - ValuePtr body_code=params.as_junction(3, "body must be code"); - ValuePtr delim_maybe_code=params.count()>4?params[4]:ValuePtr(0); + StringPtr 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); + ValuePtr body_code=params->as_junction(3, "body must be code"); + ValuePtr delim_maybe_code=params->count()>4?(*params)[4]:ValuePtr(0); if(to-from>=MAX_LOOPS) // too long loop? throw Exception("parser.runtime", @@ -274,14 +273,14 @@ static void _for(Request& r, StringPtr m } } -static void _eval(Request& r, StringPtr method_name, MethodParams& params) { - ValuePtr expr=params.as_junction(0, "need expression"); +static void _eval(Request& r, StringPtr method_name, MethodParams* params) { + ValuePtr expr=params->as_junction(0, "need expression"); // evaluate expresion ValuePtr value_result=r.process_to_value(expr, /*0/*no name YET* /,*/ true/*don't intercept string*/)->as_expr_result(); - if(params.count()>1) { - ValuePtr fmt=params.as_no_junction(1, "fmt must not be code"); + if(params->count()>1) { + ValuePtr fmt=params->as_no_junction(1, "fmt must not be code"); Pool& pool=r.pool(); String string; @@ -292,13 +291,13 @@ static void _eval(Request& r, StringPtr r.write_no_lang(value_result); } -static void _connect(Request& r, StringPtr 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 - ValuePtr url=params.as_no_junction(0, "url must not be code"); - ValuePtr body_code=params.as_junction(1, "body must be code"); + ValuePtr url=params->as_no_junction(0, "url must not be code"); + ValuePtr body_code=params->as_junction(1, "body must be code"); Table* protocol2driver_and_client=0; if(ValuePtr sql=r.main_class->get_element(StringPtr(new String(MAIN_SQL_NAME)), *r.main_class, false)) { @@ -348,12 +347,12 @@ public: }; DECLARE_OBJECT_PTR(Switch_data); #endif -static void _switch(Request& r, StringPtr /*method_name*/, MethodParams& params) { - Switch_dataPtr data(new Switch_data(r, r.process_to_value(params.get(0)))); +static void _switch(Request& r, StringPtr /*method_name*/, MethodParams* params) { + Switch_dataPtr data(new Switch_data(r, r.process_to_value(params->get(0)))); Temp_hash_value switch_data_setter(r.classes_conf, switch_data_name, data); - ValuePtr cases_code=params.as_junction(1, "switch cases must be code"); + ValuePtr 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*/); @@ -364,7 +363,7 @@ static void _switch(Request& r, StringPt } } -static void _case(Request& r, StringPtr 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).get()); @@ -373,15 +372,15 @@ static void _case(Request& r, StringPtr method_name, "without switch"); - int count=params.count(); - ValuePtr code=params.as_junction(--count, "case result must be code"); + int count=params->count(); + ValuePtr code=params->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)); if(*value->as_string(&pool) == CASE_DEFAULT_VALUE) { data->_default=code; @@ -511,26 +510,26 @@ StringPtr cache_get(Pool& pool, Charset& return 0; } -static time_t as_expires(Request& r, StringPtr method_name, MethodParams& params, +static time_t as_expires(Request& r, StringPtr method_name, MethodParams* params, int index, time_t now) { time_t result; - if(Value* vdate=params[index]->as(VDATE_TYPE, false)) + if(Value* vdate=(*params)[index]->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 StringPtr as_file_spec(Request& r, MethodParams& params, int index) { - return r.absolute(params.as_string(index, "filespec must be string")); +static StringPtr as_file_spec(Request& r, MethodParams* params, int index) { + return r.absolute(params->as_string(index, "filespec must be string")); } -static void _cache(Request& r, StringPtr 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.count()==1) { - if(params[0]->is_string()) { // filename? + if(params->count()==1) { + if((*params)[0]->is_string()) { // filename? cache_delete(as_file_spec(r, params, 0)); return; } @@ -550,13 +549,13 @@ static void _cache(Request& r, StringPtr } // file_spec, expires, body code - StringPtr file_spec=r.absolute(params.as_string(0, "filespec must be string")); + StringPtr file_spec=r.absolute(params->as_string(0, "filespec must be string")); Cache_dataPtr data(new Cache_data); Temp_hash_value cache_data_setter(r.classes_conf, cache_data_name, data); data->expires=as_expires(r, method_name, params, 1, now); - ValuePtr body_code=params.as_junction(2, "body must be code"); + ValuePtr 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 @@ -641,11 +640,11 @@ VHashPtr exception2vhash(Pool& pool, con return result; } -static void _try_operator(Request& r, StringPtr method_name, MethodParams& params) { +static void _try_operator(Request& r, StringPtr method_name, MethodParams* params) { Pool& pool=r.pool(); - ValuePtr body_code=params.as_junction(0, "body_code must be code"); - ValuePtr catch_code=params.as_junction(1, "catch_code must be code"); + ValuePtr body_code=params->as_junction(0, "body_code must be code"); + ValuePtr catch_code=params->as_junction(1, "catch_code must be code"); StringOrValue result; // taking snapshot of try-context @@ -678,33 +677,33 @@ static void _try_operator(Request& r, St r.write_pass_lang(result); } -static void _throw_operator(Request& r, StringPtr method_name, MethodParams& params) { +static void _throw_operator(Request& r, StringPtr method_name, MethodParams* params) { Pool& pool=r.pool(); - if(params.count()==1) { - ValuePtr param0=params[0]; + if(params->count()==1) { + ValuePtr param0=(*params)[0]; if(HashStringValue *hash=param0->get_hash(method_name)) { const char* type=0; if(ValuePtr value=hash->get(exception_type_part_name)) - type=value->as_string(&pool)->cstr(); - StringPtr source(0); + type=value->as_string(&pool)->cstr(pool); + StringPtr source; if(ValuePtr value=hash->get(exception_source_part_name)) source=value->as_string(&pool); - CharPtr comment(0); + CharPtr comment; if(ValuePtr value=hash->get(exception_comment_part_name)) comment=value->as_string(&pool)->cstr(); throw Exception(type, source?source:method_name, - comment); + "%s", comment?comment:""); } else throw Exception("parser.runtime", method_name, "one-param version has hash param"); } else { - const char* type=params.as_string(0, "type must be string")->cstr(pool); - StringPtr source=params.as_string(1, "source must be string"); - CharPtr comment=params.count()>2? params.as_string(2, "comment must be string")->cstr() + const char* type=params->as_string(0, "type must be string")->cstr(pool); + StringPtr source=params->as_string(1, "source must be string"); + CharPtr comment=params->count()>2? params->as_string(2, "comment must be string")->cstr() :CharPtr(0); throw Exception(type, source, "%s", comment?comment:""); }