--- parser3/src/classes/op.C 2003/02/20 16:09:00 1.127.2.14 +++ parser3/src/classes/op.C 2003/03/24 09:39:54 1.127.2.22.2.12 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_OP_C="$Date: 2003/02/20 16:09:00 $"; +static const char* IDENT_OP_C="$Date: 2003/03/24 09:39:54 $"; #include "classes.h" #include "pa_vmethod_frame.h" @@ -16,6 +16,7 @@ static const char* IDENT_OP_C="$Date: 20 #include "pa_sql_connection.h" #include "pa_vdate.h" #include "pa_vmethod_frame.h" +#include "pa_vclass.h" // limits @@ -30,6 +31,7 @@ static const char* IDENT_OP_C="$Date: 20 class VClassMAIN: public VClass { public: VClassMAIN(); + override ~VClassMAIN() {} }; // defines for statics @@ -45,26 +47,25 @@ public: // statics //^switch ^case -static StringPtr switch_data_name(new String(SWITCH_DATA_NAME)); +static const String& switch_data_name(new String(SWITCH_DATA_NAME)); //^cache -static StringPtr cache_data_name(new String(CACHE_DATA_NAME)); - -static StringPtr exception_var_name(new String(EXCEPTION_VAR_NAME)); -static StringPtr exception_type_part_name(new String(EXCEPTION_TYPE_PART_NAME)); -static StringPtr exception_source_part_name(new String(EXCEPTION_SOURCE_PART_NAME)); -static StringPtr exception_comment_part_name(new String(EXCEPTION_COMMENT_PART_NAME)); -static StringPtr exception_handled_part_name(new String(EXCEPTION_HANDLED_PART_NAME)); +static const String& cache_data_name(new String(CACHE_DATA_NAME)); +static const String& exception_var_name(new String(EXCEPTION_VAR_NAME)); +static const String& exception_type_part_name(new String(EXCEPTION_TYPE_PART_NAME)); +static const String& exception_source_part_name(new String(EXCEPTION_SOURCE_PART_NAME)); +static const String& exception_comment_part_name(new String(EXCEPTION_COMMENT_PART_NAME)); +static const String& exception_handled_part_name(new String(EXCEPTION_HANDLED_PART_NAME)); // helpers -class Untaint_lang_name2enum: public Hash { +class Untaint_lang_name2enum: public Hash { public: Untaint_lang_name2enum() { #define ULN(name, LANG) \ - put(StringPtr(new String(name)), (value_type)String::UL_##LANG); + put(String* (new String(name)), (value_type)String::L_##LANG); ULN("as-is", AS_IS); - ULN("optimized-as-is", AS_IS|String::UL_OPTIMIZE_BIT); + ULN("optimized-as-is", AS_IS|String::L_OPTIMIZE_BIT); ULN("file-spec", FILE_SPEC); ULN("http-header", HTTP_HEADER); ULN("mail-header", MAIL_HEADER); @@ -73,17 +74,17 @@ public: ULN("sql", SQL); ULN("js", JS); ULN("xml", XML); - ULN("optimized-xml", XML|String::UL_OPTIMIZE_BIT); + ULN("optimized-xml", XML|String::L_OPTIMIZE_BIT); ULN("html", HTML); - ULN("optimized-html", HTML|String::UL_OPTIMIZE_BIT); + ULN("optimized-html", HTML|String::L_OPTIMIZE_BIT); #undef ULN } } untaint_lang_name2enum; // 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, const String& /*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* /,*/ @@ -94,14 +95,13 @@ static void _if(Request& r, StringPtr /* 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) { - Pool& pool=r.pool(); +static void _untaint(Request& r, MethodParams* params) { - uchar lang; + Language lang; if(params->count()==1) - lang=String::UL_AS_IS; // mark as simply 'tainted'. useful in html from sql + lang=String::L_AS_IS; // mark as simply 'tainted'. useful in html from sql else { - StringPtr 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(lang_name); if(!lang) throw Exception(0, @@ -110,21 +110,20 @@ static void _untaint(Request& r, StringP } { - ValuePtr vbody=params->as_junction(params->count()-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(vbody)); // process marking tainted with that lang } } -static void _taint(Request& r, StringPtr /*method_name*/, MethodParams* params) { - Pool& pool=r.pool(); +static void _taint(Request& r, const String& /*method_name*/, MethodParams* params) { - uchar lang; + Language lang; if(params->count()==1) - lang=String::UL_TAINTED; // mark as simply 'tainted'. useful in table:set + lang=String::L_TAINTED; // mark as simply 'tainted'. useful in table:set else { - StringPtr 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(lang_name); if(!lang) throw Exception(0, @@ -133,24 +132,24 @@ static void _taint(Request& r, StringPtr } { - ValuePtr vbody=params->as_no_junction(params->count()-1, "body must not be code"); + Value* vbody=params->as_no_junction(params->count()-1, "body must not be code"); String result; result.append( - *vbody->as_string(&pool), // process marking tainted with that lang + *vbody->as_string(), // process marking tainted with that lang lang, true); // force result language to specified r.write_pass_lang(result); } } -static void _process(Request& r, StringPtr method_name, MethodParams* params) { - Pool& pool=r.pool(); - MethodPtr main_method; - ValuePtr target_self=params->count()>1? +static void _process(Request& r, MethodParams* params) { + const String* source; // must be declared here to prevent premature destruction + Method* main_method; + Value* target_self=params->count()>1? params->as_no_junction(0, "target must not be code") - :ValuePtr(&r.get_method_frame()->caller()->self()); + :Value*(&r.get_method_frame()->caller()->self()); { - ValuePtr vjunction=params->as_junction(params->count()-1, "body must be code"); + 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) @@ -159,14 +158,14 @@ 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); + Temp_lang temp_lang(r, String::L_PASS_APPENDED); // temporary zero @main so to maybe-replace it in processed code - Temp_method temp_method_main(*target_class, main_method_name, MethodPtr(0)); + Temp_method temp_method_main(*target_class, main_method_name, Method*(0)); // temporary zero @auto so it wouldn't be auto-called in Request::use_buf - Temp_method temp_method_auto(*target_class, auto_method_name, MethodPtr(0)); + Temp_method temp_method_auto(*target_class, auto_method_name, Method*(0)); // calculate pseudo file name of processed chars // would be something like "/some/file(4) process" @@ -191,8 +190,8 @@ static void _process(Request& r, StringP // 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))), - StringPtr(new String(heap_place, place_size, true /*tainted*/)), + source->cstr(String::L_UNSPECIFIED, r.connection(0)), + String* (new String(heap_place, place_size, true /*tainted*/)), heap_place); // main_method @@ -208,15 +207,14 @@ static void _process(Request& r, StringP } } -static void _rem(Request& r, StringPtr /*method_name*/, MethodParams* params) { +static void _rem(Request& r, const String& /*method_name*/, MethodParams* params) { params->as_junction(0, "body must be code"); } -static void _while(Request& r, StringPtr method_name, MethodParams* params) { - Pool& pool=r.pool(); +static void _while(Request& r, MethodParams* params) { - ValuePtr vcondition=params->as_junction(0, "condition must be expression"); - ValuePtr 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; @@ -237,19 +235,17 @@ static void _while(Request& r, StringPtr } } -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"); - r.use_file(*r.main_class, vfile->as_string(&pool)); +static void _use(Request& r, 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, StringPtr method_name, MethodParams* params) { - Pool& pool=r.pool(); - StringPtr var_name=params->as_string(0, "var name must be string"); +static void _for(Request& r, MethodParams* params) { + 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); - ValuePtr body_code=params->as_junction(3, "body must be code"); - ValuePtr delim_maybe_code=params->count()>4?(*params)[4]:ValuePtr(0); + Value* body_code=params->as_junction(3, "body must be code"); + Value* delim_maybe_code=params->count()>4?(*params)[4]:0; if(to-from>=MAX_LOOPS) // too long loop? throw Exception("parser.runtime", @@ -263,8 +259,8 @@ static void _for(Request& r, StringPtr m vint->set_int(i); StringOrValue sv_processed=r.process(body_code); - StringPtr s_processed=sv_processed.get_string(); - if(delim_maybe_code && s_processed && s_processed->size()) { // delimiter set and we have body + const String& s_processed=sv_processed.get_string(); + if(delim_maybe_code && s_processed && s_processed->length()) { // 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; @@ -273,35 +269,32 @@ 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, MethodParams* params) { + Value* expr=params->as_junction(0, "need expression"); // evaluate expresion - ValuePtr 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->count()>1) { - ValuePtr fmt=params->as_no_junction(1, "fmt must not be code"); - - Pool& pool=r.pool(); + Value* fmt=params->as_no_junction(1, "fmt must not be code"); String string; string.APPEND_CONST( - format(pool, value_result->as_double(), fmt->as_string(&pool)->cstr())); + format(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, StringPtr method_name, MethodParams* params) { - Pool& pool=r.pool(); +static void _connect(Request& r, MethodParams* params) { #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"); + 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=0; - if(ValuePtr sql=r.main_class->get_element(StringPtr(new String(MAIN_SQL_NAME)), *r.main_class, false)) { - if(ValuePtr element=sql->get_element(StringPtr(new String(MAIN_SQL_DRIVERS_NAME)), *sql, false)) { + if(Value* sql=r.main_class->get_element(String* (new String(MAIN_SQL_NAME)), *r.main_class, false)) { + if(Value* element=sql->get_element(String* (new String(MAIN_SQL_DRIVERS_NAME)), *sql, false)) { protocol2driver_and_client=element->get_table(); } } @@ -311,8 +304,8 @@ struct timeval mt[2]; gettimeofday(&mt[0],NULL); #endif // connect - SQL_ConnectionPtr connection=SQL_driver_manager.get_connection(pool, - url->as_string(&pool), method_name, protocol2driver_and_client); + SQL_Connection* connection=SQL_driver_manager.get_connection(pool, + url->as_string(), method_name, protocol2driver_and_client); #ifdef RESOURCES_DEBUG //measure:after connect @@ -338,33 +331,32 @@ r.sql_connect_time+=t[1]-t[0]; class Switch_data: public PA_Object { public: Request& r; - ValuePtr searching; - ValuePtr found; - ValuePtr _default; + Value* searching; + Value* found; + Value* _default; public: - Switch_data(Request& ar, ValuePtr asearching): + Switch_data(Request& ar, Value* asearching): r(ar), searching(asearching) {} }; 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)))); - Temp_hash_value +static void _switch(Request& r, const String& /*method_name*/, MethodParams* params) { + Switch_dataPtr data(new Switch_data(r, r.process_to_value((*params)[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"); + 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(ValuePtr selected_code=data->found? data->found: data->_default) { + 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, StringPtr method_name, MethodParams* params) { - Pool& pool=r.pool(); +static void _case(Request& r, MethodParams* params) { Switch_data* data=static_cast(r.classes_conf.get(switch_data_name).get()); if(!data) @@ -373,23 +365,23 @@ static void _case(Request& r, StringPtr "without switch"); int count=params->count(); - ValuePtr code=params->as_junction(--count, "case result must be code"); + Value* 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)); + Value* value=r.process_to_value(params->get(i)); - if(*value->as_string(&pool) == CASE_DEFAULT_VALUE) { + if(*value->as_string() == CASE_DEFAULT_VALUE) { data->_default=code; break; } bool matches; if(data->searching->is_string()) - matches=*data->searching->as_string(&pool) == *value->as_string(&pool); + matches=*data->searching->as_string() == *value->as_string(); else matches=data->searching->as_double() == value->as_double(); @@ -409,7 +401,7 @@ static void _case(Request& r, StringPtr // consts -const int DATA_STRING_SERIALIZED_VERSION=0x0003; +const int DATA_STRING_SERIALIZED_VERSION=0x0004; // helper types @@ -420,7 +412,7 @@ struct Data_string_serialized_prolog { }; #endif -void cache_delete(StringPtr file_spec) { +void cache_delete(const String& file_spec) { file_delete(file_spec, false/*fail_on_read_problem*/); } @@ -433,7 +425,7 @@ DECLARE_OBJECT_PTR(Cache_data); struct Locked_process_and_cache_put_action_info { Request *r; Cache_data *data; - ValuePtr body_code; StringPtr evaluated_body; + Value* body_code; const String& evaluated_body; }; #endif /* @todo maybe network order worth spending some effort? @@ -444,7 +436,7 @@ static void locked_process_and_cache_put Locked_process_and_cache_put_action_info& info= *static_cast(context); - Pool& pool=info.r->pool(); + =info.r->pool(); // body->process info.evaluated_body=info.r->process_to_string(info.body_code); @@ -453,7 +445,7 @@ static void locked_process_and_cache_put if(info.data->expires > time(0)) { // string -serialize> buffer char *data; size_t data_size; - info.evaluated_body->serialize(pool, + info.evaluated_body->serialize( sizeof(Data_string_serialized_prolog), data, data_size); Data_string_serialized_prolog& prolog= @@ -466,29 +458,29 @@ static void locked_process_and_cache_put } else // expired! info.data->expires=0; // flag it so that could be easily checked by caller } -StringPtr locked_process_and_cache_put(Request& r, - ValuePtr body_code, +const String& locked_process_and_cache_put(Request& r, + Value* body_code, Cache_data& data, - StringPtr file_spec) { + const String& file_spec) { Locked_process_and_cache_put_action_info info; info.r=&r; info.data=&data; info.body_code=body_code; - StringPtr 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*/, - false/*fail on lock problem*/) ? info.evaluated_body: StringPtr(0); + false/*fail on lock problem*/) ? info.evaluated_body: 0; time_t now=time(0); if(data.expires<=now) cache_delete(file_spec); return result; } -StringPtr cache_get(Pool& pool, Charset& charset, StringPtr file_spec, time_t now) { - File_read_result file=file_read(pool, charset, file_spec, +const String& cache_getCharset& charset, const String& file_spec, time_t now) { + File_read_result file=file_read(charset, file_spec, false/*as_text*/, 0, //no params false/*fail_on_read_problem*/); @@ -498,19 +490,19 @@ StringPtr cache_get(Pool& pool, Charset& Data_string_serialized_prolog& prolog= *reinterpret_cast(file.data); - StringPtr result(new String); + const String& result(new String); if( file.size>=sizeof(Data_string_serialized_prolog) && prolog.version==DATA_STRING_SERIALIZED_VERSION && prolog.expires > now && result->deserialize( - sizeof(Data_string_serialized_prolog), file.data, file.size, file_spec->cstr(pool))) + sizeof(Data_string_serialized_prolog), file.data, file.size, file_spec->cstr())) return result; } return 0; } -static time_t as_expires(Request& r, StringPtr method_name, MethodParams* params, +static time_t as_expires(Request& r, MethodParams* params, int index, time_t now) { time_t result; if(Value* vdate=(*params)[index]->as(VDATE_TYPE, false)) @@ -520,11 +512,10 @@ static time_t as_expires(Request& r, Str return result; } -static StringPtr as_file_spec(Request& r, MethodParams* params, int index) { +static const String& 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) { - Pool& pool=r.pool(); +static void _cache(Request& r, MethodParams* params) { time_t now=time(0); // ^cache[filename] ^cache(seconds) ^cache[expires date] @@ -549,13 +540,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")); + const String& file_spec=r.absolute(params->as_string(0, "filespec must be string")); Cache_dataPtr data(new Cache_data); - Temp_hash_value + 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"); + 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 @@ -575,7 +566,7 @@ static void _cache(Request& r, StringPtr // |lockSH succeeds; ... for(int retry=0; retry<2; retry++) { - if(StringPtr cached_body=cache_get(pool, r.charsets.source(), file_spec, now)) { // have cached copy? + if(const String& cached_body=cache_get(r.charsets.source(), file_spec, now)) { // have cached copy? // write it out r.write_assign_lang(*cached_body); // happy with it @@ -583,7 +574,7 @@ static void _cache(Request& r, StringPtr } // non-blocked lock; process; cache it - if(StringPtr processed_body= + 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); @@ -601,7 +592,7 @@ static void _cache(Request& r, StringPtr // instructed not to cache; forget cached copy cache_delete(file_spec); // process - StringPtr processed_body=r.process_to_string(body_code); + const String& processed_body=r.process_to_string(body_code); // write it out r.write_assign_lang(*processed_body); // happy with it @@ -611,40 +602,39 @@ static void _cache(Request& r, StringPtr } // also used in pa_request.C to pass param to @unhandled_exception -VHashPtr exception2vhash(Pool& pool, const Exception& e) { - VHashPtr result(new VHash); - HashStringValue& hash=result->hash(Exception::undefined_source); +VHash& exception2vhashconst Exception& e) { + VHash& result=*new VHash; + HashStringValue& hash=result->hash(); if(const char* type=e.type(true)) - hash.put(exception_type_part_name, ValuePtr(new VString(StringPtr(new String(type))))); - if(StringPtr asource=e.problem_source()) { - StringPtr source(new String); - source->append(*asource, String::UL_TAINTED, true/*forced*/); + hash.put(exception_type_part_name, Value*(new VString(String* (new String(type))))); + if(const String& asource=e.problem_source()) { + const String* source(new String); + source->append(*asource, String::L_TAINTED, true/*forced*/); - hash.put(exception_source_part_name, ValuePtr(new VString(source))); + hash.put(exception_source_part_name, Value*(new VString(source))); #ifndef NO_STRING_ORIGIN const String_fragment::Origin& origin=source->origin(); - hash.put(StringPtr(new String("file", 0, true)), - ValuePtr(new VString(StringPtr(new String(origin.file))))); - hash.put(StringPtr(new String("lineno")), - ValuePtr(new VInt(1+origin.line))); + hash.put(String* (new String("file", 0, true)), + Value*(new VString(String* (new String(origin.file))))); + hash.put(String* (new String("lineno")), + Value*(new VInt(1+origin.line))); #endif } if(const char* ecomment=e.comment(true)) { char *pcomment=pool.copy(ecomment); hash.put(exception_comment_part_name, - ValuePtr(new VString(StringPtr(new String(pcomment, 0, true/*tainted*/))))); + Value*(new VString(String* (new String(pcomment, 0, true/*tainted*/))))); } hash.put(exception_handled_part_name, - ValuePtr(new VBool(false))); + Value*(new VBool(false))); return result; } -static void _try_operator(Request& r, StringPtr method_name, MethodParams* params) { - Pool& pool=r.pool(); +static void _try_operator(Request& r, MethodParams* params) { - ValuePtr body_code=params->as_junction(0, "body_code must be code"); - ValuePtr catch_code=params->as_junction(1, "catch_code must be code"); + Value* body_code=params->as_junction(0, "body_code must be code"); + Value* catch_code=params->as_junction(1, "catch_code must be code"); StringOrValue result; // taking snapshot of try-context @@ -655,16 +645,16 @@ static void _try_operator(Request& r, St 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); + VHash* vhash=exception2vhash(e); - JunctionPtr junction=catch_code->get_junction(); + Junction* junction=catch_code->get_junction(); Value* method_frame=junction->method_frame; - ValuePtr saved_exception_var_value=method_frame->get_element(exception_var_name, *method_frame, false); + 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(ValuePtr value= - vhash->hash(Exception::undefined_source).get(exception_handled_part_name)) + if(Value* value= + vhash->hash().get(exception_handled_part_name)) handled=value->as_bool(); junction->method_frame->put_element(exception_var_name, saved_exception_var_value, false); @@ -677,42 +667,53 @@ static void _try_operator(Request& r, St r.write_pass_lang(result); } -static void _throw_operator(Request& r, StringPtr method_name, MethodParams* params) { - Pool& pool=r.pool(); +static void _throw_operator(Request& r, MethodParams* params) { if(params->count()==1) { - ValuePtr param0=(*params)[0]; - if(HashStringValue *hash=param0->get_hash(method_name)) { + Value* param0=(*params)[0]; + if(HashStringValue *hash=param0->get_hash()) { const char* type=0; - if(ValuePtr value=hash->get(exception_type_part_name)) - type=value->as_string(&pool)->cstr(); - StringPtr source(0); - if(ValuePtr value=hash->get(exception_source_part_name)) - source=value->as_string(&pool); - CharPtr comment(0); - if(ValuePtr value=hash->get(exception_comment_part_name)) - comment=value->as_string(&pool)->cstr(); + if(Value* value=hash->get(exception_type_part_name)) + type=value->as_string().cstr(); + const String* source; + if(Value* value=hash->get(exception_source_part_name)) + source=value->as_string(); + const char* comment; + if(Value* value=hash->get(exception_comment_part_name)) + comment=value->as_string().cstr(); throw Exception(type, source?source:method_name, - comment); + "%s", comment?comment.get():""); } 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() - :CharPtr(0); - throw Exception(type, source, "%s", comment?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.get():""); } } - + +#if defined(WIN32) && defined(_DEBUG) +# define PA_BPT +static void _bpt(Request& r, MethodParams* params) { + _asm int 3; +} +#endif + // constructor VClassMAIN::VClassMAIN(): VClass() { - set_name(StringPtr(new String(MAIN_CLASS_NAME))); + set_name(String* (new String(MAIN_CLASS_NAME))); + +#ifdef PA_BPT + // ^bpt[] + add_native_method("bpt", Method::CT_ANY, _bpt, 0, 0); +#endif // ^if(condition){code-when-true} // ^if(condition){code-when-true}{code-when-false} @@ -771,7 +772,7 @@ VClassMAIN::VClassMAIN(): VClass() { // constructor & configurator -VStateless_classPtr VClassMAIN_create() { +VStateless_class* VClassMAIN_create() { - return VStateless_classPtr(new VClassMAIN); + return VStateless_class*(new VClassMAIN); }