--- parser3/src/main/execute.C 2001/03/10 12:12:51 1.83 +++ parser3/src/main/execute.C 2001/03/10 14:05:36 1.85 @@ -1,5 +1,5 @@ /* - $Id: execute.C,v 1.83 2001/03/10 12:12:51 paf Exp $ + $Id: execute.C,v 1.85 2001/03/10 14:05:36 paf Exp $ */ #include "pa_array.h" @@ -562,7 +562,7 @@ Value *Request::get_element() { Value *value=ncontext->get_element(name); if(value) - value=&autocalc(*value); // autocalc possible code-junction + value=&autocalc(*value, &name); // autocalc possible code-junction else { value=NEW VUnknown(pool()); value->set_name(name); @@ -571,7 +571,7 @@ Value *Request::get_element() { return value; } -Value& Request::autocalc(Value& value, bool make_string) { +Value& Request::autocalc(Value& value, const String *name, bool make_string) { Junction *junction=value.get_junction(); if(junction && junction->code) { // is it a code-junction? // autocalc it @@ -604,6 +604,8 @@ Value& Request::autocalc(Value& value, b result=NEW VString(*frame->get_string()); } else result=frame->result(); + if(name) + result->set_name(*name); wcontext=static_cast(POP()); rcontext=POP(); @@ -615,3 +617,42 @@ Value& Request::autocalc(Value& value, b } else return value; } + +char *Request::execute_static(VClass& vclass, String& method_name, bool return_cstr) { + Value *value=vclass.get_element(method_name); + if(value) { // found some 'METHOD_NAME' element + Junction *junction=value->get_junction(); + if(junction) {// it even has junction! + const Method *method=junction->method; + if(method) { // and junction is method-junction! call it + PUSH(self); + PUSH(root); + PUSH(rcontext); + PUSH(wcontext); + + // initialize contexts + root=rcontext=self=&vclass; + wcontext=NEW WWrapper(pool(), &vclass, false /* not constructing */); + + // execute! + execute(*method->parser_code); + + // result + char *result; + if(return_cstr) + result=wcontext->get_string()->cstr(); // chars + else + result=0; // ignore result + + wcontext=static_cast(POP()); + rcontext=POP(); + root=POP(); + self=static_cast(POP()); + + // return + return result; + } + } + } + return 0; +}