--- parser3/src/main/execute.C	2001/05/17 09:21:55	1.158
+++ parser3/src/main/execute.C	2001/07/13 12:15:51	1.178
@@ -4,17 +4,15 @@
 	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
 
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
-
-	$Id: execute.C,v 1.158 2001/05/17 09:21:55 parser Exp $
 */
+static const char *RCSId="$Id: execute.C,v 1.178 2001/07/13 12:15:51 parser Exp $"; 
 
-#include "pa_config_includes.h"
 #include "pa_opcode.h"
 #include "pa_array.h" 
 #include "pa_request.h"
 #include "pa_vstring.h"
 #include "pa_vhash.h"
-#include "pa_vunknown.h"
+#include "pa_vvoid.h"
 #include "pa_vcode_frame.h"
 #include "pa_vmethod_frame.h"
 #include "pa_vobject.h"
@@ -26,10 +24,7 @@
 
 //#define DEBUG_EXECUTE
 
-
-#define PUSH(value) stack.push(value)
-#define POP() static_cast<Value *>(stack.pop())
-#define POP_NAME() static_cast<Value *>(stack.pop())->as_string()
+const uint ANTI_ENDLESS_EXECUTE_RECOURSION=500;
 
 #ifdef DEBUG_EXECUTE
 char *opcode_name[]={
@@ -109,6 +104,10 @@ void debug_dump(Pool& pool, int level, c
 }
 #endif
 
+#define PUSH(value) stack.push(value)
+#define POP() static_cast<Value *>(stack.pop())
+#define POP_NAME() static_cast<Value *>(stack.pop())->as_string()
+
 void Request::execute(const Array& ops) {
 #ifdef DEBUG_EXECUTE
 	debug_printf(pool(), "source----------------------------\n");
@@ -254,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;
@@ -300,7 +300,7 @@ void Request::execute(const Array& ops)
 				if(string)
 					value=NEW VString(*string);
 				else
-					value=NEW VUnknown(pool());
+					value=NEW VVoid(pool());
 				wcontext=static_cast<WContext *>(POP());
 				rcontext=POP();
 				PUSH(value);
@@ -321,7 +321,7 @@ void Request::execute(const Array& ops)
 				if(string)
 					value=NEW VString(*string);
 				else
-					NEW VUnknown(pool());
+					NEW VVoid(pool());
 				wcontext=static_cast<WContext *>(POP());
 				PUSH(value);
 				break;
@@ -415,11 +415,20 @@ void Request::execute(const Array& ops)
 							method.check_actual_numbered_params(pool(),
 								frame->junction.self, 
 								frame->name(), frame->numbered_params());
-							(*method.native_code)(
+							method.native_code(
 								*this, 
 								frame->name(), frame->numbered_params()); // execute it
-						} else // parser code
+						} else { // parser code
+							if(++anti_endless_execute_recoursion==ANTI_ENDLESS_EXECUTE_RECOURSION) {
+								anti_endless_execute_recoursion=0; // give @exception a chance
+								THROW(0, 0,
+									&frame->name(),
+									"endless recursion detected");
+							}
+							
 							execute(*method.parser_code); // execute it
+							anti_endless_execute_recoursion--;
+						}
 					else
 						THROW(0, 0,
 							&frame->name(),
@@ -521,16 +530,44 @@ void Request::execute(const Array& ops)
 		case OP_DIV: 
 			{
 				Value *b=POP();  Value *a=POP();
-				Value *value=NEW VDouble(pool(), a->as_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();
+#ifndef NO_STRING_ORIGIN
+					if(!problem_source->origin().file)
+						problem_source=&b->name();
+#endif
+					THROW(0, 0,
+						problem_source,
+						"Division by zero");
+				}
+
+				Value *value=NEW VDouble(pool(), a_double / b_double);
 				PUSH(value);
 				break;
 			}
 		case OP_MOD: 
 			{
 				Value *b=POP();  Value *a=POP();
-				Value *value=NEW VDouble(pool(), 
-					a->as_int() %
-					b->as_int());
+
+				double a_double=a->as_double();
+				double b_double=b->as_double();
+
+				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,
+						problem_source,
+						"Modulus by zero");
+				}
+
+				Value *value=NEW VDouble(pool(), fmod(a_double, b_double));
 				PUSH(value);
 				break;
 			}
@@ -696,15 +733,14 @@ Value *Request::get_element() {
 	if(value)
 		value=&process(*value, &name); // process possible code-junction
 	else {
-		value=NEW VUnknown(pool());
+		value=NEW VVoid(pool());
 		value->set_name(name);
 	}
 
 	return value;
 }
 
-/**
-	intercept_string:
+/**	@param intercept_string
 	- true:
 		they want result=string value, 
 		possible object result goes to wcontext
@@ -769,7 +805,8 @@ Value& Request::process(Value& value, co
 	return *result;
 }
 
-const String *Request::execute_method(Value& aself, const Method& method, bool return_cstr) {
+const String *Request::execute_method(Value& aself, const Method& method, 
+									  bool return_cstr) {
 	PUSH(self);  
 	PUSH(root);  
 	PUSH(rcontext);  
@@ -798,8 +835,9 @@ const String *Request::execute_method(Va
 	return result;
 }
 
-const String *Request::execute_method(Value& aself, 
-							  const String& method_name, bool return_cstr) {
+const String *Request::execute_virtual_method(Value& aself, 
+											  const String& method_name, 
+											  bool return_cstr) {
 	if(Value *value=aself.get_element(method_name))
 		if(Junction *junction=value->get_junction())
 			if(const Method *method=junction->method) 
@@ -807,3 +845,12 @@ const String *Request::execute_method(Va
 
 	return 0;
 }
+
+const String *Request::execute_nonvirtual_method(VStateless_class& aclass, 
+												 const String& method_name, 
+												 bool return_cstr) {
+	if(const Method *method=aclass.get_method(method_name))
+		return execute_method(aself, *method, return_cstr);
+
+	return 0;
+}