--- parser3/src/main/execute.C	2001/06/29 14:16:09	1.171
+++ parser3/src/main/execute.C	2001/07/03 09:20:55	1.173
@@ -5,7 +5,7 @@
 
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 */
-static const char *RCSId="$Id: execute.C,v 1.171 2001/06/29 14:16:09 parser Exp $"; 
+static const char *RCSId="$Id: execute.C,v 1.173 2001/07/03 09:20:55 parser Exp $"; 
 
 #include "pa_opcode.h"
 #include "pa_array.h" 
@@ -537,7 +537,7 @@ void Request::execute(const Array& ops)
 					const String *problem_source=&b->as_string();
 #ifndef NO_STRING_ORIGIN
 					if(!problem_source->origin().file)
-						problem_source=b->name();
+						problem_source=&b->name();
 #endif
 					THROW(0, 0,
 						problem_source,
@@ -552,21 +552,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();
+						problem_source=&b->name();
 #endif
 					THROW(0, 0,
 						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;
 			}