--- parser3/src/main/execute.C 2016/09/29 19:37:29 1.386 +++ parser3/src/main/execute.C 2016/10/04 13:23:46 1.388 @@ -21,19 +21,19 @@ #include "pa_vimage.h" #include "pa_wwrapper.h" -volatile const char * IDENT_EXECUTE_C="$Id: execute.C,v 1.386 2016/09/29 19:37:29 moko Exp $" IDENT_PA_OPCODE_H IDENT_PA_OPERATION_H IDENT_PA_VCODE_FRAME_H IDENT_PA_WWRAPPER_H; +volatile const char * IDENT_EXECUTE_C="$Id: execute.C,v 1.388 2016/10/04 13:23:46 moko Exp $" IDENT_PA_OPCODE_H IDENT_PA_OPERATION_H IDENT_PA_VCODE_FRAME_H IDENT_PA_WWRAPPER_H; //#define DEBUG_EXECUTE #ifdef DEBUG_EXECUTE -char *opcode_name[]={ +const char *opcode_name[]={ // literals "VALUE", "CURLY_CODE__STORE_PARAM", "EXPR_CODE__STORE_PARAM", "NESTED_CODE", // actions "WITH_ROOT", "WITH_SELF", "WITH_READ", "WITH_WRITE", - "VALUE__GET_CLASS", + "VALUE__GET_CLASS", "VALUE__GET_BASE_CLASS", "CONSTRUCT_VALUE", "CONSTRUCT_EXPR", "CURLY_CODE__CONSTRUCT", "WRITE_VALUE", "WRITE_EXPR_RESULT", "STRING__WRITE", #ifdef OPTIMIZE_BYTECODE_GET_ELEMENT @@ -1301,13 +1301,13 @@ void Request::op_call_write(VMethodFrame Value& Request::get_element(Value& ncontext, const String& name) { Value* value=ncontext.get_element(name); - return *(value ? &process_to_value(*value) : VVoid::get()); + return *(value ? &process(*value) : VVoid::get()); } #ifdef FEATURE_GET_ELEMENT4CALL Value& Request::get_element4call(Value& ncontext, const String& name) { Value* value=ncontext.get_element4call(name); - return *(value ? &process_to_value(*value) : VVoid::get()); + return *(value ? &process(*value) : VVoid::get()); } #endif