--- parser3/src/main/execute.C 2001/03/16 12:30:23 1.112 +++ parser3/src/main/execute.C 2001/03/18 16:36:55 1.115 @@ -3,7 +3,7 @@ Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) Author: Alexander Petrosyan (http://design.ru/paf) - $Id: execute.C,v 1.112 2001/03/16 12:30:23 paf Exp $ + $Id: execute.C,v 1.115 2001/03/18 16:36:55 paf Exp $ */ #include "pa_array.h" @@ -56,6 +56,7 @@ char *opcode_name[]={ }; void va_log_printf(const char *fmt,va_list args) { + return; vfprintf(stderr, fmt, args); } @@ -343,11 +344,12 @@ void Request::execute(const Array& ops) wcontext->constructing() && // constructing? wcontext->somebody_entered_some_class()) { // ^class:method[..]? // yes, this is a constructor call + // some stateless_object derivates with constructors if(called_class->name()==TABLE_CLASS_NAME) self=NEW VTable(pool()); - else if(called_class->name()==ENV_CLASS_NAME) + else /*if(called_class->name()==ENV_CLASS_NAME) self=NEW VEnv(pool()); - else + else */ // stateful object self=NEW VObject(pool(), *called_class); frame->write(*self, String::Untaint_lang::NO // not used, always an object, not string @@ -365,8 +367,10 @@ void Request::execute(const Array& ops) const Method& method=*frame->junction.method; if(method.native_code) { // native code? method.check_actual_numbered_params( + frame->junction.self, frame->name(), frame->numbered_params()); - (*method.native_code)(*this, + (*method.native_code)( + *this, frame->name(), frame->numbered_params()); // execute it } else // parser code execute(*method.parser_code); // execute it @@ -691,7 +695,7 @@ Value& Request::process(Value& value, co return *result; } -char *Request::execute_method(Value& aself, const Method& method, bool return_cstr) { +const String *Request::execute_method(Value& aself, const Method& method, bool return_cstr) { PUSH(self); PUSH(root); PUSH(rcontext); @@ -705,9 +709,9 @@ char *Request::execute_method(Value& ase execute(*method.parser_code); // result - char *result; + const String *result; if(return_cstr) - result=wcontext->get_string()->cstr(); // chars + result=&wcontext->as_string(); else result=0; // ignore result @@ -720,7 +724,7 @@ char *Request::execute_method(Value& ase return result; } -char *Request::execute_method(Value& aself, +const String *Request::execute_method(Value& aself, const String& method_name, bool return_cstr) { if(Value *value=aself.get_element(method_name)) if(Junction *junction=value->get_junction())