--- parser3/src/main/execute.C	2001/06/28 07:44:17	1.169
+++ parser3/src/main/execute.C	2001/06/29 14:16:29	1.172
@@ -5,7 +5,7 @@
 
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 */
-static const char *RCSId="$Id: execute.C,v 1.169 2001/06/28 07:44:17 parser Exp $"; 
+static const char *RCSId="$Id: execute.C,v 1.172 2001/06/29 14:16:29 parser Exp $"; 
 
 #include "pa_opcode.h"
 #include "pa_array.h" 
@@ -529,16 +529,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());
+
+				int a_int=a->as_int();
+				int b_int=b->as_int();
+
+				if(b_int == 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(), a_int % b_int);
 				PUSH(value);
 				break;
 			}