--- parser3/src/classes/hash.C	2002/01/16 10:28:33	1.32
+++ parser3/src/classes/hash.C	2002/04/10 09:53:14	1.37
@@ -1,10 +1,10 @@
 /** @file
 	Parser: @b hash parser class.
 
-	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
-	Author: Alexander Petrosyan <paf@design.ru> (http://paf.design.ru)
+	Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)
+	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 
-	$Id: hash.C,v 1.32 2002/01/16 10:28:33 paf Exp $
+	$Id: hash.C,v 1.37 2002/04/10 09:53:14 paf Exp $
 */
 
 #include "classes.h"
@@ -57,7 +57,7 @@ public:
 	}
 	void before_rows() { 
 		if(columns.size()<=1)
-			throw Exception(0, 0,
+			throw Exception("parser.runtime",
 				&method_name,
 				"column count must be more than 1 to create a hash");
 	}
@@ -200,19 +200,23 @@ static void _sql(Request& r, const Strin
 	Value& statement=params->as_junction(0, "statement must be code");
 
 	ulong limit=0;
-	if(params->size()>1) {
-		Value& limit_code=params->as_junction(1, "limit must be expression");
-		limit=(uint)r.process(limit_code).as_double();
-	}
-
 	ulong offset=0;
-	if(params->size()>2) {
-		Value& offset_code=params->as_junction(2, "offset must be expression");
-		offset=(ulong)r.process(offset_code).as_double();
+	if(params->size()>1) {
+		Value& voptions=params->as_no_junction(1, "options must be hash, not code");
+		if(voptions.is_defined())
+			if(Hash *options=voptions.get_hash(&method_name)) {
+				if(Value *vlimit=(Value *)options->get(*sql_limit_name))
+					limit=(ulong)r.process_to_value(*vlimit).as_double();
+				if(Value *voffset=(Value *)options->get(*sql_offset_name))
+					offset=(ulong)r.process_to_value(*voffset).as_double();
+			} else
+				throw Exception("parser.runtime",
+					&method_name,
+					"options must be hash");
 	}
 
 	Temp_lang temp_lang(r, String::UL_SQL);
-	const String& statement_string=r.process(statement).as_string();
+	const String& statement_string=r.process_to_string(statement);
 	const char *statement_cstr=
 		statement_string.cstr(String::UL_UNSPECIFIED, r.connection(&method_name));
 	Hash& hash=static_cast<VHash *>(r.self)->hash(&method_name);
@@ -282,11 +286,11 @@ static void one_foreach_cycle(const Hash
 	i.r->root->put_element(*i.key_var_name, i.vkey);
 	i.r->root->put_element(*i.value_var_name, static_cast<Value *>(avalue));
 
-	Value& processed_body=i.r->process(*i.body_code);
+	Value& processed_body=i.r->process_to_value(*i.body_code);
 	if(i.delim_maybe_code) { // delimiter set?
 		const String *string=processed_body.get_string();
 		if(i.need_delim && string && string->size()) // need delim & iteration produced string?
-			i.r->write_pass_lang(i.r->process(*i.delim_maybe_code));
+			i.r->write_pass_lang(i.r->process_to_string(*i.delim_maybe_code));
 		i.need_delim=true;
 	}
 	i.r->write_pass_lang(processed_body);
@@ -334,8 +338,8 @@ MHash::MHash(Pool& apool) : Methoded(apo
 	// ^a.delete[key]
 	add_native_method("delete", Method::CT_DYNAMIC, _delete, 1, 1);
 
-	// ^hash:sql[query][(count[;offset])]
-	add_native_method("sql", Method::CT_DYNAMIC, _sql, 1, 3);
+	// ^hash:sql[query][$.limit(1) $.offset(2)]
+	add_native_method("sql", Method::CT_DYNAMIC, _sql, 1, 2);
 
 	// ^hash._keys[]
 	add_native_method("_keys", Method::CT_DYNAMIC, _keys, 0, 0);