--- parser3/src/classes/op.C	2001/04/28 13:24:57	1.11
+++ parser3/src/classes/op.C	2001/05/21 17:17:11	1.23
@@ -5,7 +5,7 @@
 
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: op.C,v 1.11 2001/04/28 13:24:57 paf Exp $
+	$Id: op.C,v 1.23 2001/05/21 17:17:11 parser Exp $
 */
 
 #include "classes.h"
@@ -15,6 +15,10 @@
 #include "pa_vint.h"
 #include "pa_sql_connection.h"
 
+// limits
+
+#define MAX_LOOPS 10000
+
 // defines
 
 #define OP_CLASS_NAME "OP"
@@ -149,7 +153,7 @@ static void _while(Request& r, const Str
 	// while...
 	int endless_loop_count=0;
 	while(true) {
-		if(++endless_loop_count>=1973) // endless loop?
+		if(++endless_loop_count>=MAX_LOOPS) // endless loop?
 			PTHROW(0, 0,
 				&method_name,
 				"endless loop detected");
@@ -172,12 +176,11 @@ static void _use(Request& r, const Strin
 	r.use_file(r.absolute(vfile.as_string()));
 }
 
-/// ^for[i;from-number;to-number-inclusive]{code}[delim]
 static void _for(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
 	const String& var_name=r.process(params->get(0)).as_string();
-	int from=(int)r.process(params->get(1)).as_double();
-	int to=(int)r.process(params->get(2)).as_double();
+	int from=r.process(params->get(1)).as_int();
+	int to=r.process(params->get(2)).as_int();
 	Value& body_code=params->get_junction(3, "body must be code");
 	Value *delim_code=params->size()==3+1+1?&params->get(3+1):0;
 
@@ -185,7 +188,7 @@ static void _for(Request& r, const Strin
 	VInt *vint=new(pool) VInt(pool, 0);
 	int endless_loop_count=0;
 	for(int i=from; i<=to; i++) {
-		if(++endless_loop_count>=2001) // endless loop?
+		if(++endless_loop_count>=MAX_LOOPS) // endless loop?
 			PTHROW(0, 0,
 				&method_name,
 				"endless loop detected");
@@ -203,11 +206,11 @@ static void _for(Request& r, const Strin
 	}
 }
 
-static void _eval(Request& r, const String&, MethodParams *params) {
+static void _eval(Request& r, const String& method_name, MethodParams *params) {
 	Value& expr=params->get_junction(0, "need expression");
 	// evaluate expresion
 	Value *result=r.process(expr, 
-		0/*no name*/,
+		0/*no name YET*/,
 		true/*don't intercept string*/).as_expr_result();
 	if(params->size()==2) {
 		Value& fmt=params->get_no_junction(1, "fmt must not be code");
@@ -217,6 +220,7 @@ static void _eval(Request& r, const Stri
 		string.APPEND_CONST(format(pool, result->as_double(), fmt.as_string().cstr()));
 		result=new(pool) VString(string);
 	}
+	result->set_name(method_name);
 	r.write_no_lang(*result);
 }
 
@@ -225,14 +229,14 @@ typedef double (*math_one_double_op_func
 static double round(double op) { return floor(op+0.5); }
 static double sign(double op) { return op > 0 ? 1 : ( op < 0 ? -1 : 0 ); }
 
-static void double_one_op(
-								Request& r, 
-								const String& method_name, MethodParams *params,
-								math_one_double_op_func_ptr func) {
+static void double_one_op(Request& r, 
+						  const String& method_name, MethodParams *params,
+						  math_one_double_op_func_ptr func) {
 	Pool& pool=r.pool();
 	Value& param=params->get_junction(0, "parameter must be expression");
 
 	Value& result=*new(pool) VDouble(pool, (*func)(r.process(param).as_double()));
+	result.set_name(method_name);
 	r.write_no_lang(result);
 }
 
@@ -256,18 +260,18 @@ static void _sign(Request& r, const Stri
 	double_one_op(r, method_name, params,	&sign);
 }
 
-/// ^connect[protocol://user:pass@host[:port]/database]{code with ^sql-s}
 static void _connect(Request& r, const String&, MethodParams *params) {
 	Pool& pool=r.pool();
 
 	Value& url=params->get_no_junction(0, "url must not be code");
 	Value& body_code=params->get_junction(1, "body must be code");
 
-	Table *protocol2library=static_cast<Table *>(r.classes_conf.get(OP->name()));
+	Table *protocol2driver_and_client=
+		static_cast<Table *>(r.classes_conf.get(OP->name()));
 
 	// connect
 	SQL_Connection& connection=SQL_driver_manager->get_connection(
-		url.as_string(), protocol2library);
+		url.as_string(), protocol2driver_and_client);
 
 	Exception rethrow_me;
 	// remember/set current connection