--- parser3/src/main/execute.C 2002/09/17 17:14:32 1.273 +++ parser3/src/main/execute.C 2009/06/14 00:34:04 1.349 @@ -1,11 +1,11 @@ /** @file Parser: executor part of request class. - Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2009 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_EXECUTE_C="$Date: 2002/09/17 17:14:32 $"; +static const char * const IDENT_EXECUTE_C="$Date: 2009/06/14 00:34:04 $"; #include "pa_opcode.h" #include "pa_array.h" @@ -24,14 +24,6 @@ static const char* IDENT_EXECUTE_C="$Dat #include "pa_wwrapper.h" //#define DEBUG_EXECUTE -//#define DEBUG_STRING_APPENDS_VS_EXPANDS - - -#ifdef DEBUG_STRING_APPENDS_VS_EXPANDS -ulong wcontext_result_size=0; -#endif - - #ifdef DEBUG_EXECUTE char *opcode_name[]={ @@ -41,19 +33,60 @@ char *opcode_name[]={ // actions "WITH_ROOT", "WITH_SELF", "WITH_READ", "WITH_WRITE", +#ifdef OPTIMIZE_BYTECODE_GET_CLASS + "VALUE__GET_CLASS", +#else "GET_CLASS", +#endif "CONSTRUCT_VALUE", "CONSTRUCT_EXPR", "CURLY_CODE__CONSTRUCT", "WRITE_VALUE", "WRITE_EXPR_RESULT", "STRING__WRITE", - "GET_ELEMENT_OR_OPERATOR", "GET_ELEMENT", "GET_ELEMENT__WRITE", +#ifdef OPTIMIZE_BYTECODE_GET_ELEMENT + "VALUE__GET_ELEMENT_OR_OPERATOR", +#else + "GET_ELEMENT_OR_OPERATOR", +#endif + "GET_ELEMENT", + "GET_ELEMENT__WRITE", +#ifdef OPTIMIZE_BYTECODE_GET_ELEMENT + "VALUE__GET_ELEMENT", + "VALUE__GET_ELEMENT__WRITE", + "WITH_ROOT__VALUE__GET_ELEMENT", +#endif +#ifdef OPTIMIZE_BYTECODE_GET_OBJECT_ELEMENT + "GET_OBJECT_ELEMENT", + "GET_OBJECT_ELEMENT__WRITE", +#endif +#ifdef OPTIMIZE_BYTECODE_GET_OBJECT_VAR_ELEMENT + "GET_OBJECT_VAR_ELEMENT", + "GET_OBJECT_VAR_ELEMENT__WRITE", +#endif +#ifdef OPTIMIZE_BYTECODE_GET_SELF_ELEMENT + "WITH_SELF__VALUE__GET_ELEMENT", + "WITH_SELF__VALUE__GET_ELEMENT__WRITE", +#endif "OBJECT_POOL", "STRING_POOL", - "STORE_PARAM", - "PREPARE_TO_CONSTRUCT_OBJECT", "PREPARE_TO_EXPRESSION", + "PREPARE_TO_CONSTRUCT_OBJECT", +#ifdef OPTIMIZE_BYTECODE_CONSTRUCT_OBJECT + "CONSTRUCT_OBJECT", + "CONSTRUCT_OBJECT__WRITE", +#endif + "PREPARE_TO_EXPRESSION", "CALL", "CALL__WRITE", +#ifdef OPTIMIZE_BYTECODE_CONSTRUCT + "WITH_ROOT__VALUE__CONSTRUCT_EXPR", + "WITH_ROOT__VALUE__CONSTRUCT_VALUE", + "WITH_WRITE__VALUE__CONSTRUCT_EXPR", + "WITH_WRITE__VALUE__CONSTRUCT_VALUE", + "WITH_SELF__VALUE__CONSTRUCT_EXPR", + "WITH_SELF__VALUE__CONSTRUCT_VALUE", +#endif + // expression ops: unary "NEG", "INV", "NOT", "DEF", "IN", "FEXISTS", "DEXISTS", // expression ops: binary "SUB", "ADD", "MUL", "DIV", "MOD", "INTDIV", + "BIN_SL", "BIN_SR", "BIN_AND", "BIN_OR", "BIN_XOR", "LOG_AND", "LOG_OR", "LOG_XOR", "NUM_LT", "NUM_GT", "NUM_LE", "NUM_GE", "NUM_EQ", "NUM_NE", @@ -61,285 +94,603 @@ char *opcode_name[]={ "IS" }; -void va_debug_printf(Pool& pool, const char *fmt,va_list args) { +const char* debug_value_to_cstr(Value& value){ + const String* string=value.get_string(); + + if(string) + return string->cstr(); + else + if(value.is_bool()) + return value.as_bool()?"":""; + else + return ""; +} + +void va_debug_printf(SAPI_Info& sapi_info, const char* fmt,va_list args) { char buf[MAX_STRING]; vsnprintf(buf, MAX_STRING, fmt, args); - SAPI::log(pool, "%s", buf); + SAPI::log(sapi_info, "%s", buf); } -void debug_printf(Pool& pool, const char *fmt, ...) { - va_list args; - va_start(args,fmt); - va_debug_printf(pool,fmt,args); - va_end(args); +void debug_printf(SAPI_Info& sapi_info, const char* fmt, ...) { + va_list args; + va_start(args, fmt); + va_debug_printf(sapi_info, fmt, args); + va_end(args); } -void debug_dump(Pool& pool, int level, const Array& ops) { - Array_iter i(ops); +void debug_dump(SAPI_Info& sapi_info, int level, ArrayOperation& ops) { + Array_iterator i(ops); while(i.has_next()) { - Operation op; - op.cast=i.next(); + OP::OPCODE opcode=i.next().code; - if(op.code==OP_VALUE || op.code==OP_STRING__WRITE) { - Value *value=static_cast(i.next()); - debug_printf(pool, +#if defined(OPTIMIZE_BYTECODE_GET_OBJECT_ELEMENT) || defined(OPTIMIZE_BYTECODE_GET_OBJECT_VAR_ELEMENT) + if( + 1==0 +#ifdef OPTIMIZE_BYTECODE_GET_OBJECT_ELEMENT + || opcode==OP::OP_GET_OBJECT_ELEMENT + || opcode==OP::OP_GET_OBJECT_ELEMENT__WRITE +#endif +#ifdef OPTIMIZE_BYTECODE_GET_OBJECT_VAR_ELEMENT + || opcode==OP::OP_GET_OBJECT_VAR_ELEMENT + || opcode==OP::OP_GET_OBJECT_VAR_ELEMENT__WRITE +#endif + ){ + i.next(); // skip origin + Value& value1=*i.next().value; + i.next(); // skip origin + Value& value2=*i.next().value; + debug_printf(sapi_info, + "%*s%s" + " \"%s\" \"%s\"", + level*4, "", opcode_name[opcode], + debug_value_to_cstr(value1), debug_value_to_cstr(value2)); + continue; + } +#endif +#ifdef OPTIMIZE_BYTECODE_CONSTRUCT_OBJECT + if( + opcode==OP::OP_CONSTRUCT_OBJECT + || opcode==OP::OP_CONSTRUCT_OBJECT__WRITE + ){ + i.next(); // skip origin + Value& value1=*i.next().value; + i.next(); // skip origin + Value& value2=*i.next().value; + debug_printf(sapi_info, + "%*s%s" + " \"%s\" \"%s\"", + level*4, "", opcode_name[opcode], + debug_value_to_cstr(value1), debug_value_to_cstr(value2)); + + if(ArrayOperation* local_ops=i.next().ops) + debug_dump(sapi_info, level+1, *local_ops); + continue; + } +#endif + if( + opcode==OP::OP_VALUE + || opcode==OP::OP_STRING__WRITE +#ifdef OPTIMIZE_BYTECODE_GET_CLASS + || opcode==OP::OP_VALUE__GET_CLASS +#endif +#ifdef OPTIMIZE_BYTECODE_GET_ELEMENT + || opcode==OP::OP_VALUE__GET_ELEMENT + || opcode==OP::OP_VALUE__GET_ELEMENT__WRITE + || opcode==OP::OP_VALUE__GET_ELEMENT_OR_OPERATOR + || opcode==OP::OP_WITH_ROOT__VALUE__GET_ELEMENT +#endif +#ifdef OPTIMIZE_BYTECODE_GET_SELF_ELEMENT + || opcode==OP::OP_WITH_SELF__VALUE__GET_ELEMENT + || opcode==OP::OP_WITH_SELF__VALUE__GET_ELEMENT__WRITE +#endif +#ifdef OPTIMIZE_BYTECODE_CONSTRUCT + || opcode==OP::OP_WITH_ROOT__VALUE__CONSTRUCT_EXPR + || opcode==OP::OP_WITH_ROOT__VALUE__CONSTRUCT_VALUE + || opcode==OP::OP_WITH_WRITE__VALUE__CONSTRUCT_EXPR + || opcode==OP::OP_WITH_WRITE__VALUE__CONSTRUCT_VALUE + || opcode==OP::OP_WITH_SELF__VALUE__CONSTRUCT_EXPR + || opcode==OP::OP_WITH_SELF__VALUE__CONSTRUCT_VALUE +#endif + ) { + Operation::Origin origin=i.next().origin; + Value& value=*i.next().value; + + debug_printf(sapi_info, "%*s%s" " \"%s\" %s", - level*4, "", opcode_name[op.code], - value->get_string()->cstr(), value->type()); + level*4, "", opcode_name[opcode], + debug_value_to_cstr(value), value.type()); continue; } - debug_printf(pool, "%*s%s", level*4, "", opcode_name[op.code]); - switch(op.code) { - case OP_CURLY_CODE__STORE_PARAM: - case OP_EXPR_CODE__STORE_PARAM: - case OP_CURLY_CODE__CONSTRUCT: - case OP_NESTED_CODE: - case OP_OBJECT_POOL: - case OP_STRING_POOL: - case OP_CALL: - const Array *local_ops=reinterpret_cast(i.next()); - debug_dump(pool, level+1, *local_ops); + debug_printf(sapi_info, "%*s%s", level*4, "", opcode_name[opcode]); + + switch(opcode) { + case OP::OP_CURLY_CODE__STORE_PARAM: + case OP::OP_EXPR_CODE__STORE_PARAM: + case OP::OP_CURLY_CODE__CONSTRUCT: + case OP::OP_NESTED_CODE: + case OP::OP_OBJECT_POOL: + case OP::OP_STRING_POOL: + case OP::OP_CALL: + case OP::OP_CALL__WRITE: + if(ArrayOperation* local_ops=i.next().ops) + debug_dump(sapi_info, level+1, *local_ops); } } } +#define DEBUG_PRINT_STR(str) debug_printf(sapi_info, str); +#define DEBUG_PRINT_STRING(value) debug_printf(sapi_info, " \"%s\" ", value.cstr()); +#define DEBUG_PRINT_VALUE_AND_TYPE(value) debug_printf(sapi_info, " \"%s\" %s", debug_value_to_cstr(value), value.type()); +#define DEBUG_PRINT_OPS(local_ops) \ + debug_printf(sapi_info, \ + " (%d)\n", local_ops?local_ops->count():0); \ + if(local_ops) debug_dump(sapi_info, 1, *local_ops); + +#else +#define DEBUG_PRINT_STR(str) +#define DEBUG_PRINT_STRING(value) +#define DEBUG_PRINT_VALUE_AND_TYPE(value) +#define DEBUG_PRINT_OPS(local_ops) #endif -#define PUSH(value) stack.push(value) -#define POP() static_cast(stack.pop()) -#define POP_NAME() static_cast(stack.pop())->as_string() -#define POP_CODE() static_cast(stack.pop()) -void Request::execute(const Array& ops) { -// _asm int 3; +// Request + +void Request::execute(ArrayOperation& ops) { + register Stack& stack=this->stack; // helps a lot on MSVC: 'esi' + + const String* debug_name=0; Operation::Origin debug_origin={0, 0, 0}; + try{ #ifdef DEBUG_EXECUTE - debug_printf(pool(), "source----------------------------\n"); - debug_dump(pool(), 0, ops); - debug_printf(pool(), "execution-------------------------\n"); + debug_printf(sapi_info, "source----------------------------\n"); + debug_dump(sapi_info, 0, ops); + debug_printf(sapi_info, "execution-------------------------\n"); #endif - const String *last_get_element_name=0; + for(Array_iterator i(ops); i.has_next(); ) { + OP::OPCODE opcode=i.next().code; - Array_iter i(ops); - while(i.has_next()) { - Operation op; - op.cast=i.next(); #ifdef DEBUG_EXECUTE - debug_printf(pool(), "%d:%s", stack.top_index()+1, opcode_name[op.code]); + debug_printf(sapi_info, "%d:%s", stack.top_index()+1, opcode_name[opcode]); #endif - Value *value; - Value *a; Value *b; - Array *b_code; - switch(op.code) { + switch(opcode) { // param in next instruction - case OP_VALUE: + case OP::OP_VALUE: { - value=static_cast(i.next()); -#ifdef DEBUG_EXECUTE - debug_printf(pool(), " \"%s\" %s", value->get_string()->cstr(), value->type()); -#endif - PUSH(value); + debug_origin=i.next().origin; + Value& value=*i.next().value; + + DEBUG_PRINT_VALUE_AND_TYPE(value) + + stack.push(value); + break; + } + +#ifdef OPTIMIZE_BYTECODE_GET_CLASS + case OP::OP_VALUE__GET_CLASS: + { + // maybe they do ^class:method[] call, remember the fact + wcontext->set_somebody_entered_some_class(); + + debug_origin=i.next().origin; + Value& value=*i.next().value; + const String& name=*value.get_string(); + + DEBUG_PRINT_STRING(name) + + Value* class_value=classes().get(name); + if(!class_value) + throw Exception(PARSER_RUNTIME, + &name, + "class is undefined"); + + stack.push(*class_value); break; } - case OP_GET_CLASS: +#else + case OP::OP_GET_CLASS: { // maybe they do ^class:method[] call, remember the fact wcontext->set_somebody_entered_some_class(); - const String& name=POP_NAME(); - value=static_cast(classes().get(name)); + const String& name=stack.pop().string(); + Value* value=classes().get(name); if(!value) - throw Exception("parser.runtime", + throw Exception(PARSER_RUNTIME, &name, "class is undefined"); - PUSH(value); + stack.push(*value); break; } - +#endif // OP_WITH - case OP_WITH_ROOT: + case OP::OP_WITH_ROOT: { - PUSH(method_frame); + stack.push(*method_frame); break; } - case OP_WITH_SELF: + case OP::OP_WITH_SELF: { - PUSH(self); + stack.push(get_self()); break; } - case OP_WITH_READ: + case OP::OP_WITH_READ: { - PUSH(rcontext); + stack.push(*rcontext); break; } - case OP_WITH_WRITE: + case OP::OP_WITH_WRITE: { - PUSH(wcontext); + if(wcontext==method_frame) + throw Exception(PARSER_RUNTIME, + 0, + "$.name outside of $name[...]"); + + stack.push(*wcontext); break; } // OTHER ACTIONS BUT WITHs - case OP_CONSTRUCT_VALUE: + +#ifdef OPTIMIZE_BYTECODE_CONSTRUCT +#define DO_CONSTRUCT(context, vvalue) { \ + debug_origin=i.next().origin; \ + const String& name=*i.next().value->get_string(); debug_name=&name; \ + DEBUG_PRINT_STRING(name) \ + Value& value=stack.pop().value(); \ + put_element( context, name, vvalue ); \ + break; \ + } +#define DO_CONSTRUCT_VALUE(context) DO_CONSTRUCT(context, &value) +#define DO_CONSTRUCT_EXPR(context) { \ + wcontext->set_in_expression(false); \ + DO_CONSTRUCT(context, &value.as_expr_result()) \ + } + + case OP::OP_WITH_WRITE__VALUE__CONSTRUCT_EXPR: { - value=POP(); - const String& name=POP_NAME(); - Value *ncontext=POP(); - ncontext->put_element(name, value, false); + if(wcontext==method_frame) + throw Exception(PARSER_RUNTIME, 0, "$.name outside of $name[...]"); + DO_CONSTRUCT_EXPR(*wcontext) + } + + case OP::OP_WITH_WRITE__VALUE__CONSTRUCT_VALUE: + { + if(wcontext==method_frame) + throw Exception(PARSER_RUNTIME, 0, "$.name outside of $name[...]"); + DO_CONSTRUCT_VALUE(*wcontext) + } + + case OP::OP_WITH_ROOT__VALUE__CONSTRUCT_EXPR: DO_CONSTRUCT_EXPR(*method_frame) + + case OP::OP_WITH_ROOT__VALUE__CONSTRUCT_VALUE: DO_CONSTRUCT_VALUE(*method_frame) + + case OP::OP_WITH_SELF__VALUE__CONSTRUCT_EXPR: DO_CONSTRUCT_EXPR(get_self()) + + case OP::OP_WITH_SELF__VALUE__CONSTRUCT_VALUE: DO_CONSTRUCT_VALUE(get_self()) + +#endif // OPTIMIZE_BYTECODE_CONSTRUCT + + case OP::OP_CONSTRUCT_VALUE: + { +#ifdef OPTIMIZE_BYTECODE_CONSTRUCT + const String& name=stack.pop().string(); debug_name=&name; + Value& ncontext=stack.pop().value(); + Value& value=stack.pop().value(); +#else + Value& value=stack.pop().value(); + const String& name=stack.pop().string(); debug_name=&name; + Value& ncontext=stack.pop().value(); +#endif + put_element(ncontext, name, &value); + break; } - case OP_CONSTRUCT_EXPR: + + case OP::OP_CONSTRUCT_EXPR: { // see OP_PREPARE_TO_EXPRESSION wcontext->set_in_expression(false); - value=POP(); - const String& name=POP_NAME(); - Value *ncontext=POP(); - ncontext->put_element(name, value->as_expr_result(), false); +#ifdef OPTIMIZE_BYTECODE_CONSTRUCT + const String& name=stack.pop().string(); debug_name=&name; + Value& ncontext=stack.pop().value(); + Value& expr=stack.pop().value(); +#else + Value& expr=stack.pop().value(); + const String& name=stack.pop().string(); debug_name=&name; + Value& ncontext=stack.pop().value(); +#endif + Value& value=expr.as_expr_result(); + put_element(ncontext, name, &value); break; } - case OP_CURLY_CODE__CONSTRUCT: + + case OP::OP_CURLY_CODE__CONSTRUCT: { - const Array *local_ops=reinterpret_cast(i.next()); -#ifdef DEBUG_EXECUTE - debug_printf(pool(), " (%d)\n", local_ops->size()); - debug_dump(pool(), 1, *local_ops); -#endif - Junction& j=*NEW Junction(pool(), - *self, 0, + ArrayOperation& local_ops=*i.next().ops; + + DEBUG_PRINT_OPS((&local_ops)) + + VJunction& value=*new VJunction( + get_self(), 0, method_frame, rcontext, wcontext, - local_ops); + &local_ops); - value=NEW VJunction(j); - const String& name=POP_NAME(); - Value *ncontext=POP(); - ncontext->put_element(name, value, false); + wcontext->attach_junction(&value); + + const String& name=stack.pop().string(); debug_name=&name; + Value& ncontext=stack.pop().value(); + if(const VJunction* vjunction=ncontext.put_element(ncontext, name, &value, false)) + if(vjunction!=PUT_ELEMENT_REPLACED_ELEMENT) + throw Exception(PARSER_RUNTIME, + 0, + "property value can not be code, use [] or () brackets"); + break; } - case OP_NESTED_CODE: + case OP::OP_NESTED_CODE: { - Array *local_ops=static_cast(i.next()); -#ifdef DEBUG_EXECUTE - debug_printf(pool(), " (%d)\n", local_ops->size()); - debug_dump(pool(), 1, *local_ops); -#endif - PUSH(local_ops); + ArrayOperation& local_ops=*i.next().ops; + + DEBUG_PRINT_OPS((&local_ops)) + + stack.push(local_ops); break; } - case OP_WRITE_VALUE: + case OP::OP_WRITE_VALUE: { - value=POP(); - write_assign_lang(*value, last_get_element_name); + Value& value=stack.pop().value(); + write_assign_lang(value); break; } - case OP_WRITE_EXPR_RESULT: + case OP::OP_WRITE_EXPR_RESULT: { - value=POP(); - write_no_lang(*value->as_expr_result()); + Value& value=stack.pop().value(); + write_no_lang(value.as_expr_result()); // must be after write(result) and // see OP_PREPARE_TO_EXPRESSION wcontext->set_in_expression(false); break; } - case OP_STRING__WRITE: + case OP::OP_STRING__WRITE: { - VString *vstring=static_cast(i.next()); -#ifdef DEBUG_EXECUTE - debug_printf(pool(), " \"%s\"", vstring->string().cstr()); + i.next(); // ignore origin + Value* value=i.next().value; + + const String& string_value=*value->get_string(); + + DEBUG_PRINT_STRING(string_value) + + write_no_lang(string_value); + break; + } + +#ifdef OPTIMIZE_BYTECODE_GET_ELEMENT + case OP::OP_VALUE__GET_ELEMENT_OR_OPERATOR: + { + debug_origin=i.next().origin; + const String& name=*i.next().value->get_string(); debug_name=&name; + + DEBUG_PRINT_STRING(name) + + if(Method* method=main_class.get_method(name)){ // looking operator of that name FIRST + if(!method->junction_template) method->junction_template=new VJunction(main_class, method); + stack.push(*method->junction_template); + break; + } + Value& value=get_element(*rcontext, name); + stack.push(value); + break; + } +#else + case OP::OP_GET_ELEMENT_OR_OPERATOR: + { + const String& name=stack.pop().string(); debug_name=&name; + Value& ncontext=stack.pop().value(); + if(Method* method=main_class.get_method(name)){ // looking operator of that name FIRST + if(!method->junction_template) method->junction_template=new VJunction(main_class, method); + stack.push(*method->junction_template); + break; + } + Value& value=get_element(ncontext, name); + stack.push(value); + break; + } #endif - write_no_lang(vstring->string()); + +#ifdef OPTIMIZE_BYTECODE_GET_OBJECT_ELEMENT + case OP::OP_GET_OBJECT_ELEMENT: + case OP::OP_GET_OBJECT_ELEMENT__WRITE: + { + debug_origin=i.next().origin; + const String& context_name=*i.next().value->get_string(); debug_name=&context_name; + + DEBUG_PRINT_STRING(context_name) + + Value& object=get_element(*rcontext, context_name); + + debug_origin=i.next().origin; + const String& field_name=*i.next().value->get_string(); debug_name=&field_name; + + DEBUG_PRINT_STRING(field_name) + + Value& value=get_element(object, field_name); + + if(opcode==OP::OP_GET_OBJECT_ELEMENT){ + stack.push(value); + } else { + write_assign_lang(value); + } break; } - - case OP_GET_ELEMENT_OR_OPERATOR: +#endif + +#ifdef OPTIMIZE_BYTECODE_GET_OBJECT_VAR_ELEMENT + case OP::OP_GET_OBJECT_VAR_ELEMENT: + case OP::OP_GET_OBJECT_VAR_ELEMENT__WRITE: + { + debug_origin=i.next().origin; + const String& context_name=*i.next().value->get_string(); debug_name=&context_name; + + DEBUG_PRINT_STRING(context_name) + + Value& object=get_element(*rcontext, context_name); + + debug_origin=i.next().origin; + const String& var_name=*i.next().value->get_string(); debug_name=&var_name; + + DEBUG_PRINT_STRING(var_name) + + const String* field=get_element(*rcontext, var_name).get_string(); + + Value& value=get_element(object, *field); + + if(opcode==OP::OP_GET_OBJECT_VAR_ELEMENT){ + stack.push(value); + } else { + write_assign_lang(value); + } + break; + } +#endif + + case OP::OP_GET_ELEMENT: { - //_asm int 3; - value=get_element(last_get_element_name, true); - PUSH(value); + const String& name=stack.pop().string(); debug_name=&name; + Value& ncontext=stack.pop().value(); + Value& value=get_element(ncontext, name); + stack.push(value); break; } - case OP_GET_ELEMENT: + + case OP::OP_GET_ELEMENT__WRITE: { - //_asm int 3; - value=get_element(last_get_element_name, false); - PUSH(value); + const String& name=stack.pop().string(); debug_name=&name; + Value& ncontext=stack.pop().value(); + Value& value=get_element(ncontext, name); + write_assign_lang(value); break; } - case OP_GET_ELEMENT__WRITE: +#ifdef OPTIMIZE_BYTECODE_GET_ELEMENT + case OP::OP_VALUE__GET_ELEMENT: { - value=get_element(last_get_element_name/*not followed by call, not needed really*/, false); - write_assign_lang(*value, last_get_element_name); + debug_origin=i.next().origin; + const String& name=*i.next().value->get_string(); debug_name=&name; + + DEBUG_PRINT_STRING(name) + + Value& value=get_element(*rcontext, name); + stack.push(value); break; } + case OP::OP_VALUE__GET_ELEMENT__WRITE: + { + debug_origin=i.next().origin; + const String& name=*i.next().value->get_string(); debug_name=&name; + + DEBUG_PRINT_STRING(name) + + Value& value=get_element(*rcontext, name); + write_assign_lang(value); + break; + } - case OP_OBJECT_POOL: + case OP::OP_WITH_ROOT__VALUE__GET_ELEMENT: { - const Array *local_ops=reinterpret_cast(i.next()); + debug_origin=i.next().origin; + const String& name=*i.next().value->get_string(); debug_name=&name; + + DEBUG_PRINT_STRING(name) + + Value& value=get_element(*method_frame, name); + stack.push(value); + break; + } +#endif + +#ifdef OPTIMIZE_BYTECODE_GET_SELF_ELEMENT + case OP::OP_WITH_SELF__VALUE__GET_ELEMENT: + case OP::OP_WITH_SELF__VALUE__GET_ELEMENT__WRITE: + { + debug_origin=i.next().origin; + const String& name=*i.next().value->get_string(); debug_name=&name; + + DEBUG_PRINT_STRING(name) + + Value& value=get_element(get_self(), name); + + if(opcode==OP::OP_WITH_SELF__VALUE__GET_ELEMENT){ + stack.push(value); + } else { + write_assign_lang(value); + } + break; + } +#endif + + case OP::OP_OBJECT_POOL: + { + ArrayOperation& local_ops=*i.next().ops; WContext *saved_wcontext=wcontext; - uchar saved_lang= flang; - flang=String::UL_PASS_APPENDED; - WWrapper local(pool(), 0 /*empty*/, wcontext); + String::Language saved_lang=flang; + flang=String::L_PASS_APPENDED; +#ifdef OPTIMIZE_SINGLE_STRING_WRITE + WObjectPoolWrapper local(0/*empty*/, wcontext); +#else + WWrapper local(0/*empty*/, wcontext); +#endif wcontext=&local; - execute(*local_ops); + execute(local_ops); - value=&wcontext->result().as_value(); + stack.push(wcontext->result().as_value()); flang=saved_lang; wcontext=saved_wcontext; - PUSH(value); break; } - case OP_STRING_POOL: + case OP::OP_STRING_POOL: { - const Array *local_ops=reinterpret_cast(i.next()); + ArrayOperation& local_ops=*i.next().ops; WContext *saved_wcontext=wcontext; - WWrapper local(pool(), 0 /*empty*/, wcontext); + WWrapper local(0 /*empty*/, wcontext); wcontext=&local; - execute(*local_ops); + execute(local_ops); + Value* value; // from "$a $b" part of expression taking only string value, // ignoring any other content of wcontext - const String *string=wcontext->get_string(); - Value *value; - if(string) - value=NEW VString(*string); + if(const String* string=wcontext->get_string()) + value=new VString(*string); else - NEW VVoid(pool()); + value=VVoid::get(); + stack.push(*value); + wcontext=saved_wcontext; - PUSH(value); break; } // CALL - case OP_STORE_PARAM: - { - value=POP(); - VMethodFrame *frame=static_cast(stack.top_value()); - // this op is executed from CALL local_ops only, so can not check method_frame_to_fill==0 - frame->store_param(value); - break; - } - case OP_CURLY_CODE__STORE_PARAM: - case OP_EXPR_CODE__STORE_PARAM: + case OP::OP_CURLY_CODE__STORE_PARAM: + case OP::OP_EXPR_CODE__STORE_PARAM: { // code - const Array *local_ops=reinterpret_cast(i.next()); - VMethodFrame *frame=static_cast(stack.top_value()); -#ifdef DEBUG_EXECUTE - debug_printf(pool(), " (%d)\n", local_ops->size()); - debug_dump(pool(), 1, *local_ops); -#endif + ArrayOperation& local_ops=*i.next().ops; + + DEBUG_PRINT_OPS((&local_ops)) + // when they evaluate expression parameter, // the object expression result // does not need to be written into calling frame @@ -347,491 +698,727 @@ void Request::execute(const Array& ops) // hence, we zero junction.wcontext here, and later // in .process we would test that field // in decision "which wwrapper to use" - Junction& j=*NEW Junction(pool(), - *self, 0, + VJunction& value=*new VJunction( + get_self(), 0, method_frame, rcontext, - op.code==OP_EXPR_CODE__STORE_PARAM?0:wcontext, - local_ops); - - value=NEW VJunction(j); - + opcode==OP::OP_EXPR_CODE__STORE_PARAM?0:wcontext, + &local_ops); +#ifndef USE_DESTRUCTORS + if (opcode!=OP::OP_EXPR_CODE__STORE_PARAM) + wcontext->attach_junction(&value); +#endif // store param - // this op is executed from CALL local_ops only, so can not check method_frame_to_fill==0 - frame->store_param(value); + stack.push(value); break; } - case OP_PREPARE_TO_CONSTRUCT_OBJECT: +#ifndef OPTIMIZE_BYTECODE_CONSTRUCT_OBJECT + case OP::OP_PREPARE_TO_CONSTRUCT_OBJECT: { wcontext->set_constructing(true); break; } +#endif - case OP_PREPARE_TO_EXPRESSION: + case OP::OP_PREPARE_TO_EXPRESSION: { wcontext->set_in_expression(true); break; } - case OP_CALL: - case OP_CALL__WRITE: + case OP::OP_CALL: { - Array *local_ops=static_cast(i.next()); -#ifdef DEBUG_EXECUTE - debug_printf(pool(), " (%d)\n", local_ops->size()); - debug_dump(pool(), 1, *local_ops); + ArrayOperation* local_ops=i.next().ops; - debug_printf(pool(), "->\n"); -#endif - value=POP(); + DEBUG_PRINT_OPS(local_ops) + DEBUG_PRINT_STR("->\n") + + Value& value=stack.pop().value(); - // info: - // code compiled so that this one's always method-junction, - // not a code-junction - Junction *junction=value->get_junction(); - if(!junction) - throw Exception("parser.runtime", - last_get_element_name, - "(%s) not a method or junction, can not call it", - value->type()); + Junction* junction=value.get_junction(); + if(!junction) { + if(value.is("void")) + throw Exception(PARSER_RUNTIME, + 0, + "undefined method"); + else + throw Exception(PARSER_RUNTIME, + 0, + "is '%s', not a method or junction, can not call it", + value.type()); + } + + VMethodFrame frame(*junction, method_frame); - VMethodFrame frame(pool(), *last_get_element_name, *junction); if(local_ops){ // store param code goes here - PUSH(&frame); // argument for *STORE_PARAM ops + size_t first = stack.top_index(); execute(*local_ops); - POP(); + frame.store_params((Value**)stack.ptr(first), stack.top_index()-first); + op_call(frame); + stack.set_top_index(first); + } else { + frame.empty_params(); + op_call(frame); } - frame.fill_unspecified_params(); - Value *saved_self=self; - VMethodFrame *saved_method_frame=method_frame; - Value *saved_rcontext=rcontext; - WContext *saved_wcontext=wcontext; - - VStateless_class *called_class=frame.junction.self.get_class(); - if(wcontext->get_constructing()) { - wcontext->set_constructing(false); - if(frame.junction.method->call_type!=Method::CT_STATIC) { - // this is a constructor call - - if(Value *value=called_class->create_new_value(pool())) { - // some stateless_class creatable derivates - self=value; - } else - throw Exception("parser.runtime", - &frame.name(), - "is not a constructor, system class '%s' can be constructed only implicitly", - called_class->name().cstr()); - - frame.write(*self, - String::UL_CLEAN // not used, always an object, not string - ); - } else - throw Exception("parser.runtime", - &frame.name(), - "method is static and can not be used as constructor"); - } else - self=&frame.junction.self; - frame.set_self(*self); + stack.push(frame.result().as_value()); - // see OP_PREPARE_TO_EXPRESSION - frame.set_in_expression(wcontext->get_in_expression()); - - rcontext=wcontext=&frame; + DEBUG_PRINT_STR("<-returned") + + if(get_skip()) + return; + if(get_interrupted()) { + set_interrupted(false); + throw Exception("parser.interrupted", + 0, + "execution stopped"); + } + break; + } + + case OP::OP_CALL__WRITE: + { + ArrayOperation* local_ops=i.next().ops; + + DEBUG_PRINT_OPS(local_ops) + DEBUG_PRINT_STR("->\n") + + Value& value=stack.pop().value(); + + Junction* junction=value.get_junction(); + if(!junction) { + if(value.is("void")) + throw Exception(PARSER_RUNTIME, + 0, + "undefined method"); + else + throw Exception(PARSER_RUNTIME, + 0, + "is '%s', not a method or junction, can not call it", + value.type()); + } + +#ifdef OPTIMIZE_CALL + const Method& method=*junction->method; + if (!wcontext->get_constructing() && method.call_optimization==Method::CO_WITHOUT_FRAME){ + if(local_ops){ // store param code goes here + size_t first = stack.top_index(); + execute(*local_ops); + + MethodParams method_params; + method_params.store_params((Value**)stack.ptr(first), stack.top_index()-first); + method.check_actual_numbered_params(junction->self, &method_params); + method.native_code(*this, method_params); // execute it + + stack.set_top_index(first); + } else { + MethodParams method_params; + method.check_actual_numbered_params(junction->self, &method_params); + method.native_code(*this, method_params); // execute it + } + } else if (!wcontext->get_constructing() && method.call_optimization==Method::CO_WITHOUT_WCONTEXT){ + VMethodFrame frame(*junction, method_frame); + if(local_ops){ // store param code goes here + size_t first = stack.top_index(); + execute(*local_ops); + + frame.store_params((Value**)stack.ptr(first), stack.top_index()-first); + op_call_write(frame); + + stack.set_top_index(first); + } else { + frame.empty_params(); + op_call_write(frame); + } + } else +#endif // OPTIMIZE_CALL { - const Method& method=*frame.junction.method; - Method::Call_type call_type= - called_class==self ? Method::CT_STATIC : Method::CT_DYNAMIC; - if( - method.call_type==Method::CT_ANY || - method.call_type==call_type) { // allowed call type? - try { - if(method.native_code) { // native code? - // method_frame unchanged, so that ^for ^foreach & co may write to locals - method.check_actual_numbered_params( - frame.junction.self, - frame.name(), frame.numbered_params()); - method.native_code( - *this, - frame.name(), frame.numbered_params()); // execute it - } else { // parser code - method_frame=&frame; - // execute it - recoursion_checked_execute(&frame.name(), *method.parser_code); - } - } catch(...) { - // record it to stack trace - exception_trace.push((void *)&frame.name()); - /*re*/throw; - } - } else - throw Exception("parser.runtime", - &frame.name(), - "is not allowed to be called %s", - call_type==Method::CT_STATIC?"statically":"dynamically"); + VMethodFrame frame(*junction, method_frame); + if(local_ops){ // store param code goes here + size_t first = stack.top_index(); + execute(*local_ops); + + frame.store_params((Value**)stack.ptr(first), stack.top_index()-first); + op_call(frame); + + stack.set_top_index(first); + } else { + frame.empty_params(); + op_call(frame); + } + write_pass_lang(frame.result()); + } + + DEBUG_PRINT_STR("<-returned") + if(get_skip()) + return; + if(get_interrupted()) { + set_interrupted(false); + throw Exception("parser.interrupted", + 0, + "execution stopped"); } - StringOrValue result=wcontext->result(); + break; + } - wcontext=saved_wcontext; - rcontext=saved_rcontext; - method_frame=saved_method_frame; - self=saved_self; - -#ifdef DEBUG_STRING_APPENDS_VS_EXPANDS - if(const String *s=value->get_string()) - wcontext_result_size+=s->used_rows()*sizeof(String::Chunk::Row); -#endif +#ifdef OPTIMIZE_BYTECODE_CONSTRUCT_OBJECT + case OP::OP_CONSTRUCT_OBJECT: + case OP::OP_CONSTRUCT_OBJECT__WRITE: + { + // maybe they do ^class:method[] call, remember the fact + wcontext->set_somebody_entered_some_class(); + + debug_origin=i.next().origin; + Value& vclass_name=*i.next().value; + const String& class_name=*vclass_name.get_string(); + + DEBUG_PRINT_STRING(class_name) + + Value* class_value=classes().get(class_name); + if(!class_value) + throw Exception(PARSER_RUNTIME, + &class_name, + "class is undefined"); - if(op.code==OP_CALL__WRITE) { - write_assign_lang(result, last_get_element_name); - } else { // OP_CALL - PUSH(&result.as_value()); + wcontext->set_constructing(true); + + debug_origin=i.next().origin; + Value& vconstructor_name=*i.next().value; + const String& constructor_name=*vconstructor_name.get_string(); debug_name=&constructor_name; + + DEBUG_PRINT_STRING(constructor_name) + + Value& constructor_value=get_element(*class_value, constructor_name); + + ArrayOperation* local_ops=i.next().ops; + DEBUG_PRINT_OPS(local_ops) + DEBUG_PRINT_STR("->\n") + + Junction* junction=constructor_value.get_junction(); + if(!junction) { + if(constructor_value.is("void")) + throw Exception(PARSER_RUNTIME, + 0, + "undefined method"); + else + throw Exception(PARSER_RUNTIME, + 0, + "is '%s', not a method or junction, can not call it", + constructor_value.type()); + } else { + VMethodFrame frame(*junction, method_frame); + if(local_ops){ // store param code goes here + size_t first = stack.top_index(); + execute(*local_ops); + + frame.store_params((Value**)stack.ptr(first), stack.top_index()-first); + op_call(frame); + + stack.set_top_index(first); + } else { + frame.empty_params(); + op_call(frame); + } + + if(opcode==OP::OP_CONSTRUCT_OBJECT) + stack.push(frame.result().as_value()); + else + write_pass_lang(frame.result()); } - -#ifdef DEBUG_EXECUTE - debug_printf(pool(), "<-returned"); -#endif + + DEBUG_PRINT_STR("<-returned") + + +/* + if(get_skip()) + return; + if(get_interrupted()) { + set_interrupted(false); + throw Exception("parser.interrupted", + 0, + "execution stopped"); + } +*/ break; } +#endif // OPTIMIZE_BYTECODE_CONSTRUCT_OBJECT // expression ops: unary - case OP_NEG: + case OP::OP_NEG: { - Value *operand=POP(); - value=NEW VDouble(pool(), -operand->as_double()); - PUSH(value); + Value& a=stack.pop().value(); + Value& value=*new VDouble(-a.as_double()); + stack.push(value); break; } - case OP_INV: + case OP::OP_INV: { - Value *operand=POP(); - value=NEW VDouble(pool(), ~operand->as_int()); - PUSH(value); + Value& a=stack.pop().value(); + Value& value=*new VDouble(~a.as_int()); + stack.push(value); break; } - case OP_NOT: + case OP::OP_NOT: { - Value *operand=POP(); - value=NEW VBool(pool(), !operand->as_bool()); - PUSH(value); + Value& a=stack.pop().value(); + Value& value=VBool::get(!a.as_bool()); + stack.push(value); break; } - case OP_DEF: + case OP::OP_DEF: { - Value *operand=POP(); - value=NEW VBool(pool(), operand->is_defined()); - PUSH(value); + Value& a=stack.pop().value(); + Value& value=VBool::get(a.is_defined()); + stack.push(value); break; } - case OP_IN: + case OP::OP_IN: { - /// @test String::cmp - Value *operand=POP(); - const char *path=operand->as_string().cstr(); - value=NEW VBool(pool(), - info.uri && strncmp(path, info.uri, strlen(path))==0); - PUSH(value); + Value& a=stack.pop().value(); + const String& path=a.as_string(); + Value& value=VBool::get(request_info.uri && *request_info.uri && path.this_starts(request_info.uri)); + stack.push(value); break; } - case OP_FEXISTS: + case OP::OP_FEXISTS: { - Value *operand=POP(); - value=NEW VBool(pool(), - file_readable(absolute(operand->as_string()))); - PUSH(value); + Value& a=stack.pop().value(); + Value& value=VBool::get(file_exist(absolute(a.as_string()))); + stack.push(value); break; } - case OP_DEXISTS: + case OP::OP_DEXISTS: { - Value *operand=POP(); - value=NEW VBool(pool(), - dir_readable(absolute(operand->as_string()))); - PUSH(value); + Value& a=stack.pop().value(); + Value& value=VBool::get(dir_exists(absolute(a.as_string()))); + stack.push(value); break; } // expression ops: binary - case OP_SUB: + case OP::OP_SUB: { - b=POP(); a=POP(); - value=NEW VDouble(pool(), a->as_double() - b->as_double()); - PUSH(value); + Value& b=stack.pop().value(); Value& a=stack.pop().value(); + Value& value=*new VDouble(a.as_double() - b.as_double()); + stack.push(value); break; } - case OP_ADD: + case OP::OP_ADD: { - b=POP(); a=POP(); - value=NEW VDouble(pool(), a->as_double() + b->as_double()); - PUSH(value); + Value& b=stack.pop().value(); Value& a=stack.pop().value(); + Value& value=*new VDouble(a.as_double() + b.as_double()); + stack.push(value); break; } - case OP_MUL: + case OP::OP_MUL: { - b=POP(); a=POP(); - value=NEW VDouble(pool(), a->as_double() * b->as_double()); - PUSH(value); + Value& b=stack.pop().value(); Value& a=stack.pop().value(); + Value& value=*new VDouble(a.as_double() * b.as_double()); + stack.push(value); break; } - case OP_DIV: + case OP::OP_DIV: { - b=POP(); a=POP(); + Value& b=stack.pop().value(); Value& a=stack.pop().value(); - double a_double=a->as_double(); - double b_double=b->as_double(); + double a_double=a.as_double(); + double b_double=b.as_double(); if(b_double == 0) { - const String *problem_source=&b->as_string(); + //const String* problem_source=b.as_string(); throw Exception("number.zerodivision", - problem_source, + 0, //problem_source, "Division by zero"); } - value=NEW VDouble(pool(), a_double / b_double); - PUSH(value); + Value& value=*new VDouble(a_double / b_double); + stack.push(value); break; } - case OP_MOD: + case OP::OP_MOD: { - b=POP(); a=POP(); + Value& b=stack.pop().value(); Value& a=stack.pop().value(); - double a_double=a->as_double(); - double b_double=b->as_double(); + double a_double=a.as_double(); + double b_double=b.as_double(); if(b_double == 0) { - const String *problem_source=&b->as_string(); + //const String* problem_source=b.as_string(); throw Exception("number.zerodivision", - problem_source, + 0, //problem_source, "Modulus by zero"); } - value=NEW VDouble(pool(), fmod(a_double, b_double)); - PUSH(value); + Value& value=*new VDouble(fmod(a_double, b_double)); + stack.push(value); break; } - case OP_INTDIV: + case OP::OP_INTDIV: { - b=POP(); a=POP(); + Value& b=stack.pop().value(); Value& a=stack.pop().value(); - int a_int=a->as_int(); - int b_int=b->as_int(); + int a_int=a.as_int(); + int b_int=b.as_int(); if(b_int == 0) { - const String *problem_source=&b->as_string(); + //const String* problem_source=b.as_string(); throw Exception("number.zerodivision", - problem_source, + 0, //problem_source, "Division by zero"); } - value=NEW VInt(pool(), a_int / b_int); - PUSH(value); + Value& value=*new VInt(a_int / b_int); + stack.push(value); break; } - case OP_BIN_AND: + case OP::OP_BIN_SL: { - b=POP(); a=POP(); - value=NEW VDouble(pool(), - a->as_int() & - b->as_int()); - PUSH(value); + Value& b=stack.pop().value(); Value& a=stack.pop().value(); + Value& value=*new VInt( + a.as_int() << + b.as_int()); + stack.push(value); break; } - case OP_BIN_OR: + case OP::OP_BIN_SR: { - b=POP(); a=POP(); - value=NEW VDouble(pool(), - a->as_int() | - b->as_int()); - PUSH(value); + Value& b=stack.pop().value(); Value& a=stack.pop().value(); + Value& value=*new VInt( + a.as_int() >> + b.as_int()); + stack.push(value); break; } - case OP_BIN_XOR: + case OP::OP_BIN_AND: { - b=POP(); a=POP(); - value=NEW VDouble(pool(), - a->as_int() ^ - b->as_int()); - PUSH(value); + Value& b=stack.pop().value(); Value& a=stack.pop().value(); + Value& value=*new VInt( + a.as_int() & + b.as_int()); + stack.push(value); break; } - case OP_LOG_AND: + case OP::OP_BIN_OR: { - b_code=POP_CODE(); a=POP(); + Value& b=stack.pop().value(); Value& a=stack.pop().value(); + Value& value=*new VInt( + a.as_int() | + b.as_int()); + stack.push(value); + break; + } + case OP::OP_BIN_XOR: + { + Value& b=stack.pop().value(); Value& a=stack.pop().value(); + Value& value=*new VInt( + a.as_int() ^ + b.as_int()); + stack.push(value); + break; + } + case OP::OP_LOG_AND: + { + ArrayOperation& local_ops=stack.pop().ops(); Value& a=stack.pop().value(); bool result; - if(a->as_bool()) { - execute(*b_code); - b=POP(); - result=b->as_bool(); + if(a.as_bool()) { + execute(local_ops); + Value& b=stack.pop().value(); + result=b.as_bool(); } else result=false; - value=NEW VBool(pool(), result); - PUSH(value); + Value& value=VBool::get(result); + stack.push(value); break; } - case OP_LOG_OR: + case OP::OP_LOG_OR: { - b_code=POP_CODE(); a=POP(); + ArrayOperation& local_ops=stack.pop().ops(); Value& a=stack.pop().value(); bool result; - if(a->as_bool()) + if(a.as_bool()) result=true; else { - execute(*b_code); - b=POP(); - result=b->as_bool(); + execute(local_ops); + Value& b=stack.pop().value(); + result=b.as_bool(); } - value=NEW VBool(pool(), result); - PUSH(value); + Value& value=VBool::get(result); + stack.push(value); break; } - case OP_LOG_XOR: + case OP::OP_LOG_XOR: { - b=POP(); a=POP(); - value=NEW VBool(pool(), a->as_bool() ^ b->as_bool()); - PUSH(value); + Value& b=stack.pop().value(); Value& a=stack.pop().value(); + Value& value=VBool::get(a.as_bool() ^ b.as_bool()); + stack.push(value); break; } - case OP_NUM_LT: + case OP::OP_NUM_LT: { - b=POP(); a=POP(); - double result=a->as_double() - b->as_double(); - value=NEW VBool(pool(), result < 0.0); - PUSH(value); + volatile double b_double=stack.pop().value().as_double(); + volatile double a_double=stack.pop().value().as_double(); + Value& value=VBool::get(a_doubleas_double() - b->as_double(); - value=NEW VBool(pool(), result > 0.0); - PUSH(value); + volatile double b_double=stack.pop().value().as_double(); + volatile double a_double=stack.pop().value().as_double(); + Value& value=VBool::get(a_double>b_double); + stack.push(value); break; } - case OP_NUM_LE: + case OP::OP_NUM_LE: { - b=POP(); a=POP(); - double result=a->as_double() - b->as_double(); - value=NEW VBool(pool(), result <= 0.0); - PUSH(value); + volatile double b_double=stack.pop().value().as_double(); + volatile double a_double=stack.pop().value().as_double(); + Value& value=VBool::get(a_double<=b_double); + stack.push(value); break; } - case OP_NUM_GE: + case OP::OP_NUM_GE: { - b=POP(); a=POP(); - double result=a->as_double() - b->as_double(); - value=NEW VBool(pool(), result >= 0.0); - PUSH(value); + volatile double b_double=stack.pop().value().as_double(); + volatile double a_double=stack.pop().value().as_double(); + Value& value=VBool::get(a_double>=b_double); + stack.push(value); break; } - case OP_NUM_EQ: + case OP::OP_NUM_EQ: { - b=POP(); a=POP(); - double result=a->as_double() - b->as_double(); - value=NEW VBool(pool(), result == 0.0); - PUSH(value); + volatile double b_double=stack.pop().value().as_double(); + volatile double a_double=stack.pop().value().as_double(); + Value& value=VBool::get(a_double==b_double); + stack.push(value); break; } - case OP_NUM_NE: + case OP::OP_NUM_NE: { - b=POP(); a=POP(); - double result=a->as_double() - b->as_double(); - value=NEW VBool(pool(), result != 0.0); - PUSH(value); + volatile double b_double=stack.pop().value().as_double(); + volatile double a_double=stack.pop().value().as_double(); + Value& value=VBool::get(a_double!=b_double); + stack.push(value); break; } - case OP_STR_LT: + case OP::OP_STR_LT: { - b=POP(); a=POP(); - value=NEW VBool(pool(), a->as_string() < b->as_string()); - PUSH(value); + Value& b=stack.pop().value(); Value& a=stack.pop().value(); + Value& value=VBool::get(a.as_string() < b.as_string()); + stack.push(value); break; } - case OP_STR_GT: + case OP::OP_STR_GT: { - b=POP(); a=POP(); - value=NEW VBool(pool(), a->as_string() > b->as_string()); - PUSH(value); + Value& b=stack.pop().value(); Value& a=stack.pop().value(); + Value& value=VBool::get(a.as_string() > b.as_string()); + stack.push(value); break; } - case OP_STR_LE: + case OP::OP_STR_LE: { - b=POP(); a=POP(); - value=NEW VBool(pool(), a->as_string() <= b->as_string()); - PUSH(value); + Value& b=stack.pop().value(); Value& a=stack.pop().value(); + Value& value=VBool::get(a.as_string() <= b.as_string()); + stack.push(value); break; } - case OP_STR_GE: + case OP::OP_STR_GE: { - b=POP(); a=POP(); - value=NEW VBool(pool(), a->as_string() >= b->as_string()); - PUSH(value); + Value& b=stack.pop().value(); Value& a=stack.pop().value(); + Value& value=VBool::get(a.as_string() >= b.as_string()); + stack.push(value); break; } - case OP_STR_EQ: + case OP::OP_STR_EQ: { - b=POP(); a=POP(); - value=NEW VBool(pool(), a->as_string() == b->as_string()); - PUSH(value); + Value& b=stack.pop().value(); Value& a=stack.pop().value(); + Value& value=VBool::get(a.as_string() == b.as_string()); + stack.push(value); break; } - case OP_STR_NE: + case OP::OP_STR_NE: { - b=POP(); a=POP(); - value=NEW VBool(pool(), a->as_string() != b->as_string()); - PUSH(value); + Value& b=stack.pop().value(); Value& a=stack.pop().value(); + Value& value=VBool::get(a.as_string() != b.as_string()); + stack.push(value); break; } - case OP_IS: + case OP::OP_IS: { - b=POP(); a=POP(); - value=NEW VBool(pool(), a->is(b->as_string().cstr())); - PUSH(value); + Value& b=stack.pop().value(); Value& a=stack.pop().value(); + Value& value=VBool::get(a.is(b.as_string().cstr())); + stack.push(value); break; } default: throw Exception(0, 0, - "invalid opcode %d", op.code); + "invalid opcode %d", opcode); } } + } catch(const Exception&) { + // record it to stack trace + if(debug_name) + exception_trace.push(Trace(debug_name, debug_origin)); + rethrow; + } } -/// @test cache|prepare junctions -Value *Request::get_element(const String *& remember_name, bool can_call_operator) { - const String& name=POP_NAME(); remember_name=&name; - Value *ncontext=POP(); - Value *value=0; - if(can_call_operator) { - if(Method* method=OP.get_method(name)) { // looking operator of that name FIRST - // as if that method were in self and we have normal dynamic method here - Junction& junction=*NEW Junction(pool(), - *method_frame, method, 0,0,0,0); - value=NEW VJunction(junction); - } - } - if(!value) { - if(!wcontext->get_constructing() // not constructing - && wcontext->get_somebody_entered_some_class() ) // ^class:method - if(VStateless_class *called_class=ncontext->get_class()) +#define SAVE_CONTEXT \ + VMethodFrame *saved_method_frame=method_frame; \ + Value* saved_rcontext=rcontext; \ + WContext *saved_wcontext=wcontext; + +#define RESTORE_CONTEXT \ + wcontext=saved_wcontext; \ + rcontext=saved_rcontext; \ + method_frame=saved_method_frame; + +void Request::op_call(VMethodFrame& frame){ + const Junction &junction=frame.junction; + VStateless_class& called_class=*junction.self.get_class(); + Value* new_self; + + if(wcontext->get_constructing()) { + wcontext->set_constructing(false); + if(junction.method->call_type!=Method::CT_STATIC) { + // this is a constructor call + if(new_self=called_class.create_new_value(fpool, 0 /*creating fields only in VClass*/)) { + // some stateless_class creatable derivates + } else + throw Exception(PARSER_RUNTIME, + 0, //&frame.name(), + "is not a constructor, system class '%s' can be constructed only implicitly", + called_class.name().cstr()); + + frame.write(*new_self, + String::L_CLEAN // not used, always an object, not string + ); + } else + throw Exception(PARSER_RUNTIME, + 0, //&frame.name(), + "method is static and can not be used as constructor"); + } else + new_self=&junction.self; + + frame.set_self(*new_self); + + // see OP_PREPARE_TO_EXPRESSION + frame.set_in_expression(wcontext->get_in_expression()); + + SAVE_CONTEXT + + rcontext=wcontext=&frame; + method_frame=&frame; + + const Method& method=*junction.method; + Method::Call_type call_type=&called_class==new_self ? Method::CT_STATIC : Method::CT_DYNAMIC; + + if(method.call_type==Method::CT_ANY || method.call_type==call_type) { // allowed call type? + if(method.native_code) { // native code? + method.check_actual_numbered_params(junction.self, frame.numbered_params()); + method.native_code(*this, *frame.numbered_params()); // execute it + } else // parser code, execute it + recoursion_checked_execute(*method.parser_code); + } else + throw Exception(PARSER_RUNTIME, + 0, + "is not allowed to be called %s", + call_type==Method::CT_STATIC?"statically":"dynamically"); + + RESTORE_CONTEXT + //return &frame; +} + +void Request::op_call_write(VMethodFrame& frame){ + const Junction &junction=frame.junction; + + frame.set_self(junction.self); + + VMethodFrame *saved_method_frame=method_frame; + Value* saved_rcontext=rcontext; + + rcontext=&frame; + method_frame=&frame; + + const Method& method=*junction.method; + Method::Call_type call_type=junction.self.get_class()==&junction.self ? Method::CT_STATIC : Method::CT_DYNAMIC; + + if(method.call_type==Method::CT_ANY || method.call_type==call_type) { // allowed call type? + if(method.native_code) { // native code? + method.check_actual_numbered_params(junction.self, frame.numbered_params()); + method.native_code(*this, *frame.numbered_params()); // execute it + } else // parser code, execute it + recoursion_checked_execute(*method.parser_code); + } else + throw Exception(PARSER_RUNTIME, + 0, + "is not allowed to be called %s", + call_type==Method::CT_STATIC?"statically":"dynamically"); + + rcontext=saved_rcontext; + method_frame=saved_method_frame; +} + +/** + @bug ^superbase:method would dynamically call ^base:method if there is any +*/ +Value& Request::get_element(Value& ncontext, const String& name) { + if(!wcontext->get_constructing() // not constructing + && wcontext->get_somebody_entered_some_class() ) // ^class:method + if(VStateless_class *called_class=ncontext.get_class()) if(VStateless_class *read_class=rcontext->get_class()) if(read_class->derived_from(*called_class)) // current derived from called - if(Value *base_object=self->base_object()) { // doing DYNAMIC call - Temp_derived temp_derived(*base_object, 0); // temporarily prevent go-back-down virtual calls - value=base_object->get_element(name, base_object, false); // virtual-up lookup starting from parent - goto _void; + if(Value* base=get_self().base()) { // doing DYNAMIC call + Temp_derived temp_derived(*base, 0); // temporarily prevent go-back-down virtual calls + Value *value=base->get_element(name, *base, true); // virtual-up lookup starting from parent + return *(value ? &process_to_value(*value) : VVoid::get()); } - } - if(!value) - value=ncontext->get_element(name, ncontext, false); -_void: - if(value) - value=&process_to_value(*value); // process possible code-junction - else - value=NEW VVoid(pool()); + Value* value=ncontext.get_element(name, ncontext, true); + + if(value && wcontext->get_constructing()) + if(Junction* junction=value->get_junction()) + if(junction->self.get_class()!=&ncontext) + throw Exception(PARSER_RUNTIME, + &name, + "constructor must be declared in class '%s'", + ncontext.get_class()->name_cstr()); + + return *(value ? &process_to_value(*value) : VVoid::get()); +} + +void Request::put_element(Value& ncontext, const String& name, Value* value) { + // put_element can return property-setting-junction + if(const VJunction* vjunction=ncontext.put_element(ncontext, name, value, false)) + if(vjunction!=PUT_ELEMENT_REPLACED_ELEMENT) { + // process it + VMethodFrame frame(vjunction->junction(), method_frame/*caller*/); + int param_count=frame.method_params_count(); + + if(param_count!=1) + throw Exception(PARSER_RUNTIME, + 0, + "setter method must have ONE parameter (has %d parameters)", param_count); + + frame.store_params(&value, 1); + frame.set_self(frame.junction.self); + + SAVE_CONTEXT + + rcontext=wcontext=&frame; + method_frame=&frame; + + // prevent non-string writes for better error reporting [setters are not expected to return anything] + wcontext->write(*method_frame); + + recoursion_checked_execute(*frame.junction.method->parser_code); // parser code, execute it + // we don't need it StringOrValue result=wcontext->result(); - return value; + RESTORE_CONTEXT + } } /** @param intercept_string @@ -843,161 +1430,265 @@ _void: nothing goes to wcontext. used in @c (expression) params evaluation - using the fact it's either string_ or value_ result requested to speed up checkes + using the fact it's either string_ or value_ result requested to speed up checkes */ StringOrValue Request::process(Value& input_value, bool intercept_string) { - StringOrValue result; - Junction *junction=input_value.get_junction(); - if(junction && junction->code) { // is it a code-junction? - // process it -#ifdef DEBUG_EXECUTE - debug_printf(pool(), "ja->\n"); -#endif + Junction* junction=input_value.get_junction(); + if(junction) { + if(junction->is_getter) { // is it a getter-junction? + VMethodFrame frame(*junction, method_frame/*caller*/); + int param_count=frame.method_params_count(); + + if(param_count){ + if(junction->auto_name){ // default getter + if(param_count==1){ + Value *param=new VString(*junction->auto_name); + frame.store_params(¶m, 1); + } else + throw Exception(PARSER_RUNTIME, + 0, + "default getter method can't have more then 1 parameter (has %d parameters)", param_count); + } else + throw Exception(PARSER_RUNTIME, + 0, + "getter method must have no parameters (has %d parameters)", param_count); + } // no need for else frame.empty_params() + + frame.set_self(frame.junction.self); + + SAVE_CONTEXT + + rcontext=wcontext=&frame; + method_frame=&frame; + + recoursion_checked_execute(*frame.junction.method->parser_code); // parser code, execute it + StringOrValue result=wcontext->result(); + + RESTORE_CONTEXT - if(!junction->method_frame) - throw Exception("parser.runtime", + return result; + } + + if(junction->code) { // is it a code-junction? + // process it + StringOrValue result; + + DEBUG_PRINT_STR("ja->\n") + + if(!junction->method_frame) + throw Exception(PARSER_RUNTIME, 0, "junction used outside of context"); - Value *saved_self=self; - VMethodFrame *saved_method_frame=method_frame; - Value *saved_rcontext=rcontext; - WContext *saved_wcontext=wcontext; - - self=&junction->self; - method_frame=junction->method_frame; - rcontext=junction->rcontext; - - // for expression method params - // wcontext is set 0 - // using the fact in decision "which wwrapper to use" - bool using_code_frame=intercept_string && junction->wcontext; - if(using_code_frame) { - // almost plain wwrapper about junction wcontext, - // BUT intercepts string writes - VCodeFrame local(pool(), *junction->wcontext, junction->wcontext); - wcontext=&local; + SAVE_CONTEXT - // execute it - recoursion_checked_execute(0/*result_name*/, *junction->code); - - // CodeFrame soul: - // string writes were intercepted - // returning them as the result of getting code-junction - result.set_string(*wcontext->get_string()); - } else { - // plain wwrapper - WWrapper local(pool(), 0/*empty*/, wcontext); - wcontext=&local; - - // execute it - recoursion_checked_execute(0/*result_name*/, *junction->code); - - result=wcontext->result(); - } - - wcontext=saved_wcontext; - rcontext=saved_rcontext; - method_frame=saved_method_frame; - self=saved_self; - -#ifdef DEBUG_EXECUTE - debug_printf(pool(), "<-ja returned"); + method_frame=junction->method_frame; + rcontext=junction->rcontext; + + // for expression method params + // wcontext is set 0 + // using the fact in decision "which wwrapper to use" + bool using_code_frame=intercept_string && junction->wcontext; + if(using_code_frame) { + // almost plain wwrapper about junction wcontext + + VCodeFrame local(*junction->wcontext); + wcontext=&local; + + // execute it + recoursion_checked_execute(*junction->code); + + // CodeFrame soul: + result=wcontext->result(); + } else { + // plain wwrapper + WWrapper local(0/*empty*/, wcontext); + wcontext=&local; + + // execute it + recoursion_checked_execute(*junction->code); + + result=wcontext->result(); + } + + RESTORE_CONTEXT + + DEBUG_PRINT_STR("<-ja returned") + + return result; + } + + // it is then method-junction, do not explode it + // just return it as we do for usual objects + } + + return input_value; +} + +void Request::process_write(Value& input_value) { + Junction* junction=input_value.get_junction(); + if(junction) { + if(junction->is_getter) { // is it a getter-junction? + VMethodFrame frame(*junction, method_frame/*caller*/); + int param_count=frame.method_params_count(); + + if(param_count){ + if(junction->auto_name){ // default getter + if(param_count==1){ + Value *param=new VString(*junction->auto_name); + frame.store_params(¶m, 1); + } else + throw Exception(PARSER_RUNTIME, + 0, + "default getter method can't have more then 1 parameter (has %d parameters)", param_count); + } else + throw Exception(PARSER_RUNTIME, + 0, + "getter method must have no parameters (has %d parameters)", param_count); + } // no need for else frame.empty_params() + + frame.set_self(frame.junction.self); + + SAVE_CONTEXT + + rcontext=wcontext=&frame; + method_frame=&frame; + + recoursion_checked_execute(*frame.junction.method->parser_code); // parser code, execute it + + RESTORE_CONTEXT + + write_pass_lang(frame.result()); + return; + } + + if(junction->code) { // is it a code-junction? + // process it + + DEBUG_PRINT_STR("ja->\n") + + if(!junction->method_frame) + throw Exception(PARSER_RUNTIME, + 0, + "junction used outside of context"); + + SAVE_CONTEXT + + method_frame=junction->method_frame; + rcontext=junction->rcontext; + + // for expression method params + // wcontext is set 0 + // using the fact in decision "which wwrapper to use" +#ifdef OPTIMIZE_CALL + if(wcontext==junction->wcontext){ + // no wrappers for wcontext + recoursion_checked_execute(*junction->code); + RESTORE_CONTEXT + + } else #endif - } else { - result.set_value(input_value); + if(junction->wcontext) { + // almost plain wwrapper about junction wcontext + VCodeFrame local(*junction->wcontext); + wcontext=&local; + + // execute it + recoursion_checked_execute(*junction->code); + RESTORE_CONTEXT + write_pass_lang(local.result()); + } else { + // plain wwrapper + WWrapper local(0/*empty*/, wcontext); + wcontext=&local; + + // execute it + recoursion_checked_execute(*junction->code); + RESTORE_CONTEXT + write_pass_lang(local.result()); + } + + DEBUG_PRINT_STR("<-ja returned") + + return; + } + + // it is then method-junction, do not explode it + // just return it as we do for usual objects } - return result; + + write_pass_lang(input_value); } -const String& Request::execute_method(VMethodFrame& amethod_frame, const Method& method) { - Value *saved_self=self; - VMethodFrame *saved_method_frame=method_frame; - Value *saved_rcontext=rcontext; - WContext *saved_wcontext=wcontext; +StringOrValue Request::execute_method(VMethodFrame& amethod_frame, const Method& method) { + SAVE_CONTEXT // initialize contexts - self=rcontext=wcontext=method_frame=&amethod_frame; + rcontext=wcontext=method_frame=&amethod_frame; // execute! execute(*method.parser_code); // result - const String& result=wcontext->result().as_string(); + StringOrValue result=wcontext->result(); - wcontext=saved_wcontext; - rcontext=saved_rcontext; - method_frame=saved_method_frame; - self=saved_self; + RESTORE_CONTEXT // return return result; } -void Request::execute_method(Value& aself, - const Method& method, VString *optional_param, - const String **return_string) { - Value *saved_self=self; - VMethodFrame *saved_method_frame=method_frame; - Value *saved_rcontext=rcontext; - WContext *saved_wcontext=wcontext; +const String* Request::execute_method(Value& aself, + const Method& method, Value* optional_param, + bool do_return_string) { + + SAVE_CONTEXT - // initialize contexts - //method_frame=rcontext=self=&aself; - self=&aself; -// WWrapper local(pool(), &aself, wcontext); -// wcontext=&local; - Junction local_junction(pool(), *self, &method, 0,0,0,0); - VMethodFrame local_frame(pool(), method.name, local_junction); - if(optional_param && local_frame.can_store_param()) { - local_frame.store_param(optional_param); - local_frame.fill_unspecified_params(); + Junction local_junction(aself, &method); + VMethodFrame local_frame(local_junction, method_frame/*caller*/); + if(optional_param && local_frame.method_params_count()>0) { + local_frame.store_params(&optional_param, 1); + } else { + local_frame.empty_params(); } - local_frame.set_self(*self); + local_frame.set_self(aself); rcontext=wcontext=method_frame=&local_frame; // prevent non-string writes for better error reporting - if(return_string) + if(do_return_string) wcontext->write(local_frame); // execute! execute(*method.parser_code); // result - const String *result=0; - if(return_string) - *return_string=&wcontext->result().as_string(); + const String* result=0; + if(do_return_string) + result=&wcontext->result().as_string(); - wcontext=saved_wcontext; - rcontext=saved_rcontext; - method_frame=saved_method_frame; - self=saved_self; + RESTORE_CONTEXT + + return result; } -void Request::execute_nonvirtual_method(VStateless_class& aclass, - const String& method_name, VString *optional_param, - const String **return_string, - const Method **return_method) { - - const Method *method=aclass.get_method(method_name); - if(return_string) - *return_string=0; - if(return_method) - *return_method=method; - - if(method) - execute_method(aclass, *method, optional_param, return_string); -} - -const String *Request::execute_virtual_method(Value& aself, - const String& method_name) { - if(Value *value=aself.get_element(method_name, &aself, false)) - if(Junction *junction=value->get_junction()) - if(const Method *method=junction->method) { - const String *result; - execute_method(aself, *method, 0/*no params*/, &result); - return result; - } +Request::Execute_nonvirtual_method_result +Request::execute_nonvirtual_method(VStateless_class& aclass, + const String& method_name, + VString* optional_param, + bool do_return_string) { + Execute_nonvirtual_method_result result; + result.method=aclass.get_method(method_name); + if(result.method) + result.string=execute_method(aclass, *result.method, optional_param, do_return_string); + return result; +} + +const String* Request::execute_virtual_method(Value& aself, + const String& method_name) { + if(Value* value=aself.get_element(method_name, aself, false)) + if(Junction* junction=value->get_junction()) + if(const Method *method=junction->method) + return execute_method(aself, *method, 0/*no params*/, true); return 0; }