--- parser3/src/main/execute.C 2001/06/29 13:53:23 1.170 +++ parser3/src/main/execute.C 2001/07/13 10:58:03 1.175 @@ -5,7 +5,7 @@ Author: Alexander Petrosyan (http://design.ru/paf) */ -static const char *RCSId="$Id: execute.C,v 1.170 2001/06/29 13:53:23 parser Exp $"; +static const char *RCSId="$Id: execute.C,v 1.175 2001/07/13 10:58:03 parser Exp $"; #include "pa_opcode.h" #include "pa_array.h" @@ -253,6 +253,7 @@ void Request::execute(const Array& ops) // maybe they do ^object.method[] call, remember the fact wcontext->inc_somebody_entered_some_object(); + //_asm int 3; Value *value=get_element(); PUSH(value); break; @@ -533,12 +534,18 @@ void Request::execute(const Array& ops) double a_double=a->as_double(); double b_double=b->as_double(); - if(b_double == 0) + if(b_double == 0) { + const String *problem_source=&b->as_string(); +#ifndef NO_STRING_ORIGIN + if(!problem_source->origin().file) + problem_source=&b->name(); +#endif THROW(0, 0, - &b->name(), + problem_source, "Division by zero"); + } - Value *value=NEW VDouble(pool(), a_double/b_double); + Value *value=NEW VDouble(pool(), a_double / b_double); PUSH(value); break; } @@ -546,15 +553,21 @@ void Request::execute(const Array& ops) { Value *b=POP(); Value *a=POP(); - int a_int=a->as_int(); - int b_int=b->as_int(); + double a_double=a->as_double(); + double b_double=b->as_double(); - if(b_int == 0) + if(b_double == 0) { + const String *problem_source=&b->as_string(); +#ifndef NO_STRING_ORIGIN + if(!problem_source->origin().file) + problem_source=&b->name(); +#endif THROW(0, 0, - &b->name(), + problem_source, "Modulus by zero"); + } - Value *value=NEW VDouble(pool(), a_int % b_int); + Value *value=NEW VDouble(pool(), fmod(a_double, b_double)); PUSH(value); break; } @@ -821,6 +834,7 @@ const String *Request::execute_method(Va return result; } +/// @test remove virtual @auto calls when initializing children const String *Request::execute_method(Value& aself, const String& method_name, bool return_cstr) { if(Value *value=aself.get_element(method_name))