--- parser3/src/classes/op.C	2001/05/21 17:17:11	1.23
+++ parser3/src/classes/op.C	2001/06/27 14:23:21	1.28
@@ -5,7 +5,7 @@
 
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: op.C,v 1.23 2001/05/21 17:17:11 parser Exp $
+	$Id: op.C,v 1.28 2001/06/27 14:23:21 parser Exp $
 */
 
 #include "classes.h"
@@ -26,6 +26,9 @@
 #define MAIN_SQL_NAME "SQL"
 #define MAIN_SQL_DRIVERS_NAME "drivers"
 
+#define SWITCH_DATA_NAME "SWITCH-DATA"
+#define DEFAULT_VALUE "DEFAULT"
+
 // local variable
 
 static Methoded *OP;
@@ -52,9 +55,9 @@ static void _if(Request& r, const String
 		0/*no name*/,
 		false/*don't intercept string*/).as_bool();
 	if(condition)
-		r.write_pass_lang(r.process(params->get(1)));
+		r.write_pass_lang(r.process(params->get_junction(1, "'then' parameter must be code")));
 	else if(params->size()==3)
-		r.write_pass_lang(r.process(params->get(2)));
+		r.write_pass_lang(r.process(params->get_junction(2, "'else' parameter must be code")));
 }
 
 static void _untaint(Request& r, const String& method_name, MethodParams *params) {
@@ -260,6 +263,14 @@ static void _sign(Request& r, const Stri
 	double_one_op(r, method_name, params,	&sign);
 }
 
+static void _log(Request& r, const String& method_name, MethodParams *params) {
+	double_one_op(r, method_name, params,	&log);
+}
+
+static void _exp(Request& r, const String& method_name, MethodParams *params) {
+	double_one_op(r, method_name, params,	&exp);
+}
+
 static void _connect(Request& r, const String&, MethodParams *params) {
 	Pool& pool=r.pool();
 
@@ -309,6 +320,54 @@ static void _connect(Request& r, const S
 			rethrow_me.comment());
 }
 
+static String *switch_data_name;
+static String *default_value;
+
+struct Switch_data {
+	Value *searching;
+	Value *found;
+	Value *_default;
+};
+
+static void _switch(Request& r, const String&, MethodParams *params) {
+	void *backup=r.classes_conf.get(*switch_data_name);
+	Switch_data data={&r.process(params->get(0))};	
+	r.classes_conf.put(*switch_data_name, &data);
+
+	r.process(params->get_junction(1, "switch cases must be code")); // and ignore result
+
+	r.classes_conf.put(*switch_data_name, backup);
+
+	if(Value *code=data.found ? data.found : data._default)
+		r.write_pass_lang(r.process(*code));
+}
+
+static void _case(Request& r, const String&, MethodParams *params) {
+	Switch_data& data=*static_cast<Switch_data *>(r.classes_conf.get(*switch_data_name));
+
+	int count=params->size();
+	Value *code=&params->get_junction(--count, "case result must be code");
+	for(int i=0; i<count; i++) {
+		Value& value=r.process(params->get(i));
+
+		if(value.as_string() == *default_value) {
+			data._default=code;
+			break;
+		}
+
+		bool matches;
+		if(data.searching->is_string())
+			matches=data.searching->as_string() == value.as_string();
+		else
+			matches=data.searching->as_double() == value.as_double();
+
+		if(matches) {
+			data.found=code;
+			break;
+		}
+	}
+}
+
 // constructor
 
 MOP::MOP(Pool& apool) : Methoded(apool),
@@ -317,6 +376,9 @@ MOP::MOP(Pool& apool) : Methoded(apool),
 {
 	set_name(*NEW String(pool(), OP_CLASS_NAME));
 
+	switch_data_name=NEW String(pool(), SWITCH_DATA_NAME);
+	default_value=NEW String(pool(), DEFAULT_VALUE);
+
 	// ^if(condition){code-when-true}
 	// ^if(condition){code-when-true}{code-when-false}
 	add_native_method("if", Method::CT_ANY, _if, 2, 3);
@@ -331,7 +393,7 @@ MOP::MOP(Pool& apool) : Methoded(apool),
 	add_native_method("process", Method::CT_ANY, _process, 1, 1);
 
 	// ^rem{code}
-	add_native_method("rem", Method::CT_ANY, _rem, 1, 1);
+	add_native_method("rem", Method::CT_ANY, _rem, 1, 1000);
 
 	// ^while(condition){code}
 	add_native_method("while", Method::CT_ANY, _while, 2, 2);
@@ -364,12 +426,25 @@ MOP::MOP(Pool& apool) : Methoded(apool),
 	// ^sign(expr)
 	add_native_method("sign", Method::CT_ANY, _sign, 1, 1);
 
+	// ^log(expr)
+	add_native_method("log", Method::CT_ANY, _log, 1, 1);
+
+	// ^exp(expr)
+	add_native_method("exp", Method::CT_ANY, _exp, 1, 1);
+
 	
 	// connect
 
 	// ^connect[protocol://user:pass@host[:port]/database]{code with ^sql-s}
 	add_native_method("connect", Method::CT_ANY, _connect, 2, 2);
 
+	// switch
+
+	// ^switch[value]{cases}
+	add_native_method("switch", Method::CT_ANY, _switch, 2, 2);
+
+	// ^case[value]{code}
+	add_native_method("case", Method::CT_ANY, _case, 2, 1000);
 }
 
 // constructor & configurator