--- parser3/src/main/execute.C	2002/09/02 14:31:13	1.262
+++ parser3/src/main/execute.C	2002/09/02 14:59:48	1.263
@@ -5,7 +5,7 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char* IDENT_EXECUTE_C="$Date: 2002/09/02 14:31:13 $";
+static const char* IDENT_EXECUTE_C="$Date: 2002/09/02 14:59:48 $";
 
 #include "pa_opcode.h"
 #include "pa_array.h" 
@@ -130,8 +130,6 @@ void Request::execute(const Array& ops,
 
 		Value *value;
 		Value *a; Value *b;
-		bool bool_result;
-		double double_result;
 		Array *b_code;
 		switch(op.code) {
 		// param in next instruction
@@ -660,27 +658,29 @@ void Request::execute(const Array& ops,
 		case OP_LOG_AND:
 			{
 				b_code=POP_CODE();  a=POP();
+				bool result;
 				if(a->as_bool()) {
 					execute(*b_code);
 					b=POP();
-					bool_result=b->as_bool();
+					result=b->as_bool();
 				} else
-					bool_result=false;
-				value=NEW VBool(pool(), bool_result);
+					result=false;
+				value=NEW VBool(pool(), result);
 				PUSH(value);
 				break;
 			}
 		case OP_LOG_OR:
 			{
 				b_code=POP_CODE();  a=POP();
+				bool result;
 				if(a->as_bool()) 
-					bool_result=true;
+					result=true;
 				else {
 					execute(*b_code);
 					b=POP();
-					bool_result=b->as_bool();
+					result=b->as_bool();
 				}
-				value=NEW VBool(pool(), bool_result);
+				value=NEW VBool(pool(), result);
 				PUSH(value);
 				break;
 			}
@@ -694,48 +694,48 @@ void Request::execute(const Array& ops,
 		case OP_NUM_LT: 
 			{
 				b=POP();  a=POP();
-				double_result=a->as_double() - b->as_double();
-				value=NEW VBool(pool(), double_result < 0.0);
+				double result=a->as_double() - b->as_double();
+				value=NEW VBool(pool(), result < 0.0);
 				PUSH(value);
 				break;
 			}
 		case OP_NUM_GT: 
 			{
 				b=POP();  a=POP();
-				double_result=a->as_double() - b->as_double();
-				value=NEW VBool(pool(), double_result > 0.0);
+				double result=a->as_double() - b->as_double();
+				value=NEW VBool(pool(), result > 0.0);
 				PUSH(value);
 				break;
 			}
 		case OP_NUM_LE: 
 			{
 				b=POP();  a=POP();
-				double_result=a->as_double() - b->as_double();
-				value=NEW VBool(pool(), double_result <= 0.0);
+				double result=a->as_double() - b->as_double();
+				value=NEW VBool(pool(), result <= 0.0);
 				PUSH(value);
 				break;
 			}
 		case OP_NUM_GE: 
 			{
 				b=POP();  a=POP();
-				double_result=a->as_double() - b->as_double();
-				value=NEW VBool(pool(), double_result >= 0.0);
+				double result=a->as_double() - b->as_double();
+				value=NEW VBool(pool(), result >= 0.0);
 				PUSH(value);
 				break;
 			}
 		case OP_NUM_EQ: 
 			{
 				b=POP();  a=POP();
-				double_result=a->as_double() - b->as_double();
-				value=NEW VBool(pool(), double_result == 0.0);
+				double result=a->as_double() - b->as_double();
+				value=NEW VBool(pool(), result == 0.0);
 				PUSH(value);
 				break;
 			}
 		case OP_NUM_NE: 
 			{
 				b=POP();  a=POP();
-				double_result=a->as_double() - b->as_double();
-				value=NEW VBool(pool(), double_result != 0.0);
+				double result=a->as_double() - b->as_double();
+				value=NEW VBool(pool(), result != 0.0);
 				PUSH(value);
 				break;
 			}