--- parser3/src/main/execute.C 2015/10/26 01:21:58 1.378 +++ parser3/src/main/execute.C 2016/04/06 22:52:12 1.381 @@ -21,7 +21,7 @@ #include "pa_vimage.h" #include "pa_wwrapper.h" -volatile const char * IDENT_EXECUTE_C="$Id: execute.C,v 1.378 2015/10/26 01:21:58 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.381 2016/04/06 22:52:12 moko Exp $" IDENT_PA_OPCODE_H IDENT_PA_OPERATION_H IDENT_PA_VCODE_FRAME_H IDENT_PA_WWRAPPER_H; //#define DEBUG_EXECUTE @@ -310,16 +310,16 @@ void Request::execute(ArrayOperation& op if(name==class_element_name){ value=vclass; } else if(name==class_name_element_name){ - value=new VString(vclass->name()); + value=new VString(*new String(vclass->type())); } } else { - // Value + // VJunction is without class, returning self if(name==class_element_name){ value=&ncontext; - }else if(name==class_name_element_name){ + } else if(name==class_name_element_name){ value=new VString(*new String(ncontext.type())); } - }; + } if(opcode==OP::OP_GET_ELEMENT__SPECIAL){ stack.push(*value); } else { @@ -900,7 +900,7 @@ void Request::execute(ArrayOperation& op throw Exception(PARSER_RUNTIME, &constructor_name, "constructor must be declared in class '%s'", - class_value->get_class()->name_cstr()); + class_value->type()); ArrayOperation* local_ops=i.next().ops; DEBUG_PRINT_OPS(local_ops) @@ -1269,7 +1269,7 @@ Value& Request::construct(Value &class_v throw Exception(PARSER_RUNTIME, 0, //&frame.name(), "is not a constructor, system class '%s' can be constructed only implicitly", - called_class.name().cstr()); + called_class.type()); } else throw Exception(PARSER_RUNTIME, 0, //&frame.name(),