--- parser3/src/main/execute.C 2016/07/19 16:35:36 1.383 +++ parser3/src/main/execute.C 2016/09/29 18:49:43 1.385 @@ -21,7 +21,7 @@ #include "pa_vimage.h" #include "pa_wwrapper.h" -volatile const char * IDENT_EXECUTE_C="$Id: execute.C,v 1.383 2016/07/19 16:35:36 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.385 2016/09/29 18:49:43 moko Exp $" IDENT_PA_OPCODE_H IDENT_PA_OPERATION_H IDENT_PA_VCODE_FRAME_H IDENT_PA_WWRAPPER_H; //#define DEBUG_EXECUTE @@ -286,11 +286,11 @@ void Request::execute(ArrayOperation& op DEBUG_PRINT_STRING(name) - Value* class_value=get_class(name); - if(!class_value) + VStateless_class* vclass=get_class(name); + if(!vclass) throw Exception(PARSER_RUNTIME, &name, "class is undefined"); - stack.push(*class_value); + stack.push(*vclass); break; } @@ -303,11 +303,11 @@ void Request::execute(ArrayOperation& op DEBUG_PRINT_STRING(name) - Value* class_value=get_class(name); - if(!class_value) + VStateless_class* vclass=get_class(name); + if(!vclass) throw Exception(PARSER_RUNTIME, &name, "class is undefined"); - stack.push(*new VBaseClassWrapper(*class_value->get_class(), get_self())); + stack.push(*new VBaseClassWrapper(*vclass, get_self())); break; } @@ -361,9 +361,7 @@ void Request::execute(ArrayOperation& op case OP::OP_WITH_WRITE: { if(wcontext==method_frame) - throw Exception(PARSER_RUNTIME, - 0, - "$.name outside of $name[...]"); + throw Exception(PARSER_RUNTIME, 0, "$.name outside of $name[...]"); stack.push(*wcontext); break; @@ -464,9 +462,7 @@ void Request::execute(ArrayOperation& op Value& ncontext=stack.pop().value(); if(const VJunction* vjunction=ncontext.put_element(name, &value)) if(vjunction!=PUT_ELEMENT_REPLACED_ELEMENT) - throw Exception(PARSER_RUNTIME, - 0, - "property value can not be code, use [] or () brackets"); + throw Exception(PARSER_RUNTIME, 0, "property value can not be code, use [] or () brackets"); break; } @@ -704,7 +700,7 @@ void Request::execute(ArrayOperation& op execute(local_ops); - stack.push(wcontext->result().as_value()); + stack.push(wcontext->result()); flang=saved_lang; wcontext=saved_wcontext; break; @@ -805,7 +801,7 @@ void Request::execute(ArrayOperation& op { VMethodFrame frame(*junction->method, method_frame, junction->self); METHOD_FRAME_ACTION(op_call(frame)); - result=&frame.result().as_value(); + result=&frame.result(); // VMethodFrame desctructor deletes junctions in stack params here } stack.push(*result); @@ -896,11 +892,9 @@ void Request::execute(ArrayOperation& op DEBUG_PRINT_STRING(class_name) - Value* class_value=get_class(class_name); - if(!class_value) - throw Exception(PARSER_RUNTIME, - &class_name, - "class is undefined"); + VStateless_class* vclass=get_class(class_name); + if(!vclass) + throw Exception(PARSER_RUNTIME, &class_name, "class is undefined"); debug_origin=i.next().origin; Value& vconstructor_name=*i.next().value; @@ -908,12 +902,9 @@ void Request::execute(ArrayOperation& op DEBUG_PRINT_STRING(constructor_name) - Junction* constructor_junction=get_element(*class_value, constructor_name).get_junction(); + Junction* constructor_junction=get_element(*vclass, constructor_name).get_junction(); if(!constructor_junction) - throw Exception(PARSER_RUNTIME, - &constructor_name, - "constructor must be declared in class '%s'", - class_value->type()); + throw Exception(PARSER_RUNTIME, &constructor_name, "constructor must be declared in class '%s'", vclass->type()); ArrayOperation* local_ops=i.next().ops; DEBUG_PRINT_OPS(local_ops) @@ -921,11 +912,11 @@ void Request::execute(ArrayOperation& op Value *result; { - Value& object=construct(*class_value, *constructor_junction->method); + Value& object=construct(*vclass, *constructor_junction->method); VConstructorFrame frame(*constructor_junction->method, method_frame, object); METHOD_FRAME_ACTION(op_call(frame)); object.enable_default_setter(); - result=&frame.result().as_value(); + result=&frame.result(); // VMethodFrame desctructor deletes junctions in stack params here } @@ -1270,8 +1261,7 @@ void Request::execute(ArrayOperation& op method_frame=saved_method_frame; -Value& Request::construct(Value &class_value, const Method &method){ - VStateless_class& called_class=*class_value.get_class(); +Value& Request::construct(VStateless_class &called_class, const Method &method){ if(method.call_type!=Method::CT_STATIC) { // this is a constructor call @@ -1389,7 +1379,7 @@ void Request::put_element(Value& ncontex } } -StringOrValue Request::process_getter(Junction& junction) { +Value& Request::process_getter(Junction& junction) { VMethodFrame frame(*junction.method, method_frame/*caller*/, junction.self); size_t param_count=frame.method_params_count(); @@ -1434,16 +1424,16 @@ StringOrValue Request::process_getter(Ju using the fact it's either string_ or value_ result requested to speed up checkes */ -StringOrValue Request::process(Value& input_value, bool intercept_string) { +Value& Request::process(Value& input_value, bool intercept_string) { Junction* junction=input_value.get_junction(); if(junction) { if(junction->is_getter) { // is it a getter-junction? - return process(process_getter(*junction).as_value(), intercept_string); + return process(process_getter(*junction), intercept_string); } if(junction->code) { // is it a code-junction? // process it - StringOrValue result; + ValueRef result; DEBUG_PRINT_STR("ja->\n")